summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-08-25staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XVIILarry Finger
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XVILarry Finger
This patch removes all the errors and most of the warnings generated by checkpatch -f for rtllib_softmac_tx.c.. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XVLarry Finger
This patch removes all the errors and warnings generated by checkpatch -f for rtllib_softmac_wx.c.. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25staging: rtl8192e: Cleanup checkpatch -f errors - Part XIVLarry Finger
With this patch, all of the checkpatch errors are fixed; however, only some of the lines that are too long were fixed. To complete the fixing of these warnings, the file rtllib_softmac.c will need refactoring. In addition, some of the variables may need renaming. Those changes can be deferred. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25staging: rtl8192e: Cleanup checkpatch -f errors - Part XIIILarry Finger
With this patch, all of the checkpatch errors are fixed; however, only some of the lines that are too long were fixed. To complete the fixing of these warnings, the file rtl_dm.c will need refactoring. In addition, some of the variables will need renaming. Those changes can be deferred. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XIILarry Finger
This patch removes all the errors and most of the warnings generated by checkpatch -f. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XILarry Finger
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25staging: rtl8192e: Cleanup checkpatch -f errors - Part XLarry Finger
With this patch, all of the checkpatch errors are fixed; however, only some of the lines that are too long were fixed. To complete the fixing of these warnings, the file rtl_dm.c will need refactoring. In addition, some of the variables will need renaming. Those changes can be deferred. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part IXLarry Finger
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part VIIILarry Finger
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part VIILarry Finger
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part VILarry Finger
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part VLarry Finger
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part IVLarry Finger
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part IIILarry Finger
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part IILarry Finger
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25staging: rtl8192e: Remove extraneous log messageLarry Finger
The driver logs all DHCP transactions and thus spams the logs. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25staging: rtl8192e: Modify time handlingLarry Finger
In several places, the driver keeps times (in jiffies) in two 32-bit quantities. In the rtl8192_hw_to_sleep(), there is an error in the calculation of the difference between two 64-bit quantities. Rather than fix that error, I have converted to a single 64-bit number. That makes the code be much cleaner and clearer. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part ILarry Finger
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25USB: ftdi_sio: add Calao reference board supportJean-Christophe PLAGNIOL-VILLARD
Calao use on there dev kits a FT2232 where the port 0 is used for the JTAG and port 1 for the UART They use the same VID and PID as FTDI Chip but they program the manufacturer name in the eeprom So use this information to detect it Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Cc: Gregory Hermant <gregory.hermant@calao-systems.com> Cc: Alan Cox <alan@linux.intel.com> Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XVIIILarry Finger
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XVIILarry Finger
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XVILarry Finger
This patch removes all the errors and most of the warnings generated by checkpatch -f for rtllib_softmac_tx.c.. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XVLarry Finger
This patch removes all the errors and warnings generated by checkpatch -f for rtllib_softmac_wx.c.. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25staging: rtl8192e: Cleanup checkpatch -f errors - Part XIVLarry Finger
With this patch, all of the checkpatch errors are fixed; however, only some of the lines that are too long were fixed. To complete the fixing of these warnings, the file rtllib_softmac.c will need refactoring. In addition, some of the variables may need renaming. Those changes can be deferred. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25staging: rtl8192e: Cleanup checkpatch -f errors - Part XIIILarry Finger
With this patch, all of the checkpatch errors are fixed; however, only some of the lines that are too long were fixed. To complete the fixing of these warnings, the file rtl_dm.c will need refactoring. In addition, some of the variables will need renaming. Those changes can be deferred. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XIILarry Finger
This patch removes all the errors and most of the warnings generated by checkpatch -f. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XILarry Finger
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25staging: rtl8192e: Cleanup checkpatch -f errors - Part XLarry Finger
With this patch, all of the checkpatch errors are fixed; however, only some of the lines that are too long were fixed. To complete the fixing of these warnings, the file rtl_dm.c will need refactoring. In addition, some of the variables will need renaming. Those changes can be deferred. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part IXLarry Finger
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part VIIILarry Finger
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25staging: brcmfmac: Consolidate debugging macrosJoe Perches
Convert multiple BRCMF_<debug_level> macros to a single brcmf_dbg(level, fmt, ...) macro. Remove the now unnecessary double parentheses in the uses of the old macros when converting to brcmf_dbg. Delete all uses of "%s: [fmt]", __func__, args... and move the "%s: ", __func__ to the macro for consistency. Coalesce long formats. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25staging: rtl8192e: using vmalloc/vfree requires including vmalloc.hStephen Rothwell
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25staging/olpc_dcon: Remove obsolete cleanup for clientdataWolfram Sang
A few new i2c-drivers came into the kernel which clear the clientdata-pointer on exit or error. This is obsolete meanwhile, the core will do it. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Acked-by: Andres Salomon <dilinger@queued.net> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Marek Belisko <marek.belisko@open-nandra.com> Acked-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25Merge git://git.kernel.org/pub/scm/linux/kernel/git/lwfinger/r8192E into ↵Greg Kroah-Hartman
staging-next * git://git.kernel.org/pub/scm/linux/kernel/git/lwfinger/r8192E: (166 commits) staging: rtl8192e: Remove files that are not used staging: rtl8192e: Convert typedefs that can be replaced with #define staging: rtl8192e: Convert typedef HT_AGGRE_SIZE_E to enum ht_aggre_size staging: rtl8192e: Convert typedef RATR_TABLE_MODE_8192S to enum ratr_table_mode_8192s staging: rtl8192e: Convert typedef FW_CMD_IO_TYPE to enum fw_cmd_io_type staging: rtl8192e: Convert typedef SCAN_OPERATION_BACKUP_OPT to enum scan_op_backup_opt staging: rtl8192e: Convert typedef country_code_type_t to enum country_code_type staging: rtl8192e: Convert typedef WOLPATTERN_TYPE to enum wol_pattern_type staging: rtl8192e: Convert typedef RT_RF_POWER_STATE to enum rt_rf_power_state staging: rtl8192e: Convert typedef RT_JOIN_ACTION to enum rt_join_action staging: rtl8192e: Convert typedef IPS_CALLBACK_FUNCION to enum ips_callback_function staging: rtl8192e: Convert typedef RT_PS_MODE to enum rt_ps_mode staging: rtl8192e: Convert typedef Fsync_State to enum fsync_state staging: rtl8192e: Convert typedef erp_t to enum erp_t staging: rtl8192e: Convert typedef WIRELESS_NETWORK_TYPE to enum wireless_network_type staging: rtl8192e: Convert typedef WIRELESS_MODE to enum wireless_mode staging: rtl8192e: Convert typedef RT_RF_TYPE_DEF to enum rt_rf_type_def staging: rtl8192e: Convert typedef LED_CTL_MODE to enum led_ctl_mode staging: rtl8192e: Convert typedef InitialGainOpType to enum init_gain_op_type staging: rtl8192e: Convert typedef BA_ACTION to enum ba_action ...
2011-08-25OMAP: omap_device: only override _noirq methods, not normal suspend/resumeKevin Hilman
Commit c03f007a8bf0e092caeb6856a5c8a850df10b974 (OMAP: PM: omap_device: add system PM methods for PM domain handling) mistakenly used SET_SYSTEM_SLEEP_PM_OPS() when trying to configure custom methods for the PM domains noirq methods. Fix that by setting only the suspend_noirq and resume_noirq methods with custom versions. Note that all other PM domain methods (including the "normal" suspend/resume methods) are populated using USE_PLATFORM_PM_SLEEP_OPS, which configures them all to the default subsystem (platform_bus) methods. Reported-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Tested-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by: Kevin Hilman <khilman@ti.com> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
2011-08-25PM / Runtime: Correct documentation of pm_runtime_irq_safe()Rafael J. Wysocki
The description of pm_runtime_irq_safe() has to be updated to follow the code after commit 02b2677 (PM / Runtime: Allow _put_sync() from interrupts-disabled context). Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Acked-by: Kevin Hilman <khilman@ti.com>
2011-08-25ALSA: hda: Conexant: Allow different output types to share DACDavid Henningsson
Headphones has stopped working for the original reported (a regression compared to 2.6.38). This is because Speaker and Headphones share the same DAC, in which case no Headphones volume control was created. This patch fixes so that both Speaker and Headphones volume controls are created in such scenario. BugLink: http://bugs.launchpad.net/bugs/817943 Signed-off-by: David Henningsson <david.henningsson@canonical.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2011-08-25staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part VIILarry Finger
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part VILarry Finger
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part VLarry Finger
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part IVLarry Finger
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part IIILarry Finger
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part IILarry Finger
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25staging: rtl8192e: Remove extraneous log messageLarry Finger
The driver logs all DHCP transactions and thus spams the logs. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25staging: rtl8192e: Modify time handlingLarry Finger
In several places, the driver keeps times (in jiffies) in two 32-bit quantities. In the rtl8192_hw_to_sleep(), there is an error in the calculation of the difference between two 64-bit quantities. Rather than fix that error, I have converted to a single 64-bit number. That makes the code be much cleaner and clearer. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part ILarry Finger
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24staging: rtl8192e: Remove files that are not usedLarry Finger
For the most part, these extra files came from the previous version of the RTL8192E driver. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24firmware loader: allow builtin firmware load even if usermodehelper is disabledLinus Torvalds
In commit a144c6a6c924 ("PM: Print a warning if firmware is requested when tasks are frozen") we not only printed a warning if somebody tried to load the firmware when tasks are frozen - we also failed the load. But that check was done before the check for built-in firmware, and then when we disallowed usermode helpers during bootup (commit 288d5abec831: "Boot up with usermodehelper disabled"), that actually means that built-in modules can no longer load their firmware even if the firmware is built in too. Which used to work, and some people depended on it for the R100 driver. So move the test for usermodehelper_is_disabled() down, to after checking the built-in firmware. This should fix: https://bugzilla.kernel.org/show_bug.cgi?id=40952 Reported-by: James Cloos <cloos@hjcloos.com> Bisected-by: Elimar Riesebieter <riesebie@lxtec.de> Cc: Michel Dänzer <michel@daenzer.net> Cc: Rafael Wysocki <rjw@sisk.pl> Cc: Greg Kroah-Hartman <gregkh@suse.de> Cc: Valdis Kletnieks <valdis.kletnieks@vt.edu> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-08-24Merge branch 'for-31-rc3/i2c-fixes' of git://git.fluff.org/bjdooks/linuxLinus Torvalds
* 'for-31-rc3/i2c-fixes' of git://git.fluff.org/bjdooks/linux: i2c-nomadik: fix kerneldoc warning Revert "i2c-omap: fix static suspend vs. runtime suspend" i2c-nomadik: Do not use _interruptible_ variant call