OSDN Git Service
Aaro Koskinen [Wed, 24 Aug 2011 15:21:50 +0000 (18:21 +0300)]
staging: xgifb: delete write-only variables
Delete couple write-only variables.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Reviewed-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marc Dietrich [Wed, 24 Aug 2011 18:23:07 +0000 (20:23 +0200)]
staging: nvec: convert to use platform register and mfdcells
This patch converts the nvec to use mfd cells and improves the
registration of the platform driver. The child drivers are also
converted to use mfd cells and platform registration.
Signed-off-by: Marc Dietrich <marvin24@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jonathan Cameron [Wed, 24 Aug 2011 16:28:41 +0000 (17:28 +0100)]
staging:iio:trigger push functions that don't need to be generaly available down into the core.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jonathan Cameron [Wed, 24 Aug 2011 16:28:40 +0000 (17:28 +0100)]
staging:iio:trigger core. Trivial code cleanups.
Stop exporting functions only intended for core usage.
Return void from function which can never return anything other than 0.
Trivial stype cleanups.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jonathan Cameron [Wed, 24 Aug 2011 16:28:39 +0000 (17:28 +0100)]
staging:iio: spit trigger.h into provider and consumer parts.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jonathan Cameron [Wed, 24 Aug 2011 16:28:38 +0000 (17:28 +0100)]
staging:iio:rename trigger_consumer.h to indicate it is core only.
Need this out the way to create a trigger_consumer.h that actually is
for trigger consumers.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jonathan Cameron [Wed, 24 Aug 2011 16:28:37 +0000 (17:28 +0100)]
staging:iio: prevent removal of module connected to trigger.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jonathan Cameron [Wed, 24 Aug 2011 16:28:36 +0000 (17:28 +0100)]
staging:iio:pollfunc: Make explicit that private data is always pointer to a struct iio_dev.
This is always true, so lets make it explicit.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jonathan Cameron [Wed, 24 Aug 2011 16:28:35 +0000 (17:28 +0100)]
staging:iio:trigger:sysfs trigger: Add a release function to avoid warning on module removal.
The device is static and should never actually be deleted. The release
is just to avoid a warning from the kernel.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jonathan Cameron [Wed, 24 Aug 2011 16:28:34 +0000 (17:28 +0100)]
staging:iio:triggers reorder module put and device put to ensure that the ops are still there if put results in device deletion.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jonathan Cameron [Wed, 24 Aug 2011 16:28:33 +0000 (17:28 +0100)]
staging:iio:triggers. Add a reference get to the core for triggers.
This is to do with dynamically allocated triggers and the need to ensure
the underlying structures don't go away when a consumer is using them.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman [Wed, 24 Aug 2011 21:21:48 +0000 (14:21 -0700)]
staging: iio: adis16220_core.c: add module.h
This is needed and makes the linux-next merge easier.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman [Wed, 24 Aug 2011 21:19:17 +0000 (14:19 -0700)]
staging: rts5139: add vmalloc.h to some files to fix the build.
This is needed to fix the build on alpha and ppc at the least.
Reported-by: Andrew Morton <akpm@linux-foundation.org>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: edwin_rong <edwin_rong@realsil.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman [Wed, 24 Aug 2011 04:15:32 +0000 (21:15 -0700)]
Merge git://git./linux/kernel/git/lwfinger/r8192E into staging-next
* git://git.kernel.org/pub/scm/linux/kernel/git/lwfinger/r8192E: (61 commits)
staging: rtl8192e: Fix compilation warnings
staging: rtl8192e: Fix unload/reload problem
staging: rtl8192e: Remove dead code associated with CONFIG_RTL_RFKILL
staging: rtl8192e: Remove conditional code associated with EEPROM_OLD_FORMAT_SUPPORT
staging: rtl8192e: Remove dead code associated with EFUSE_REPG_WORKAROUND
staging: rtl8192e: Remove LOOP_TEST as parameter
staging: rtl8192e: Remove dead code associated with CONFIG_FW_SETCHAN
staging: rtl8192e: Remove dead code associated with CONFIG_RTLWIFI_DEBUGFS
staging: rtl8192e: Remove dead code associated with _RTL8192_EXT_PATCH_
staging: rtl8192e: Remove ifdefs for CONFIG_RTLLIB_DEBUG
staging: rtl8192e: Remove dead code associated with RTL819x_DEBUG
staging: rtl8192e: Remove dead code associated with _ENABLE_SW_BEACON
staging: rtl8192e: Remove dead code associated with CONFIG_CRYPTO_HMAC
staging: rtl8192e: Remove dead code associated with CONFIG_BT_30
staging: rtl8192e: Remove dead code associated with ENABLE_NULL_PT_DEBUG
staging: rtl8192e: Remove dead code associated with CONFIG_64BIT_DMA
staging: rtl8192e: Remove dead code associated with CONFIG_RTLLIB_CRYPT_TKIP
staging: rtl8192e: Remove dead code associated with IRQF_SHARED
staging: rtl8192e: Remove dead code associated with CONFIG_CFG_80211
staging: rtl8192e: Remove dead code associated with BUILT_IN_CRYPTO
...
Larry Finger [Fri, 15 Jul 2011 21:01:32 +0000 (16:01 -0500)]
staging: rtl8192e: Fix compilation warnings
When the driver is compiled, the following messages result:
CC [M] drivers/staging/rtl8192e/r8192E_phy.o
drivers/staging/rtl8192e/r8192E_phy.c: In function ‘rtl8192_phy_ConfigRFWithHeaderFile’:
drivers/staging/rtl8192e/r8192E_phy.c:791:25: warning: array subscript is above array bounds
drivers/staging/rtl8192e/r8192E_phy.c:780:25: warning: array subscript is above array bounds
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Fri, 15 Jul 2011 17:32:41 +0000 (12:32 -0500)]
staging: rtl8192e: Fix unload/reload problem
The driver is not releasing the memory region that was mapped. As a result,
the driver cannot be unloaded and reloaded.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Fri, 15 Jul 2011 04:58:27 +0000 (23:58 -0500)]
staging: rtl8192e: Remove dead code associated with CONFIG_RTL_RFKILL
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Fri, 15 Jul 2011 03:06:21 +0000 (22:06 -0500)]
staging: rtl8192e: Remove conditional code associated with EEPROM_OLD_FORMAT_SUPPORT
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Fri, 15 Jul 2011 03:03:46 +0000 (22:03 -0500)]
staging: rtl8192e: Remove dead code associated with EFUSE_REPG_WORKAROUND
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Fri, 15 Jul 2011 03:01:47 +0000 (22:01 -0500)]
staging: rtl8192e: Remove LOOP_TEST as parameter
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Fri, 15 Jul 2011 02:58:52 +0000 (21:58 -0500)]
staging: rtl8192e: Remove dead code associated with CONFIG_FW_SETCHAN
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Fri, 15 Jul 2011 00:03:29 +0000 (19:03 -0500)]
staging: rtl8192e: Remove dead code associated with CONFIG_RTLWIFI_DEBUGFS
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Thu, 14 Jul 2011 23:56:16 +0000 (18:56 -0500)]
staging: rtl8192e: Remove dead code associated with _RTL8192_EXT_PATCH_
Larry Finger [Thu, 14 Jul 2011 23:48:38 +0000 (18:48 -0500)]
staging: rtl8192e: Remove ifdefs for CONFIG_RTLLIB_DEBUG
This symbol is unconditionally defined in a header file, thus tests for it can be removed.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Thu, 14 Jul 2011 23:41:10 +0000 (18:41 -0500)]
staging: rtl8192e: Remove dead code associated with RTL819x_DEBUG
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Thu, 14 Jul 2011 23:38:19 +0000 (18:38 -0500)]
staging: rtl8192e: Remove dead code associated with _ENABLE_SW_BEACON
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Thu, 14 Jul 2011 23:33:33 +0000 (18:33 -0500)]
staging: rtl8192e: Remove dead code associated with CONFIG_CRYPTO_HMAC
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Thu, 14 Jul 2011 22:24:17 +0000 (17:24 -0500)]
staging: rtl8192e: Remove dead code associated with CONFIG_BT_30
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Thu, 14 Jul 2011 22:22:17 +0000 (17:22 -0500)]
staging: rtl8192e: Remove dead code associated with ENABLE_NULL_PT_DEBUG
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Thu, 14 Jul 2011 22:20:32 +0000 (17:20 -0500)]
staging: rtl8192e: Remove dead code associated with CONFIG_64BIT_DMA
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Thu, 14 Jul 2011 22:18:14 +0000 (17:18 -0500)]
staging: rtl8192e: Remove dead code associated with CONFIG_RTLLIB_CRYPT_TKIP
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Thu, 14 Jul 2011 22:14:28 +0000 (17:14 -0500)]
staging: rtl8192e: Remove dead code associated with IRQF_SHARED
This symbol is defined in the kernel.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Thu, 14 Jul 2011 22:08:46 +0000 (17:08 -0500)]
staging: rtl8192e: Remove dead code associated with CONFIG_CFG_80211
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Thu, 14 Jul 2011 21:54:46 +0000 (16:54 -0500)]
staging: rtl8192e: Remove dead code associated with BUILT_IN_CRYPTO
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Thu, 14 Jul 2011 21:50:08 +0000 (16:50 -0500)]
staging: rtl8192e: IEEE80211_RADIOTAP_F_BADFCS is defined in kernel, do not duplicate
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Thu, 14 Jul 2011 15:19:49 +0000 (10:19 -0500)]
staging: rtl8192e: Remove dead code associated with CUSTOMER_ID_INTEL_CMPC and CONFIG_CRDA
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Thu, 14 Jul 2011 14:58:36 +0000 (09:58 -0500)]
staging: rtl8192e: Remove dead code associated with FOR_ANDROID_X86 and FOR_MOBLIN
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Thu, 14 Jul 2011 14:43:36 +0000 (09:43 -0500)]
staging: rtl8192e: Remove dead code associated with WMM_Hang_8187
This patch also removes an "#if 1 .... #endif" that survived an earlier
edit.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Thu, 14 Jul 2011 03:07:44 +0000 (22:07 -0500)]
staging: rtl8192e: Remove dead code associated with BUILT_IN_MSHCLASS
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Thu, 14 Jul 2011 03:05:57 +0000 (22:05 -0500)]
staging: rtl8192e: Remove dead code associated with ADHOC_11N
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Thu, 14 Jul 2011 03:04:15 +0000 (22:04 -0500)]
staging: rtl8192e: Remove dead code associated with WIFI_TEST
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Thu, 14 Jul 2011 03:01:59 +0000 (22:01 -0500)]
staging: rtl8192e: Remove dead code associated with NOT_YET
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Thu, 14 Jul 2011 02:58:46 +0000 (21:58 -0500)]
staging: rtl8192e: Remove dead code associated with RTK_DMP_PLATFORM
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Wed, 13 Jul 2011 23:54:50 +0000 (18:54 -0500)]
staging: rtl8192e: Remove dead code associated with USB_RX_AGGREGATION_SUPPORT
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Wed, 13 Jul 2011 23:50:46 +0000 (18:50 -0500)]
staging: rtl8192e: Remove dead code associated with SUPPORT_USPD
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Wed, 13 Jul 2011 23:47:44 +0000 (18:47 -0500)]
staging: rtl8192e: Remove dead code associated with TCP_CSUM_OFFLOAD_RX
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Wed, 13 Jul 2011 14:43:35 +0000 (09:43 -0500)]
staging: rtl8192e: Remove dead code associated with USB_TX_DRIVER_AGGREGATION_ENABLE
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Wed, 13 Jul 2011 14:38:53 +0000 (09:38 -0500)]
staging: rtl8192e: Remove code dependent of JOHN_DUMP
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Wed, 13 Jul 2011 14:35:45 +0000 (09:35 -0500)]
staging: rtl8192e: Remove ifdefs that depend on ENABLE_DOT11D
This configuration parameter is selected in the Makefile, thus the
conditional code can be removed.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Wed, 13 Jul 2011 05:16:54 +0000 (00:16 -0500)]
staging: rtl8192e: Remove references to ENABLE_GPIO_RADIO_CTL
This configuration variable is set in the make file.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Wed, 13 Jul 2011 05:13:20 +0000 (00:13 -0500)]
staging: rtl8192e: Remove dead code from removal of ENABLE_TKIP11N
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Wed, 13 Jul 2011 03:30:01 +0000 (22:30 -0500)]
staging: rtl8192e: Remove dead code associated with PF_SYNCTHREAD
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Wed, 13 Jul 2011 03:26:33 +0000 (22:26 -0500)]
staging: rtl8192e: Remove dead code associated with COMPATIBLE_WITH_RALINK_MESH
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Wed, 13 Jul 2011 03:23:27 +0000 (22:23 -0500)]
staging: rtl8192e: Remove dead code associated with CONFIG_ASPM_OR_D3
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Wed, 13 Jul 2011 03:16:06 +0000 (22:16 -0500)]
staging: rtl8192e: Remove dead code associated with USB_USE_ALIGNMENT
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Wed, 13 Jul 2011 03:08:32 +0000 (22:08 -0500)]
staging: rtl8192e: Remove dead code involved with TO_DO
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Wed, 13 Jul 2011 03:04:11 +0000 (22:04 -0500)]
staging: rtl8192e: Remove dead code involved with TO_DO_LIST
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Wed, 13 Jul 2011 02:54:48 +0000 (21:54 -0500)]
staging: rtl8192e: Remove dead code inside 'ifdef MERGE_TO_DO'
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Wed, 13 Jul 2011 02:46:30 +0000 (21:46 -0500)]
staging: rtl8192e: Remove dead code associated with CONFIG_MP
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Wed, 13 Jul 2011 16:06:34 +0000 (11:06 -0500)]
staging: rtl8192e: Fix kernel panics due to RX skb allocation failures
This driver uses RX skb's of O(2), thus it is possible for memory fragmentation
to prevent the allocation of a new one to replace a newly-received buffer.
When such a failure occurs, the kernel panics.
The fix is to drop an incoming packet whenever such an allocation fails. This
fix matches the one done in rtlwifi for other Realtek PCI devices.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Wed, 13 Jul 2011 16:06:34 +0000 (11:06 -0500)]
staging: rtl8192e: Fix edit error in removal of dead code associated with RTL8190P
One too many lines were removed in an earlier patch. Rather than resubmit
as a V2, this line is added back here.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Tue, 12 Jul 2011 16:12:56 +0000 (11:12 -0500)]
staging: rtl8192e: Remove internal references to RTL8192E
Now that the code can only generate a driver for RTL8192E, the internal
ifdef's are no longer needed.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Tue, 12 Jul 2011 03:52:12 +0000 (22:52 -0500)]
staging: rtl8192e: Remove dead code associated with RTL8192U
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Tue, 12 Jul 2011 03:43:02 +0000 (22:43 -0500)]
staging: rtl8192e: Remove dead code associated with RTL8192SU
The vendor code will generate several different drivers. Eliminate
code used to generate code for the RTL8192SU devices.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Tue, 12 Jul 2011 03:37:27 +0000 (22:37 -0500)]
staging: rtl8192e: Remove dead code associated with RTL8192CE
The vendor code will generate several different drivers. As the RTL8192CE
is covered by a mac80211 driver in mainline, eliminate that code here.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Tue, 12 Jul 2011 03:25:07 +0000 (22:25 -0500)]
staging: rtl8192e: Remove dead code associated with RTL8192SE
The vendor code will generate several different drivers. As the RTL8192SE
is covered by a mac80211 driver in mainline, eliminate that code heere.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Larry Finger [Mon, 11 Jul 2011 23:34:09 +0000 (18:34 -0500)]
staging: rtl8192e: Remove code dependent on RTL8190P
The vendor code can conditionally generate drivers for a number of
devices. Remove any code that depends on RTL8190P being set.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Mike McCormack [Sun, 10 Jul 2011 23:56:55 +0000 (08:56 +0900)]
rtl8192e: Add a TODO
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Mike McCormack [Sun, 10 Jul 2011 23:56:37 +0000 (08:56 +0900)]
rtl8192e: Remove unused debug code
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Mike McCormack [Sun, 10 Jul 2011 23:56:20 +0000 (08:56 +0900)]
rtl8192e: Remove occurences of #if 1
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Mike McCormack [Sun, 10 Jul 2011 23:56:03 +0000 (08:56 +0900)]
rtl8192e: Remove WIRELESS_EXT macro checks
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Mike McCormack [Sun, 10 Jul 2011 23:56:20 +0000 (08:56 +0900)]
rtl8192e: Remove CONFIG_RTL8192_IO_MAP
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Mike McCormack [Sun, 10 Jul 2011 23:56:20 +0000 (08:56 +0900)]
rtl8192e: Remove extra ifdefs
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Mike McCormack [Sun, 10 Jul 2011 23:56:20 +0000 (08:56 +0900)]
rtl8192e: reject rtl8192se cards with same PCI ID
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Larry Finger [Wed, 24 Aug 2011 00:00:42 +0000 (19:00 -0500)]
From: wlanfae <wlanfae@realtek.com>
[PATCH 1/8] rtl8192e: Import new version of driver from realtek
Signed-off-by: wlanfae <wlanfae@realtek.com>
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
---
Mark Einon [Tue, 23 Aug 2011 22:40:40 +0000 (23:40 +0100)]
staging: et131x: Update tx trans_start on device close to prevent tx_timeout
Updating the tx trans_start before closing the device prevents a possible tx_timeout occuring during the closing process.
Tested on an ET1310 device.
Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mark Einon [Tue, 23 Aug 2011 22:40:39 +0000 (23:40 +0100)]
staging: et131x: Fix free IRQ from IRQ context warning after tx_timeout
When a tx timeout occured, et131x_tx_timeout closed and re-opened the device to fix.
As et131x_close called free_irq(), bad things ensued (see warning trace below), namely a
storm of errors and warnings.
Fixed by replacing the close() and open() calls with just the relevant functions previously
called from these.
Verified on an ET-1310 device.
Signed-off-by: Mark Einon <mark.einon@gmail.com>
----------
Aug 2 21:26:08 msilap kernel: [ 6484.816024] ------------[ cut here ]------------
Aug 2 21:26:08 msilap kernel: [ 6484.816039] WARNING: at /home/mark/Source/staging-2.6/net/sched/sch_generic.c:255 dev_watchdog+0xf0/0x150()
Aug 2 21:26:08 msilap kernel: [ 6484.816045] Hardware name: MS-1727
Aug 2 21:26:08 msilap kernel: [ 6484.816050] NETDEV WATCHDOG: eth1 (et131x): transmit queue 0 timed out
Aug 2 21:26:08 msilap kernel: [ 6484.816054] Modules linked in: et131x(C) aes_generic tcp_lp fuse nouveau ttm drm_kms_helper drm i2c_algo_bit sunrpc ipv6 cpufreq_ondemand acpi_cpufreq freq_table mperf uinput arc4 iwlagn snd_hda_codec_hdmi mac80211 sdhci_pci sdhci snd_hda_codec_realtek cfg80211 snd_hda_intel snd_hda_codec mmc_core snd_hwdep firewire_ohci firewire_core jmb38x_ms snd_seq snd_seq_device snd_pcm mxm_wmi ir_lirc_codec lirc_dev ir_sony_decoder i2c_i801 ir_jvc_decoder ir_rc6_decoder rc_rc6_mce i7core_edac edac_core snd_timer pcspkr rfkill r8169 mii i2c_core video ir_rc5_decoder memstick iTCO_wdt iTCO_vendor_support ir_nec_decoder ene_ir rc_core joydev microcode wmi snd crc_itu_t soundcore snd_page_alloc [last unloaded: et131x]
Aug 2 21:26:08 msilap kernel: [ 6484.816163] Pid: 0, comm: kworker/0:1 Tainted: G C 3.0.0-rc6+ #21
Aug 2 21:26:08 msilap kernel: [ 6484.816167] Call Trace:
Aug 2 21:26:08 msilap kernel: [ 6484.816171] <IRQ> [<
ffffffff8103caf4>] warn_slowpath_common+0x85/0x9d
Aug 2 21:26:08 msilap kernel: [ 6484.816189] [<
ffffffff8103cbaf>] warn_slowpath_fmt+0x46/0x48
Aug 2 21:26:08 msilap kernel: [ 6484.816196] [<
ffffffff813aa6fb>] ? netif_tx_lock+0x4a/0x7b
Aug 2 21:26:08 msilap kernel: [ 6484.816203] [<
ffffffff813aa86f>] dev_watchdog+0xf0/0x150
Aug 2 21:26:08 msilap kernel: [ 6484.816211] [<
ffffffff810497b6>] run_timer_softirq+0x1a9/0x279
Aug 2 21:26:08 msilap kernel: [ 6484.816218] [<
ffffffff813aa77f>] ? netif_tx_unlock+0x53/0x53
Aug 2 21:26:08 msilap kernel: [ 6484.816226] [<
ffffffff810429d7>] __do_softirq+0xd5/0x1a4
Aug 2 21:26:08 msilap kernel: [ 6484.816234] [<
ffffffff810079ed>] ? paravirt_read_tsc+0x9/0xd
Aug 2 21:26:08 msilap kernel: [ 6484.816245] [<
ffffffff8144561c>] call_softirq+0x1c/0x26
Aug 2 21:26:08 msilap kernel: [ 6484.816251] [<
ffffffff81003b9f>] do_softirq+0x46/0x83
Aug 2 21:26:08 msilap kernel: [ 6484.816257] [<
ffffffff81042ca2>] irq_exit+0x52/0x9b
Aug 2 21:26:08 msilap kernel: [ 6484.816265] [<
ffffffff81445749>] smp_apic_timer_interrupt+0x7c/0x8a
Aug 2 21:26:08 msilap kernel: [ 6484.816273] [<
ffffffff814450d3>] apic_timer_interrupt+0x13/0x20
Aug 2 21:26:08 msilap kernel: [ 6484.816278] <EOI> [<
ffffffff810079ed>] ? paravirt_read_tsc+0x9/0xd
Aug 2 21:26:08 msilap kernel: [ 6484.816291] [<
ffffffff8124ad87>] ? intel_idle+0xd1/0xf8
Aug 2 21:26:08 msilap kernel: [ 6484.816297] [<
ffffffff8124ad69>] ? intel_idle+0xb3/0xf8
Aug 2 21:26:08 msilap kernel: [ 6484.816306] [<
ffffffff8136a767>] cpuidle_idle_call+0xe2/0x160
Aug 2 21:26:08 msilap kernel: [ 6484.816315] [<
ffffffff81001293>] cpu_idle+0xaa/0xcc
Aug 2 21:26:08 msilap kernel: [ 6484.816323] [<
ffffffff81436b4e>] start_secondary+0x248/0x24f
Aug 2 21:26:08 msilap kernel: [ 6484.816329] ---[ end trace
10ae1b2c6bae932f ]---
Aug 2 21:26:08 msilap kernel: [ 6484.816337] et131x 0000:02:00.0: Send stuck - reset. tcb->WrIndex 0, flags 0x00000000
Aug 2 21:26:08 msilap kernel: [ 6484.816344] ------------[ cut here ]------------
Aug 2 21:26:08 msilap kernel: [ 6484.816353] WARNING: at /home/mark/Source/staging-2.6/kernel/irq/manage.c:1131 __free_irq+0x58/0x192()
Aug 2 21:26:08 msilap kernel: [ 6484.816358] Hardware name: MS-1727
Aug 2 21:26:08 msilap kernel: [ 6484.816362] Trying to free IRQ 16 from IRQ context!
Aug 2 21:26:08 msilap kernel: [ 6484.816365] Modules linked in: et131x(C) aes_generic tcp_lp fuse nouveau ttm drm_kms_helper drm i2c_algo_bit sunrpc ipv6 cpufreq_ondemand acpi_cpufreq freq_table mperf uinput arc4 iwlagn snd_hda_codec_hdmi mac80211 sdhci_pci sdhci snd_hda_codec_realtek cfg80211 snd_hda_intel snd_hda_codec mmc_core snd_hwdep firewire_ohci firewire_core jmb38x_ms snd_seq snd_seq_device snd_pcm mxm_wmi ir_lirc_codec lirc_dev ir_sony_decoder i2c_i801 ir_jvc_decoder ir_rc6_decoder rc_rc6_mce i7core_edac edac_core snd_timer pcspkr rfkill r8169 mii i2c_core video ir_rc5_decoder memstick iTCO_wdt iTCO_vendor_support ir_nec_decoder ene_ir rc_core joydev microcode wmi snd crc_itu_t soundcore snd_page_alloc [last unloaded: et131x]
Aug 2 21:26:08 msilap kernel: [ 6484.816459] Pid: 0, comm: kworker/0:1 Tainted: G WC 3.0.0-rc6+ #21
Aug 2 21:26:08 msilap kernel: [ 6484.816464] Call Trace:
Aug 2 21:26:08 msilap kernel: [ 6484.816467] <IRQ> [<
ffffffff8103caf4>] warn_slowpath_common+0x85/0x9d
Aug 2 21:26:08 msilap kernel: [ 6484.816480] [<
ffffffff8103cbaf>] warn_slowpath_fmt+0x46/0x48
Aug 2 21:26:08 msilap kernel: [ 6484.816488] [<
ffffffff81092276>] __free_irq+0x58/0x192
Aug 2 21:26:08 msilap kernel: [ 6484.816496] [<
ffffffff8109240e>] free_irq+0x5e/0x77
Aug 2 21:26:08 msilap kernel: [ 6484.816506] [<
ffffffffa00bf58e>] et131x_close+0x4b/0x5e [et131x]
Aug 2 21:26:08 msilap kernel: [ 6484.816516] [<
ffffffffa00bf64d>] et131x_tx_timeout+0xac/0xc7 [et131x]
Aug 2 21:26:08 msilap kernel: [ 6484.816523] [<
ffffffff813aa883>] dev_watchdog+0x104/0x150
Aug 2 21:26:08 msilap kernel: [ 6484.816530] [<
ffffffff810497b6>] run_timer_softirq+0x1a9/0x279
Aug 2 21:26:08 msilap kernel: [ 6484.816537] [<
ffffffff813aa77f>] ? netif_tx_unlock+0x53/0x53
Aug 2 21:26:08 msilap kernel: [ 6484.816544] [<
ffffffff810429d7>] __do_softirq+0xd5/0x1a4
Aug 2 21:26:08 msilap kernel: [ 6484.816552] [<
ffffffff810079ed>] ? paravirt_read_tsc+0x9/0xd
Aug 2 21:26:08 msilap kernel: [ 6484.816560] [<
ffffffff8144561c>] call_softirq+0x1c/0x26
Aug 2 21:26:08 msilap kernel: [ 6484.816566] [<
ffffffff81003b9f>] do_softirq+0x46/0x83
Aug 2 21:26:08 msilap kernel: [ 6484.816572] [<
ffffffff81042ca2>] irq_exit+0x52/0x9b
Aug 2 21:26:08 msilap kernel: [ 6484.816580] [<
ffffffff81445749>] smp_apic_timer_interrupt+0x7c/0x8a
Aug 2 21:26:08 msilap kernel: [ 6484.816588] [<
ffffffff814450d3>] apic_timer_interrupt+0x13/0x20
Aug 2 21:26:08 msilap kernel: [ 6484.816592] <EOI> [<
ffffffff810079ed>] ? paravirt_read_tsc+0x9/0xd
Aug 2 21:26:08 msilap kernel: [ 6484.816604] [<
ffffffff8124ad87>] ? intel_idle+0xd1/0xf8
Aug 2 21:26:08 msilap kernel: [ 6484.816610] [<
ffffffff8124ad69>] ? intel_idle+0xb3/0xf8
Aug 2 21:26:08 msilap kernel: [ 6484.816617] [<
ffffffff8136a767>] cpuidle_idle_call+0xe2/0x160
Aug 2 21:26:08 msilap kernel: [ 6484.816625] [<
ffffffff81001293>] cpu_idle+0xaa/0xcc
Aug 2 21:26:08 msilap kernel: [ 6484.816632] [<
ffffffff81436b4e>] start_secondary+0x248/0x24f
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mark Einon [Tue, 23 Aug 2011 22:40:38 +0000 (23:40 +0100)]
staging: et131x: Fix link detection signalling
Remove redundant code around netif_carrier_XXX calls, and associated adapter->media_state, which prevented the link from being reported as off.
Tested on an ET-1310 device.
Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mark Einon [Tue, 23 Aug 2011 22:40:37 +0000 (23:40 +0100)]
staging: et131x: Rename var name 'etdev' to 'adapter' throughout module
Used regex (from vim) :%s/\<etdev\>/adapter/g
Changed because:
* 'etdev' is easily confused as a misspelling of 'netdev'
* 'adapter' is more widely used for this struct type in net drivers. This
change made comparing code with other drivers much easier.
Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mark Einon [Tue, 23 Aug 2011 22:40:36 +0000 (23:40 +0100)]
staging: et131x: Removing commented out code implemented elsewhere
Function et131x_set_mac_addr() contains commented out code that has been moved to
et131x_change_mtu() in the same file.
Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mark Einon [Tue, 23 Aug 2011 22:40:35 +0000 (23:40 +0100)]
staging: et131x: Converting et1310_adapter.h variable names from CamelCase
Tested on an ET-131x device.
Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mark Einon [Tue, 23 Aug 2011 22:40:34 +0000 (23:40 +0100)]
staging: et131x: Converting et1310_tx.c function and local names from CamelCase
Also some minor code clean-ups.
Tested on an ET-131x device.
Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mark Einon [Tue, 23 Aug 2011 22:40:33 +0000 (23:40 +0100)]
staging: et131x: Remove unecessary *etdev NULL check in et1310_phy_init()
It is impossible to get to this function with the pointer being NULL.
Tested on an ET-131x device.
Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ruslan Pisarev [Fri, 22 Jul 2011 12:12:47 +0000 (15:12 +0300)]
Staging: hv: Fix macros, tab errors and warning in drivers/staging/hv/hv_mouse.c
This is a patch to the hv_mouse.c file that fixed up macros, tab
errors and warning found by the checkpatch.pl tools.
Signed-off-by: Ruslan Pisarev <ruslan@rpisarev.org.ua>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
K. Y. Srinivasan [Tue, 26 Jul 2011 18:03:10 +0000 (11:03 -0700)]
Staging: hv: util: kvp: Cleanup kvp_get_domain_name()
Cleanup kvp_get_domain_name(). If getaddrinfo() fails, deal with it properly
(this can happen if no IP address has been assigned). Also, don't specify
a specific service in the call to getaddrinfo() to make this code as generic
as possible. Lastly, move the call to gethostname() after the local variables.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
K. Y. Srinivasan [Fri, 22 Jul 2011 17:14:31 +0000 (10:14 -0700)]
Staging: hv: util: kvp: Fix the reported OSVersion string
The current win7 host does not like it when we return the
complete kernel release information. Conform to what the host
expects.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
K. Y. Srinivasan [Tue, 19 Jul 2011 18:44:21 +0000 (11:44 -0700)]
Staging: hv: vmbus: Fix checkpatch warnings
Fix checkpatch warnings in hv.c
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
K. Y. Srinivasan [Tue, 19 Jul 2011 18:44:20 +0000 (11:44 -0700)]
Staging: hv: tools: Fix a checkpatch warning in hv_kvp_daemon.c
Fix a checkpatch warning in hv_kvp_daemon.c.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
K. Y. Srinivasan [Fri, 15 Jul 2011 20:38:56 +0000 (13:38 -0700)]
Staging: hv: vmbus: Don't wait indefinitely for IRQ resouces
If an attempt is made to load the vmbus driver on a non-Hyper-V platform,
the load operation will hang since we currently wait indefinitely to
retrieve the IRQ information. This is done in the context of an acpi callback
context (which will obviously not happen when this driver is
loaded on a non-Hyper-V platform). This patch fixes the problem.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Pradheep Shrinivasan [Sat, 20 Aug 2011 06:15:26 +0000 (23:15 -0700)]
Staging: go7007: fix braces coding style issue in wis-tw2804.c
This is a patch to the wis-tw2804.c to fix the braces coding style issue as pointed by checkpatch.pl tool
Signed-off-by: Pradheep Shrinivasan <pradheep.sh@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Vincent Abel-Grimalt [Tue, 9 Aug 2011 23:13:38 +0000 (01:13 +0200)]
Staging : winbond : fix coding style issue in phy_calibration.c
Thus us a patch to the phy_calibration.c file that fixes up coding style warning found by the checkpatch.pl tool
Signed-off-by: Vincent Abel-Grimalt <kolymine@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Arnaud Lacombe [Mon, 15 Aug 2011 05:07:12 +0000 (01:07 -0400)]
drivers/staging: do not use EXTRA_CFLAGS
Usage of these flags has been deprecated for nearly 4 years by:
commit
f77bf01425b11947eeb3b5b54685212c302741b8
Author: Sam Ravnborg <sam@neptun.(none)>
Date: Mon Oct 15 22:25:06 2007 +0200
kbuild: introduce ccflags-y, asflags-y and ldflags-y
Moreover, these flags (at least EXTRA_CFLAGS) have been documented for command
line use. By default, gmake(1) do not override command line setting, so this is
likely to result in build failure or unexpected behavior.
Replace their usage by Kbuild's `{as,cc,ld}flags-y'.
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Thomas Meyer [Sat, 13 Aug 2011 08:48:57 +0000 (10:48 +0200)]
staging: spectra: Use memdup_user
Use kmemdup_user rather than duplicating its implementation
This is a little bit restricted to reduce false positives
The semantic patch that makes this output is available
in scripts/coccinelle/api/memdup_user.cocci.
More information about semantic patching is available at
http://coccinelle.lip6.fr/
Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Thomas Meyer [Sat, 13 Aug 2011 09:09:26 +0000 (11:09 +0200)]
staging/easycap: Use memdup_user
Use kmemdup_user rather than duplicating its implementation
This is a little bit restricted to reduce false positives
The semantic patch that makes this output is available
in scripts/coccinelle/api/memdup_user.cocci.
More information about semantic patching is available at
http://coccinelle.lip6.fr/
Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Thomas Meyer [Sat, 13 Aug 2011 09:27:10 +0000 (11:27 +0200)]
staging: rts_pstor: dont cast void* from kmalloc()
Casting (void *) value returned by kmalloc is useless
as mentioned in Documentation/CodingStyle, Chap 14.
The semantic patch that makes this output is available
in scripts/coccinelle/api/alloc/drop_kmalloc_cast.cocci.
More information about semantic patching is available at
http://coccinelle.lip6.fr/
Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Thomas Meyer [Sat, 13 Aug 2011 09:39:08 +0000 (11:39 +0200)]
staging: tidspbridge: dont cast void* from kmalloc()
Casting (void *) value returned by kmalloc is useless
as mentioned in Documentation/CodingStyle, Chap 14.
The semantic patch that makes this output is available
in scripts/coccinelle/api/alloc/drop_kmalloc_cast.cocci.
More information about semantic patching is available at
http://coccinelle.lip6.fr/
Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Thomas Meyer [Sat, 13 Aug 2011 09:31:48 +0000 (11:31 +0200)]
staging: ft1000: dont cast void* from kmalloc()
Casting (void *) value returned by kmalloc is useless
as mentioned in Documentation/CodingStyle, Chap 14.
The semantic patch that makes this output is available
in scripts/coccinelle/api/alloc/drop_kmalloc_cast.cocci.
More information about semantic patching is available at
http://coccinelle.lip6.fr/
Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Thomas Meyer [Sat, 13 Aug 2011 09:28:50 +0000 (11:28 +0200)]
Staging: rts_pstor: dont cast void* from kmalloc()
Casting (void *) value returned by kmalloc is useless
as mentioned in Documentation/CodingStyle, Chap 14.
The semantic patch that makes this output is available
in scripts/coccinelle/api/alloc/drop_kmalloc_cast.cocci.
More information about semantic patching is available at
http://coccinelle.lip6.fr/
Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Thomas Meyer [Sat, 13 Aug 2011 09:34:09 +0000 (11:34 +0200)]
staging: altera-stapl: dont cast void* from kmalloc()
Casting (void *) value returned by kmalloc is useless
as mentioned in Documentation/CodingStyle, Chap 14.
The semantic patch that makes this output is available
in scripts/coccinelle/api/alloc/drop_kmalloc_cast.cocci.
More information about semantic patching is available at
http://coccinelle.lip6.fr/
Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Thomas Meyer [Sat, 13 Aug 2011 14:14:03 +0000 (16:14 +0200)]
staging: rts_pstor: dont cast void* from kmalloc()
Casting (void *) value returned by kmalloc is useless
as mentioned in Documentation/CodingStyle, Chap 14.
The semantic patch that makes this output is available
in scripts/coccinelle/api/alloc/drop_kmalloc_cast.cocci.
More information about semantic patching is available at
http://coccinelle.lip6.fr/
Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>