summaryrefslogtreecommitdiffstats
path: root/drivers/staging/dt3155
Commit message (Collapse)AuthorAgeFilesLines
* Staging: Eliminate a NULL pointer dereferenceJulia Lawall2010-06-041-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eliminate a NULL or near NULL pointer dereference. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @r exists@ expression E,E1; identifier f; statement S1,S2,S3; @@ if ((E == NULL && ...) || ...) { ... when != if (...) S1 else S2 when != E = E1 * E->f ... when any return ...; } else S3 // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Merge staging-next tree into Linus's latest versionGreg Kroah-Hartman2010-05-217-391/+376
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: drivers/staging/arlan/arlan-main.c drivers/staging/comedi/drivers/cb_das16_cs.c drivers/staging/cx25821/cx25821-alsa.c drivers/staging/dt3155/dt3155_drv.c drivers/staging/hv/hv.c drivers/staging/netwave/netwave_cs.c drivers/staging/wavelan/wavelan.c drivers/staging/wavelan/wavelan_cs.c drivers/staging/wlags49_h2/wl_cs.c This required a bit of hand merging due to the conflicts that happened in the later .34-rc releases, as well as some staging driver changing coming in through other trees (v4l and pcmcia). Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: dt3155: remove "inline" usageGreg Kroah-Hartman2010-05-112-14/+14
| | | | | | | | | | | | | | | | It was wrong, and not doing what anyone would think it would do. Cc: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Scott Smedley <ss@aao.gov.au> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: dt3155: rename dt3155_fbuffer_sGreg Kroah-Hartman2010-05-113-5/+5
| | | | | | | | | | | | | | | | drop the "_s" as it's not needed. Cc: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Scott Smedley <ss@aao.gov.au> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: dt3155: rename dt3155_config_sGreg Kroah-Hartman2010-05-112-4/+4
| | | | | | | | | | | | | | | | | | | | Drop the "_s", as it's not needed. Now, dt3155.h is checkpatch.pl clean. Cc: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Scott Smedley <ss@aao.gov.au> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: dt3155: remove dt3155_read_tGreg Kroah-Hartman2010-05-112-4/+4
| | | | | | | | | | | | | | | | The typedef is not needed. Cc: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Scott Smedley <ss@aao.gov.au> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: dt3155: remove dt3155_status_tGreg Kroah-Hartman2010-05-112-8/+8
| | | | | | | | | | | | | | | | The typedef is not needed. Cc: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Scott Smedley <ss@aao.gov.au> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: dt3155: remove frame_info_tGreg Kroah-Hartman2010-05-112-8/+8
| | | | | | | | | | | | | | | | The typedef is not needed. Cc: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Scott Smedley <ss@aao.gov.au> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: dt3155: remove TRUE/FALSEGreg Kroah-Hartman2010-05-111-5/+2
| | | | | | | | | | | | | | | | These aren't needed in the kernel, so remove them. Cc: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Scott Smedley <ss@aao.gov.au> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: dt3155.h: remove #ifdefGreg Kroah-Hartman2010-05-111-7/+0
| | | | | | | | | | | | | | | | We are in the kernel now, don't check to see if we are not. Cc: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Scott Smedley <ss@aao.gov.au> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: dt3155: allocator.c: sparse cleanupsJoe Perches2010-05-112-9/+10
| | | | | | | | | | | | | | | | | | | | | | Make prototypes match implementation Use gfp_t flags not int prio Still a couple of sparse warnings left Signed-off-by: Joe Perches <joe@perches.com> Cc: Simon Horman <horms@verge.net.au> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: dt3155: fix parentheses and bracket spacing style issuesJason Baldus2010-05-111-169/+169
| | | | | | | | | | | | | | | | | | This is a patch to the dt3155_drv.c file that removes spaces after open parentheses and brackets and before close parentheses and brackets. Signed-off-by: Jason Baldus <jason.baldus@gmail.com> Reviewed-by: Simon Horman <horms@verge.net.au> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: dt3155: fix coding style issue in dt3155_isr.cGorskin Ilya2010-05-111-151/+144
| | | | | | | | | | | | | | | | | | This is a patch to the dt3155_isr.c file that fixes up a coding style warning and errors found by the checkpatch.pl tool Signed-off-by: Gorskin Ilya <revent82@gmail.com> Acked-by: Simon Horman <horms@verge.net.au> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: push down BKL into ioctl functionsArnd Bergmann2010-05-111-6/+18
| | | | | | | | | | | | Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Frederic Weisbecker <fweisbec@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: dt3155: fix wait_ibsyclr functionH Hartley Sweeten2010-05-111-17/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The wait_ibsyclr function is supposed to return the status of the I2C cycle. Currently it will always return FALSE because the IIC_CSR2 register is not re-read in order to update the cached register value. This results in the NEW_CYCLE bit still being 1. The current code actually works correctly only because the return value of {Read|Write}I2C is not checked in the driver. Fix wait_ibsyclr by actually reading the IIC_CSR2 register to get the updated status. While here, change the return type to be an actual errno instead of the private TRUE/FALSE define and remove the now obvious comments about the return value. Also, remove the local variable 'writestat' in WriteI2C and just return the result of wait_ibsyclr. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Scott Smedley <ss@aao.gov.au> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: remove unused #include <linux/version.h>Huang Weiyi2010-05-111-1/+0
| | | | | | | | | | | | | | | | | | | | Remove unused #include <linux/version.h>('s) in drivers/staging/dt3155/allocator.c drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c drivers/staging/vme/boards/vme_vmivme7805.c Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | Staging: dt3155: fix 50Hz configurationH Hartley Sweeten2010-04-301-2/+2
|/ | | | | | | | | | | | | | | | | | | According to the header file, dt3155_io.h, the 50/60 Hz configuration is controlled by a bit in the I2C CSR2 register (bit 2). The function dt3155_init_isr actually reads the I2C CONFIG register into the global I2C_CSR union variable then modifies the bit. It then does a write to the I2C CONFIG register with the global I2C_CONFIG union variable which is not even set with a value anywhere in the driver. My guess is 50Hz operation doesn't even work as-is. Fix this by actually reading and writing the correct register with the correct value. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Simon Horman <horms@verge.net.au> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: fix dt3155 buildRandy Dunlap2010-04-221-11/+3
| | | | | | | | | | | | | | | | | | When the dt3155 driver is built-in (not as a loadable module), these build errors happen: drivers/staging/dt3155/dt3155_drv.c:1047: error: implicit declaration of function 'request_irq' drivers/staging/dt3155/dt3155_drv.c:1048: error: 'IRQF_SHARED' undeclared (first use in this function) drivers/staging/dt3155/dt3155_drv.c:1048: error: 'IRQF_DISABLED' undeclared (first use in this function) drivers/staging/dt3155/dt3155_drv.c:1091: error: implicit declaration of function 'free_irq' so remove the #ifdef MODULE check since it's not needed. Also remove the CONFIG_PCI check since the Kconfig file already requires that. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Cc: Scott Smedley <ss@aao.gov.au> Tested-by: Jan III Sobieski <jan3sobi3ski@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* include cleanup: Update gfp.h and slab.h includes to prepare for breaking ↵Tejun Heo2010-03-302-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | implicit slab.h inclusion from percpu.h percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
* staging: dt3155: revert u_long to u64 usageH Hartley Sweeten2010-03-038-151/+151
| | | | | | | | | | | | | | | | Commit 9c1390a923ddb6fba1cf9d7440743369140c6d8a replaced all u_int's with u32 and u_long's with u64. Unfortunately, a u_long is still only 32-bits so they should have been replaced with u32 also. This can be verified by the register definitions in dt3155_io.h. It specifically states that the memory mapped registers are 32-bit. Fix this by changing all the u64 to u32. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Greg Kroah-Hartman <greg@kroah.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: dt3155: fix coding style issues in dt3155_io.cGreg Kroah-Hartman2010-03-031-197/+136
| | | | | | | | | | This fixes up the sparse and coding style issues found in the dt3155_io.c file. No code is changed, only formatting and removing unused code. Cc: Scott Smedley <ss@aao.gov.au> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: dt3155: replace u_int and u_long usageGreg Kroah-Hartman2010-03-039-170/+169
| | | | | | | Use u32 and u64 instead, that's the proper thing to do. Cc: Scott Smedley <ss@aao.gov.au> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: dt3155: replace u_char usageGreg Kroah-Hartman2010-03-035-65/+65
| | | | | | | Use u8 instead, that's the proper thing to do. Cc: Scott Smedley <ss@aao.gov.au> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: dt3155: coding cleanups for dt3155_io.hGreg Kroah-Hartman2010-03-031-251/+212
| | | | | | | | This fixes up some coding style issues in the dt3155_io.h file Cc: Scott Smedley <ss@aao.gov.au> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: dt3155: fix build warningsGreg Kroah-Hartman2010-03-031-12/+13
| | | | | | | | This fixes the build warnings in the dt3155 driver Cc: Scott Smedley <ss@aao.gov.au> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: dt3155: remove compat codeSimon Horman2010-03-036-1073/+8
| | | | | | | | | | Remove compatibility code as this is not an older version of the kernel. Signed-off-by: Simon Horman <horms@verge.net.au> Cc: Scott Smedley <ss@aao.gov.au> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: DT3155: Use pci_get_device()Simon Horman2010-03-031-5/+9
| | | | | | | | | The use of pci_find_device() is deprecated. Signed-off-by: Simon Horman <horms@verge.net.au> Cc: Scott Smedley <ss@aao.gov.au> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: dt3155: coding style cleanups for the .h filesGreg Kroah-Hartman2010-03-034-127/+120
| | | | | | | | | This cleans up some of the coding style issues in the .h files. More remains to be done. Cc: Scott Smedley <ss@aao.gov.au> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: dt3155: coding style cleanups for allocator codeGreg Kroah-Hartman2010-03-032-158/+158
| | | | | | | | This fixes up the worst of the coding style errors for the allocator code. Cc: Scott Smedley <ss@aao.gov.au> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: dt3155: add it to the buildGreg Kroah-Hartman2010-03-032-27/+10
| | | | | | | Now it will build with the rest of the kernel Cc: Scott Smedley <ss@aao.gov.au> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: dt3155: add TODO fileGreg Kroah-Hartman2010-03-031-0/+10
| | | | | | Cc: Scott Smedley <ss@aao.gov.au> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: dt3155: add needed #includeGreg Kroah-Hartman2010-03-031-0/+1
| | | | | | | This is needed so the code properly builds Cc: Scott Smedley <ss@aao.gov.au> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: add dt3155 driverScott Smedley2010-03-0314-0/+4112
This is a driver for the DT3155 Digitizer Signed-off-by: Scott Smedley <ss@aao.gov.au> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
OpenPOWER on IntegriCloud