Commit Graph

114 Commits

Author SHA1 Message Date
Namhyung Kim
5eaa53de2d Staging: rtl8192e: use DEFINE_PCI_DEVICE_TABLE
Convert 'const struct pci_device_id xxx[]' to 'DEFINE_PCI_DEVICE_TABLE(xxx)'.

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-09 16:29:48 -08:00
Joe Perches
859171ca92 drivers/staging: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16 12:06:47 -08:00
Greg Kroah-Hartman
491acf0032 Staging: Merge 2.6.37-rc2 into staging-next
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-16 10:44:50 -08:00
Joe Perches
5b84cc7810 staging: Use vzalloc
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-09 16:34:01 -08:00
Daniel Lichtenberger
43f88d530e Staging: rtl8192e: fix IOMMU memory leak
Unmap the rx buffer before mapping the new one in rtl8192_rx.

Failing to do so quickly exhausts the IOMMU memory during downloads:

[...] DMA: Out of SW-IOMMU space for 9100 bytes at device ...

Using "iommu=off mem=4g" also fixes the problem because
then pci_map_single does not allocate memory.

Tested on my personal laptop with a RTL8192E device. Without this
patch the kernel quickly runs out of IOMMU memory (downloading 5 MB
of data is sufficient to trigger it), with this patch applied
I haven't experienced any issues so far.

Signed-off-by: Daniel Lichtenberger <daniel.lichtenberger@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-09 14:05:23 -08:00
Tracey Dent
edffd7d91d Staging: rtl8192e: Makefile: cleaned up Makefile cflag lines
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-10-05 11:56:38 -07:00
Mike McCormack
52cab756a2 Staging: rtl8192e: Convert macros to inline functions
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-29 23:15:19 -07:00
Mike McCormack
a922a4b778 Staging: rtl8192e: Clean formatting in rtl8192_hard_start_xmit()
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-29 23:15:19 -07:00
Mike McCormack
1f1f19ff62 Staging: rtl8192e: Clean up rtl8192_pci_initdescring()
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-29 23:15:18 -07:00
Mike McCormack
067ba6cf6c Staging: rtl8192e: Clean formatting in rtl8192_tx()
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-29 23:15:18 -07:00
Mike McCormack
4b37700dd1 Staging: rtl8192e: Remove dead code from rtl8192_tx
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-29 23:15:17 -07:00
Mike McCormack
932f4b3aab Staging: rtl8192e: Clean up rtl8192_halt_adapter()
Remove dead code, fix whitespace, clean comments

Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-29 23:15:17 -07:00
Mike McCormack
b72cb94f4a Staging: rtl8192e: Clean up rtl8192_qos_association_resp()
Fix whitespace, remove dead code.

Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-29 23:15:16 -07:00
Mike McCormack
f8acdc3d5c Staging: rtl8192e: Delete some dead code
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-29 23:15:16 -07:00
Mike McCormack
f72b6a505b Staging: rtl8192e: Clean up formatting in MapHwQueueToFirmwareQueue()
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-29 23:15:15 -07:00
Mike McCormack
eb40aeac63 Staging: rtl8192e: Clean up rtl8192_net_update()
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-29 23:15:15 -07:00
Mike McCormack
162f535f3f staging: rtl8192e: Clean up rtl8192_hard_start_xmit()
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-21 10:57:01 -07:00
Mike McCormack
09585fbdc6 staging: rtl8192e: Remove some dead code
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-21 10:57:01 -07:00
Mike McCormack
c325d9805d staging: rtl8192e: Remove dead code in CamResetAllEntry()
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-21 10:57:01 -07:00
Mike McCormack
7aed48d9a7 staging: rtl8192e: Fix indent of some functions
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-21 10:57:00 -07:00
Mike McCormack
61d0e67af6 staging: rtl8192e: Remove dead code from rtl8192_set_chan()
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-21 10:57:00 -07:00
Mike McCormack
a6b1d95908 staging: rtl8192e: Remove commented function rtl8192_set_mode()
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-21 10:57:00 -07:00
Mike McCormack
cdeac5df34 staging: rtl8192e: Remove empty function force_pci_posting()
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-21 10:57:00 -07:00
Mike McCormack
dcf663fba4 staging: rtl8192e: Clean up rtl8192_hard_data_xmit()
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-21 10:57:00 -07:00
Mike McCormack
214985a6d5 staging: rtl8192e: Clean up function headers
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-21 10:56:59 -07:00
Mike McCormack
16d74da0fd staging: rtl8192e: Delete dead and commented out code
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-21 10:56:59 -07:00
Mike McCormack
533d1ffe41 Staging: rtl8192e: Less verbose function headers
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-08 21:21:26 -07:00
Mike McCormack
7f440f49d1 Staging: rtl8192e: Fix indent in some places
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-08 21:21:25 -07:00
Mike McCormack
1dc4dbbf7b Staging: rtl8192e: Remove some redundant comments
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-08 21:21:25 -07:00
Mike McCormack
51ae5d558f Staging: rtl8192e: Remove extern and redundant declarations
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-08 21:21:24 -07:00
Mike McCormack
196bd68726 Staging: rtl8192e: Remove function with no effect
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-08 21:21:23 -07:00
Mike McCormack
b6d5e884ab Staging: rtl8192e: Remove unused macros
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-08 21:21:22 -07:00
Mike McCormack
f347140583 Staging: rtl8192e: Remove some commented out code
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-08 21:21:22 -07:00
Mike McCormack
d5abdf72be Staging: rtl8192e: Remove function name comments at end of functions
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-08 21:21:21 -07:00
Mike McCormack
49e57f2fc0 Staging: rtl8192e: Remove some redundant code
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-08 21:21:20 -07:00
Uwe Kleine-König
9b0131cb24 staging/trivial: fix typos concerning "initiali[zs]e"
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-04 21:23:26 -07:00
Julia Lawall
4498dbcd2d staging: rtl8193*: Remove double test
The 1 element of the array is tested twice.  Change the code so that the
remaining 3 element of the array is tested instead of testing the 1 element
a second time.

The sematic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@expression@
expression E;
@@

(
* E
  || ... || E
|
* E
  && ... && E
)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-08-31 15:22:37 -07:00
Stefan Weil
39831861ff Staging: rtl81*: Fix spelling fuction -> function in comments
Obviously the wrong spelling was copied a lot of times.

A similar patch for the non-staging part of linux
is committed by Jiri Kosina.

Cc: devel@driverdev.osuosl.org
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-08-31 15:05:13 -07:00
Ramkumar Ramachandra
60ef9eb61c Staging: rtl8192e: Cleanup style and whitespace
Replace C99-style comments with C89-style comments, fix some typos,
and fix whitespace to use only tabs.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-08-31 15:05:12 -07:00
Mike McCormack
c6eae67748 Staging: rtl8192e: Remove redundant brackets around return values
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-08-31 14:55:09 -07:00
Mike McCormack
1e0f9ac07c Staging: rtl8192e: Remove pointless return statements
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-08-31 14:55:08 -07:00
Mike McCormack
0186f21229 Staging: rtl8192e: Remove unnecessary externs
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-08-31 14:55:08 -07:00
Mike McCormack
26ef8190cd Staging: rtl8192e: Remove unused function
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-08-31 14:55:08 -07:00
Mike McCormack
f500e256dd Staging: rtl8192e: Don't compare bHwRadioOff with true
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-08-31 14:55:08 -07:00
Mike McCormack
5b3b1a7bf1 Staging: rtl8192e: Make functions static
Make functions static and move their declarations to
 the top of the file.

Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-08-31 14:55:07 -07:00
Mike McCormack
207b58fb12 Staging: rtl8192e: Remove backslashes at end of lines
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-08-31 14:55:07 -07:00
Mike McCormack
285f660cbd Staging: rtl8192e: Simplify some return codes
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-08-31 14:55:07 -07:00
Mike McCormack
4e1cfec95e Staging: rtl8192e: Delete unused function dm_shadow_init()
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-08-31 14:51:53 -07:00
Kulikov Vasiliy
3a8f2d3c71 staging: rtl8187e: call disable_pci_device() if pci_probe() failed
Driver should call disable_pci_device() if it returns from pci_probe()
with error.

Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-08-31 14:48:09 -07:00
Dan Carpenter
2a8a4b7530 Staging: rtl8192e: add curly braces to if statement
In the original code there was some extra semicolons after the if
statement:
	if (!channel_map[ieee->current_network.channel]);
						       ^^^
>From the indenting it looked like that should be curly braces instead.

Also I made some white space changes to stop checkpatch.pl from
complaining.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-08-31 14:48:08 -07:00