summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-11-20staging: brcm80211: replaced PKTSETLEN macro by native __skb_trim callArend van Spriel
- removed PKTSETLEN macro and used __skb_trim call instead. - removed unused macros PKTSETPOOL and PKTPOOL Reviewed-by: Henry Ptasinski <henryp@broadcom.com> Reviewed-by: Brett Rudley <brudley@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-20staging: brcm80211: replace PKTPUSH and PKTPULL macros with native skbuff callsArend van Spriel
Replacing PKTPUSH by skb_push() call and PKTPULL by skb_pull() call to make it obvious what the operation is doing with the packet. Reviewed-by: Henry Ptasinski <henryp@broadcom.com> Reviewed-by: Brett Rudley <brudley@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-20staging: brcm80211: brcmfmac: cleanup bcmsdh_(un)registerMike Rapoport
Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com> Signed-off-by: Brett Rudley <brudley@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-20staging: brcm80211: brcmfmac: remove PCI SDIO controller bindingMike Rapoport
Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com> Signed-off-by: Brett Rudley <brudley@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-17sst: remove rest of aava bits and aava related codeVinod Koul
This removes the remaining bit of aava dependent and related bits from driver Signed-off-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-17staging: spectra: asynchronous initYong Wang
The spectra nand driver takes quite some time to initialize because it needs to scan the whole nand disk to find the latest block table. This patch initializes the spectra nand driver asynchronously so that other things in the kernel can initialize in parallel to the scanning operation. Signed-off-by: Yong Wang <yong.y.wang@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-17staging: spectra: move all init logic into nand_pci_probeYong Wang
Currently there are some driver initialization logic that is not part of nand_pci_probe function. This will result in that part of driver initialization code executing even on platforms without the corresponding hardware which is always dangerous. Signed-off-by: Chuanxiao Dong <chuanxiao.dong@intel.com> Signed-off-by: Yong Wang <yong.y.wang@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-17Staging: ft1000-usb: freeing uninitialized pointerDan Carpenter
GCC complains that if (info->CardReady) is false we kfree() an uninitialized pointer. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-17staging: brcm80211: nicpci.c: replace osl based PCI calls with native linux ↵Brett Rudley
pci calls Get rid of the private PCI access routines and replace with standard calls from linux/pci.h in nicpci.c (The private versions are still used in siutils.c... for now) Signed-off-by: Brett Rudley <brudley@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-17staging: brcm80211: s/osl_t/struct osl_info/gBrett Rudley
Do the substitution (and then fix all the dang lines that were pushed past 80 columns.) Some of the touched lines triggered checkpatch warnings for completely unrelated reasons that were already there. Those will have to be addressed later. Signed-off-by: Brett Rudley <brudley@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-17staging: brcm80211: completely remove osl_pubinfo_t typedefBrett Rudley
Signed-off-by: Brett Rudley <brudley@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-17staging: brcm80211: expose osl contents and start combining osl and pub_osl.Brett Rudley
Signed-off-by: Brett Rudley <brudley@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16Staging: bcm: signedness bug in InitCardAndDownloadFirmware()Dan Carpenter
status is used to store negative error codes throughout. The only place where this is a runtime bug is if create_worker_threads() fails. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16Staging: bcm: signedness bug in StoreSFParam()Dan Carpenter
wrm() returns negative error codes so "ret" needs to be signed here. There was place where wrm() returned positive EACCES instead of negative -EACCES so I fixed that as well. Also a few checkpatch.pl issues. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16staging: fix iio/gyro typos, build errorsRandy Dunlap
Typo causes build errors. Did anyone even build this driver? Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16Staging: iio/dds: double locking bugsDan Carpenter
This is a static checker patch and I don't have this hardware. This code is unusual because while I've often seen a double lock, this is the first time I've seen code that takes a lock 11 times in a row. I feel like I must have missed something. But I've looked very carefully I don't see any way the original code is correct. Does spi_sync() somehow release the lock in a way that I can't see? Even if it does, the locking would still be wrong. Signed-off-by: Dan Carpenter <error27@gmail.com> Acked-by: Michael Hennerich <michael.hennerich@analog.com> Acked-by: Cliff Cai <cliff.cai@analog.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16Staging: cptm1217: move free under dereferenceDan Carpenter
We dereference "ts" in the printk so move the kfree() down a line. Signed-off-by: Dan Carpenter <error27@gmail.com> Acked-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16staging/easycap: make module params private/static, fix buildRandy Dunlap
The easycap driver has module parameters (bars, gain, & debug) with global scope that intrude on the kernel namespace and cause build problems. Change the names of them to be driver-specific and make 2 of them static. drivers/built-in.o:(.bss+0x97c00): multiple definition of `debug' ld: Warning: size of symbol `debug' changed from 58 in arch/x86/built-in.o to 4 in drivers/built-in.o Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Cc: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16staging: fix ste_rmi4 build, depends on INPUTRandy Dunlap
The synaptics_i2c_rmi4 driver uses input_*() interfaces, so it should depend on INPUT to fix its build errors: ERROR: "input_event" [drivers/staging/ste_rmi4/synaptics_i2c_rmi4.ko] undefined! ERROR: "input_free_device" [drivers/staging/ste_rmi4/synaptics_i2c_rmi4.ko] undefined! ERROR: "input_register_device" [drivers/staging/ste_rmi4/synaptics_i2c_rmi4.ko] undefined! ERROR: "input_set_abs_params" [drivers/staging/ste_rmi4/synaptics_i2c_rmi4.ko] undefined! ERROR: "input_allocate_device" [drivers/staging/ste_rmi4/synaptics_i2c_rmi4.ko] undefined! ERROR: "input_unregister_device" [drivers/staging/ste_rmi4/synaptics_i2c_rmi4.ko] undefined! Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Cc: naveen.gaddipati@stericsson.com, js.ha@stericsson.com Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16Staging: autofs: fix coding style issue in dirhash.cTushar Mehta
This is a patch to the dirhash.c file that fixes up a number of issues found by the checkpatch.pl tool Signed-off-by: Tushar Mehta <tushariiitb@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16staging: hv: add explanation of no-op set_multicast_listBrandon Philips
I was going to remove netvsc_set_multicast_list() so I think it is worth adding a comment since it isn't immediately clear why you would want this. Signed-off-by: Brandon Philips <brandon@ifup.org> Acked-by: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16drivers/staging: Remove unnecessary casts of netdev_privJoe Perches
Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16drivers/staging: Remove unnecessary casts of pci_get_drvdataJoe Perches
Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16drivers/staging: Remove unnecessary semicolonsJoe Perches
Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16staging: brcm80211: brcmfmac: remove PXA SDIO controller bindingMike Rapoport
Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16staging: brcm80211: remove unused osl_pkt{get,free}_staticMike Rapoport
Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16staging: brcm80211: get rid of last bit of pci configspace workaround.Brett Rudley
Signed-off-by: Brett Rudley <brudley@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16staging: brcm80211: simplify pci_config_read/write osl routines.Brett Rudley
Start simplifying osl with goal of purging it entirely. Signed-off-by: Brett Rudley <brudley@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16staging: comedi: fix typo in error messageNicolas Kaiser
Fix typo in error message of dux commands allocation. Signed-off-by: Nicolas Kaiser <nikai@nikai.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16staging: vme: ca91cx42: mark the registers' base address pointer as __iomemEmilio G. Cota
Signed-off-by: Emilio G. Cota <cota@braap.org> Acked-by: Martyn Welch <martyn.welch@ge.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16staging: vme: tsi148: mark the registers' base address pointer as __iomemEmilio G. Cota
Signed-off-by: Emilio G. Cota <cota@braap.org> Acked-by: Martyn Welch <martyn.welch@ge.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16staging: vme: mark struct vme_master_resource's base address pointer as __iomemEmilio G. Cota
Signed-off-by: Emilio G. Cota <cota@braap.org> Acked-by: Martyn Welch <martyn.welch@ge.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16staging: vme_user: mark user-space buffers with __userEmilio G. Cota
Signed-off-by: Emilio G. Cota <cota@braap.org> [martyn.welch@ge.com: modified to remove checkpatch warnings] Signed-off-by: Martyn Welch <martyn.welch@ge.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16staging: vme_user: remove __iomem marking from kern_buf and derivatesEmilio G. Cota
kern_buf is not iomem; it comes from kmalloc and is directly dereferenced. Signed-off-by: Emilio G. Cota <cota@braap.org> Acked-by: Martyn Welch <martyn.welch@ge.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16staging: vme_user: use an unsigned int for counting the number of kparamsEmilio G. Cota
unsigned int is what struct kparam_array internally uses. Signed-off-by: Emilio G. Cota <cota@braap.org> Acked-by: Martyn Welch <martyn.welch@ge.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16staging: vme_user: declare private variables as staticEmilio G. Cota
Signed-off-by: Emilio G. Cota <cota@braap.org> [martyn.welch@ge.com: modified to remove checkpatch warnings] Signed-off-by: Martyn Welch <martyn.welch@ge.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16staging: vme: ca91cx42: declare static functions as suchEmilio G. Cota
Signed-off-by: Emilio G. Cota <cota@braap.org> [martyn.welch@ge.com: modified to remove checkpatch warnings] Signed-off-by: Martyn Welch <martyn.welch@ge.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16staging: vme: tsi148: declare static functions as suchEmilio G. Cota
Signed-off-by: Emilio G. Cota <cota@braap.org> [martyn.welch@ge.com: modified to remove checkpatch warnings] Signed-off-by: Martyn Welch <martyn.welch@ge.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16staging: vme: tsi148: remove unreachable lineEmilio G. Cota
Signed-off-by: Emilio G. Cota <cota@braap.org> Acked-by: Martyn Welch <martyn.welch@ge.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16staging: vme: tsi148: fix warning in free_irqEmilio G. Cota
The cookie passed to request_irq isn't the same as the one passed to free_irq, which results in the following warning: [ 63.243533] WARNING: at kernel/irq/manage.c:899 __free_irq+0x9b/0x17d() [ 63.243533] Hardware name: [ 63.243533] Trying to free already-free IRQ 17 [ 63.243533] Modules linked in: vme_tsi148(-) vme e1000e iTCO_wdt iTCO_vendor_support [last unloaded: scsi_wait_scan] [ 63.243533] Pid: 2013, comm: rmmod Not tainted 2.6.35 #2 [ 63.243533] Call Trace: [ 63.243533] [<ffffffff81036ea3>] warn_slowpath_common+0x80/0x98 [ 63.243533] [<ffffffff81036f4f>] warn_slowpath_fmt+0x41/0x43 [ 63.243533] [<ffffffff810678c4>] __free_irq+0x9b/0x17d [ 63.243533] [<ffffffff810679d9>] free_irq+0x33/0x4e [ 63.243533] [<ffffffffa004a897>] tsi148_irq_exit+0x6b/0x70 [vme_tsi148] [...] [ 63.243533] ---[ end trace bbf92311d969efb4 ]--- Fix it by passing the same cookie to both functions. Signed-off-by: Emilio G. Cota <cota@braap.org> [martyn.welch@ge.com: modified to remove checkpatch warnings] Signed-off-by: Martyn Welch <martyn.welch@ge.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16staging: vme: tsi148: remove double freeing of the IRQ in .removeEmilio G. Cota
tsi148_irq_exit is called twice in .remove, which causes an oops. Remove the second call, which apart from being redundant cannot possibly work; the CR/CSR space has been already unmapped. Signed-off-by: Emilio G. Cota <cota@braap.org> Acked-by: Martyn Welch <martyn.welch@ge.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16staging: vme: tsi148: use list_for_each_safe when deleting resources in .removeEmilio G. Cota
This fixes an oops when removing the module. Signed-off-by: Emilio G. Cota <cota@braap.org> Acked-by: Martyn Welch <martyn.welch@ge.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16staging: vme: fix bogus clearing of the bus number in vme_free_bus_numEmilio G. Cota
Signed-off-by: Emilio G. Cota <cota@braap.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16staging: vme_user: remove unreachable lineEmilio G. Cota
Signed-off-by: Emilio G. Cota <cota@braap.org> Acked-by: Martyn Welch <martyn.welch@ge.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16staging: vme_user: return the appropriate error code when module_init failsEmilio G. Cota
When init_module fails, 0 is returned anyway; the module is then installed and oopses when we try to remove it: [ 3236.368009] WARNING: at drivers/base/driver.c:262 driver_unregister+0x36/0x6f() [ 3236.368012] Hardware name: [ 3236.368014] Unexpected driver unregister! [ 3236.368016] Modules linked in: vme_user(-) vme_tsi148 vme e1000e iTCO_wdt iTCO_vendor_support [last unloaded: vme] [ 3236.368027] Pid: 16162, comm: rmmod Not tainted 2.6.35 #2 [ 3236.368029] Call Trace: [ 3236.368037] [<ffffffff81036ea3>] warn_slowpath_common+0x80/0x98 [ 3236.368044] [<ffffffff81060a65>] ? __try_stop_module+0x0/0x58 [ 3236.368049] [<ffffffff81036f4f>] warn_slowpath_fmt+0x41/0x43 [ 3236.368054] [<ffffffff81060a65>] ? __try_stop_module+0x0/0x58 [ 3236.368059] [<ffffffff811e8f78>] driver_unregister+0x36/0x6f [ 3236.368066] [<ffffffffa004aa44>] vme_unregister_driver+0xd/0xf [vme] [ 3236.368072] [<ffffffffa00616c8>] vme_user_exit+0x10/0x1e [vme_user] [ 3236.368076] [<ffffffff810612c1>] sys_delete_module+0x1ba/0x226 [ 3236.368082] [<ffffffff812d6e14>] ? do_page_fault+0x25d/0x28a [ 3236.368088] [<ffffffff8100202b>] system_call_fastpath+0x16/0x1b [ 3236.368092] ---[ end trace cab6d88ebc44c1de ]--- The appended fixes it by returning the appropriate error code in module_init whenever something goes wrong, thus cancelling the insertion of the module. Signed-off-by: Emilio G. Cota <cota@braap.org> Acked-by: Martyn Welch <martyn.welch@ge.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16staging: vme: style: convert '&(foo)' to '&foo'Emilio G. Cota
done with find . -name '*.c' | xargs perl -p -i -e 's/&\(([^()]+)\)/&$1/g' Signed-off-by: Emilio G. Cota <cota@braap.org> Acked-by: Martyn Welch <martyn.welch@ge.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16staging: ft1000: Copy from user into correct dataSteven Rostedt
While doing a ktest.pl I used a MIN_CONFIG that had STAGING enabled, and a randconfig with CONFIG_DEBUG_STRICT_USER_COPY_CHECKS enabled caught the following bug: In file included from /home/rostedt/work/autotest/nobackup/linux-test.git/arch/x86/include/asm/uaccess.h:571:0, from /home/rostedt/work/autotest/nobackup/linux-test.git/include/linux/poll.h:14, from /home/rostedt/work/autotest/nobackup/linux-test.git/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c:32: In function 'copy_from_user', inlined from 'ft1000_ChIoctl' at /home/rostedt/work/autotest/nobackup/linux-test.git/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c:702:36: /home/rostedt/work/autotest/nobackup/linux-test.git/arch/x86/include/asm/uaccess_32.h:212:26: error: call to 'copy_from_user_overflow' declared with attribute error: copy_from_user() buffer size is not provably correct Looking at the code it was obvious what the problem was. The pointer dpram_data was being allocated but the address was being written to. Looking at the comment above the code shows that it use to write into an element of that pointer where the '&' is appropriate. But now that it writes to the pointer itself, we need to remove the '&' otherwise we write over the pointer and not into the data it points to. Signed-off-by: Steven Rostedt <rostedt@goodmis.org> Cc: Marek Belisko <marek.belisko@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16staging: ft1000: Fix error goto statements.Marek Belisko
With commit 2dab1ac81b4767095f96503a9ac093a68c6e9c95 there was intruduced error which lead to stopping uninitialized kthread which leads to kernel panics. This patch fix problems with common entry point in correct way. Signed-off-by: Marek Belisko <marek.belisko@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16Staging: Merge 2.6.37-rc2 into staging-nextGreg Kroah-Hartman
This was necessary in order to resolve some conflicts that happened between -rc1 and -rc2 with the following files: drivers/staging/bcm/Bcmchar.c drivers/staging/intel_sst/intel_sst_app_interface.c All should be resolved now. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16Linux 2.6.37-rc2Linus Torvalds