summaryrefslogtreecommitdiffstats
path: root/drivers/staging/wlags49_h2
AgeCommit message (Collapse)AuthorFilesLines
2010-10-19staging: wlags49_h2: remove useless DbgHwAddr() methodAndy Shevchenko5-94/+66
There is no needs to prepare string for MAC addresses beforehand, due to kernel's *printf() have '%pM' format option. Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-19staging: wlags49_h2: fix format of timeStamp debug outputAndy Shevchenko1-2/+11
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-12staging: wlags49_h2: remove custom macros min() and max()Andy Shevchenko2-8/+1
Signed-off-by: Andy Shevchenko <ext-andriy.shevchenko@nokia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-05Staging: wlags49_h2: Makefile: cleaned up Makefile cflag linesTracey Dent1-5/+5
Changed to use the proper ccflags-y option Signed-off-by: Tracey Dent <tdent48227@gmail.com> Acked-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-30staging: wlags49_h2: use free_netdev(netdev) instead of kfree()Vasiliy Kulikov1-1/+1
Freeing netdev without free_netdev() leads to net, tx leaks. I might lead to dereferencing freed pointer. The semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) @@ struct net_device* dev; @@ -kfree(dev) +free_netdev(dev) Signed-off-by: Vasiliy Kulikov <segooon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-20staging: wlags49_h2: '&pointer[0]' to 'pointer' fixAndy Shevchenko1-1/+1
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-16staging: wlags49_h2: use '%pM' format to print MAC addressAndy Shevchenko1-3/+1
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-04staging/trivial: fix typos concerning "through"Uwe Kleine-König1-1/+1
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-04staging/trivial: fix typos concerning "initiali[zs]e"Uwe Kleine-König1-1/+1
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-08-06Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2-7/+5
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: pcmcia: avoid buffer overflow in pcmcia_setup_isa_irq pcmcia: do not request windows if you don't need to pcmcia: insert PCMCIA device resources into resource tree pcmcia: export resource information to sysfs pcmcia: use struct resource for PCMCIA devices, part 2 pcmcia: remove memreq_t pcmcia: move local definitions out of include/pcmcia/cs.h pcmcia: do not use io_req_t when calling pcmcia_request_io() pcmcia: do not use io_req_t after call to pcmcia_request_io() pcmcia: use struct resource for PCMCIA devices pcmcia: clean up cs.h pcmcia: use pcmica_{read,write}_config_byte pcmcia: remove cs_types.h pcmcia: remove unused flag, simplify headers pcmcia: remove obsolete CS_EVENT_ definitions pcmcia: split up central event handler pcmcia: simplify event callback pcmcia: remove obsolete ioctl Conflicts in: - drivers/staging/comedi/drivers/* - drivers/staging/wlags49_h2/wl_cs.c due to dev_info_t and whitespace changes
2010-08-05Staging: Merge staging-next into Linus's treeGreg Kroah-Hartman10-310/+266
Conflicts: drivers/staging/Kconfig drivers/staging/batman-adv/bat_sysfs.c drivers/staging/batman-adv/device.c drivers/staging/batman-adv/hard-interface.c drivers/staging/cx25821/cx25821-audups11.c Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-08-03pcmcia: do not use io_req_t when calling pcmcia_request_io()Dominik Brodowski1-4/+4
Instead of io_req_t, drivers are now requested to fill out struct pcmcia_device *p_dev->resource[0,1] for up to two ioport ranges. After a call to pcmcia_request_io(), the ports found there are reserved, after calling pcmcia_request_configuration(), they may be used. CC: netdev@vger.kernel.org CC: linux-wireless@vger.kernel.org CC: linux-ide@vger.kernel.org CC: linux-usb@vger.kernel.org CC: laforge@gnumonks.org CC: linux-mtd@lists.infradead.org CC: alsa-devel@alsa-project.org CC: linux-serial@vger.kernel.org CC: Michael Buesch <mb@bu3sch.de> Acked-by: Marcel Holtmann <marcel@holtmann.org> (for drivers/bluetooth/) Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
2010-08-03pcmcia: do not use io_req_t after call to pcmcia_request_io()Dominik Brodowski1-1/+1
After pcmcia_request_io(), do not make use of the values stored in io_req_t, but instead use those found in struct pcmcia_device->resource[]. CC: netdev@vger.kernel.org CC: linux-wireless@vger.kernel.org CC: linux-ide@vger.kernel.org CC: linux-usb@vger.kernel.org CC: laforge@gnumonks.org CC: linux-mtd@lists.infradead.org CC: alsa-devel@alsa-project.org CC: linux-serial@vger.kernel.org Acked-by: Marcel Holtmann <marcel@holtmann.org> (for drivers/bluetooth/) Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
2010-08-02Staging: wlags49_h2: use common PCI_VENDOR/DEVICE_ID name formatJavier Martinez Canillas2-7/+11
There is a common name format for PCI_VENDOR/DEVICE_ID constants. wlags49_h2 names doesn't fit in the standard. This patch change the names and also fix some style issues. Thanks a lot, Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-30pcmcia: remove cs_types.hDominik Brodowski2-2/+0
Remove cs_types.h which is no longer needed: Most definitions aren't used at all, a few can be made away with, and two remaining definitions (typedefs, unfortunatley) may be moved to more specific places. CC: linux-ide@vger.kernel.org CC: linux-usb@vger.kernel.org CC: laforge@gnumonks.org CC: linux-mtd@lists.infradead.org CC: alsa-devel@alsa-project.org CC: linux-serial@vger.kernel.org Acked-by: Marcel Holtmann <marcel@holtmann.org> (for drivers/bluetooth/) Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
2010-07-22Staging: wlags49_h2: remove unused function prototypeJavier Martinez Canillas1-2/+0
With today linux-next I got a compile error in staging/wlags49_h2 driver due an unused function prototype that use a data type (event_callback_args_t) that doesn't exist anymore in the pcmcia code. Current patch solves the issue removing the function prototype. Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-22Staging: fix typos concerning "address"Uwe Kleine-König1-2/+2
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-22staging: wlags49_h2: remove custom hex_to_bin() methodAndy Shevchenko2-38/+1
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-08Staging: wlags49_h2: wl_netdev: remove casts from void*Kulikov Vasiliy1-2/+2
Remove unnesessary casts from void*. Signed-off-by: Kulikov Vasiliy <segooon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-08Staging: wlags49_h2: wl_pci: remove casts from void*Kulikov Vasiliy1-3/+3
Remove unnesessary casts from void*. Signed-off-by: Kulikov Vasiliy <segooon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-08Staging: wlags49_h2: wl_profile: remove casts from void*Kulikov Vasiliy1-1/+1
Remove unnesessary casts from void*. Signed-off-by: Kulikov Vasiliy <segooon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-08Staging: wlags49_h2: use ARRAY_SIZEKulikov Vasiliy1-1/+1
Change sizeof(x) / sizeof(*x) to ARRAY_SIZE(x). Signed-off-by: Kulikov Vasiliy <segooon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-30Staging: wlags49_h2: Fix build error when CONFIG_SYSFS is not setJavier Martinez Canillas1-2/+2
I got a wlags49_h2 driver build error in linux-next when CONFIG_SYSFS is not set. CC [M] drivers/staging/wlags49_h2/wl_cs.o In file included from drivers/staging/wlags49_h2/wl_cs.c:104: drivers/staging/wlags49_h2/wl_sysfs.h: In function ‘register_wlags_sysfs’: drivers/staging/wlags49_h2/wl_sysfs.h:5: error: parameter name omitted drivers/staging/wlags49_h2/wl_sysfs.h: In function ‘unregister_wlags_sysfs’: drivers/staging/wlags49_h2/wl_sysfs.h:6: error: parameter name omitted make[1]: *** [drivers/staging/wlags49_h2/wl_cs.o] Error 1 make: *** [_module_drivers/staging/wlags49_h2] Error 2 This is due a wrong function definition (it does not include parameters names). Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-30Staging: wlags49_h2: add missing <linux/string.h> for strlenJeff Mahoney1-0/+1
On ia64, the build fails with incompatible implicit definition of strlen. This patch adds the <linux/string.h> include to get the real prototype. Signed-off-by: Jeff Mahoney <jeffm@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-23Staging: wl_cs.c: fixed style issues in wl_cs.cPrashant P. Shah1-41/+32
This is a patch to the wl_cs.c file that fixes braces, spaces parentheses, etc style issues found by the checkpatch.pl tool. Signed-off-by: Prashant P. Shah <pshah.mumbai@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-23Staging: wl_cs.c: fixed invalid UTF-8 style issues in wl_cs.cPrashant P. Shah1-2/+2
This is a patch to the wl_cs.c file that corrects the invalid UTF-8 encoding style issues found by the checkpatch.pl tool. Signed-off-by: Prashant P. Shah <pshah.mumbai@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-23Staging: wl_cs.c: converted space to tabs in wl_cs.cPrashant P. Shah1-217/+217
This is a patch to the wl_cs.c file that converts spaces to tabs style issues found by the checkpatch.pl tool. Signed-off-by: Prashant P. Shah <pshah.mumbai@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-22Staging: wl_cs.c: fixed space style issues in wl_cs.cPrashant P. Shah1-102/+102
This is a patch to the wl_cs.c file that fixes the space style issues found by the checkpatch.pl tool. Signed-off-by: Prashant P. Shah <pshah.mumbai@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-04Staging: wlags49_h2, wlags49_h25: fixed Kconfig dependenciesHenk de Groot1-5/+7
Fixes Kconfig so the wlags49_h2 and wlags49_h25 drivers can be selected from menuconfig without having to select another WLAN driver first. Before it could only be selected when another driver already selected WIRELESS_EXT. Also adds WEXT_PRIV on which the driver also depends. Align help text in Kconfig. Signed-off-by: Henk de Groot <pe1dnn@amsat.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-21Merge staging-next tree into Linus's latest versionGreg Kroah-Hartman17-857/+729
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>
2010-05-20Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds1-6/+6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1674 commits) qlcnic: adding co maintainer ixgbe: add support for active DA cables ixgbe: dcb, do not tag tc_prio_control frames ixgbe: fix ixgbe_tx_is_paused logic ixgbe: always enable vlan strip/insert when DCB is enabled ixgbe: remove some redundant code in setting FCoE FIP filter ixgbe: fix wrong offset to fc_frame_header in ixgbe_fcoe_ddp ixgbe: fix header len when unsplit packet overflows to data buffer ipv6: Never schedule DAD timer on dead address ipv6: Use POSTDAD state ipv6: Use state_lock to protect ifa state ipv6: Replace inet6_ifaddr->dead with state cxgb4: notify upper drivers if the device is already up when they load cxgb4: keep interrupts available when the ports are brought down cxgb4: fix initial addition of MAC address cnic: Return SPQ credit to bnx2x after ring setup and shutdown. cnic: Convert cnic_local_flags to atomic ops. can: Fix SJA1000 command register writes on SMP systems bridge: fix build for CONFIG_SYSFS disabled ARCNET: Limit com20020 PCI ID matches for SOHARD cards ... Fix up various conflicts with pcmcia tree drivers/net/ {pcmcia/3c589_cs.c, wireless/orinoco/orinoco_cs.c and wireless/orinoco/spectrum_cs.c} and feature removal (Documentation/feature-removal-schedule.txt). Also fix a non-content conflict due to pm_qos_requirement getting renamed in the PM tree (now pm_qos_request) in net/mac80211/scan.c
2010-05-14Staging: wlags49_hs2: Fix wlags49_hs2 driver after build fixes broke itHenk de Groot6-76/+14
Fixes the driver after merge into the 2.6.34 kernel. Driver should be functional again (a fix to make it compile broke the driver). Patch against 2.6.34 RC7 with patch-v2.6.34-rc7-next-20100513 already applied. Removed conditional code based on kernel version, this is pointless now the driver is part of the kernel. Also removed obsolte code left over from previous patches. Includes also small fixes to compile clean again. Signed-off-by: Henk de Groot <pe1dnn@amsat.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-14staging: trivial: fix typo "seperate"Anand Gadiyar3-3/+3
s/seperate/separate Signed-off-by: Anand Gadiyar <gadiyar@ti.com> Cc: Jiri Kosina <trivial@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11Staging: Drop memory allocation castJulia Lawall1-2/+2
Drop cast on the result of kmalloc and similar functions. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ type T; @@ - (T *) (\(kmalloc\|kzalloc\|kcalloc\|kmem_cache_alloc\|kmem_cache_zalloc\| kmem_cache_alloc_node\|kmalloc_node\|kzalloc_node\)(...)) // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11Staging: wlags49_h2: fixed C99 comments style issues in wl_profile.cPrashant P. Shah1-27/+27
This is a patch to the wl_profile.c file that fixes the C99 comments style issues found by the checkpatch.pl tool. Signed-off-by: Prashant P. Shah <pshah.mumbai@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11Staging: wlags49: build fixesGreg Kroah-Hartman2-12/+12
Now that the code actually gets selected in the kernel config properly, all of the build errors start showing up. This patch papers over a few of them to get the code to build, I have no idea if it actually works now or not... Cc: Henk de Groot <pe1dnn@amsat.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11Staging: wlags49_h2*: wireless driver Kconfig updateCharles Clément1-1/+1
Change the wireless drivers to depend on CONFIG_WLAN instead of CONFIG_WLAN_80211 which is gone. Signed-off-by: Charles Clément <caratorn@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11Staging: wlags49_h2: fixed unnecessary braces issues in wl_profile.cPrashant P. Shah1-138/+90
This is a patch to the wl_profile.c file that fixes the unnecessary braces style issues found by the checkpatch.pl tool. Signed-off-by: Prashant P. Shah <pshah.mumbai@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11Staging: wlags49_h2: fixed whitespace issues in wl_profile.cPrashant P. Shah1-405/+354
This is a patch to the wl_profile.c file that fixes whitespace issues found by the checkpatch.pl tool. Signed-off-by: Prashant P. Shah <pshah.mumbai@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11Staging: wlags49_h2: fix copyright and comments style issue in dhfcfg.hRuslan Pisarev1-59/+59
This is a patch to the dhfcfg.h file that fixed up a copyright and commets style Errors found by the checkpatch.pl tools Signed-off-by: Ruslan Pisarev <ruslan@rpisarev.org.ua> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11Staging: wlags49_h2: fix space and comments style issue in dhf.hRuslan Pisarev1-19/+19
This is a patch to the dhf.c file that fixed up a space and comments style Errors found by the checkpatch.pl tools Signed-off-by: Ruslan Pisarev <ruslan@rpisarev.org.ua> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11Staging: wlags49_h2: fix copyright and space style issue in dhf.hRuslan Pisarev1-12/+12
This is a patch to the dhf.h file that fixed up a copyright anf space style Errors found by the checkpatch.pl tools Signed-off-by: Ruslan Pisarev <ruslan@rpisarev.org.ua> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11Staging: wlags49_h2: fix trailing statements coding style issue in dhf.cRuslan Pisarev1-5/+10
This is a patch to the dhf.c file that fixed up a trailing statements Errors found by the checkpatch.pl tools, like trailing statements should be on next line Signed-off-by: Ruslan Pisarev <ruslan@rpisarev.org.ua> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11Staging: wlags49_h2: fix TAB and space coding style issue dhf.cRuslan Pisarev1-44/+44
This is a patch to the dhf.c file that fixed up a TAB and spaces Errors found by the checkpatch.pl tools Signed-off-by: Ruslan Pisarev <ruslan@rpisarev.org.ua> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11Staging: wlags49_h2: fix copyright style issue in dhf.cRuslan Pisarev1-2/+2
This is a patch to the dhf.c file that fixed up a copyright style Errors found by the checkpatch.pl tools Signed-off-by: Ruslan Pisarev <ruslan@rpisarev.org.ua> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11Staging: wlags49_h2: fix comments coding style issue in dhf.cRuslan Pisarev1-37/+37
This is a patch to the dhf.c file that fixed up a TAB and spaces Errors found by the checkpatch.pl tools, like do not use C99 // comments Signed-off-by: Ruslan Pisarev <ruslan@rpisarev.org.ua> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11Staging: wlags49_h2: fix TAB and space coding style issue in ap_h2.cRuslan Pisarev1-7/+7
This is a patch to the p80211conv.c file that fixed up a TAB and spaces Errors found by the checkpatch.pl tools Signed-off-by: Ruslan Pisarev <ruslan@rpisarev.org.ua> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11Staging: wlags49_h2: fix comments coding style issue in ap_h2.cRuslan Pisarev1-35/+35
This is a patch to the ap_h2.c file that fixed up a TAB and spaces Errors found by the checkpatch.pl tools, like do not use C99 // comments Signed-off-by: Ruslan Pisarev <ruslan@rpisarev.org.ua> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11Staging: wlags49_h2: fix spaces, macros and comments coding style issue in ↵Ruslan Pisarev1-45/+59
debug.h This is a patch to the debug.h file that fixed up a TAB and spaces Errors found by the checkpatch.pl tools, like spaces required around that '&' (ctx:VxV) and ERROR: Invalid UTF-8, patch and commit message should be encoded in UTF-8 and do not use C99 // comments and Macros with complex values should be enclosed in parenthesis Signed-off-by: Ruslan Pisarev <ruslan@rpisarev.org.ua> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11Staging: wlags49_h2: Hoist assign from ifJoe Perches5-14/+28
Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>