summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-25staging: 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-24Staging: remove drivers/char/scc.h as it should have gone a while agoGreg Kroah-Hartman
This was needed by one of the generic serial drivers that was removed a while ago. No one even noticed that the driver could not be built properly while it was in the staging directory. So this removed the unneeded .h file. Reported-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-24staging: xgifb: delete an empty stringAaro Koskinen
Delete a string which is always empty. 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>
2011-08-24staging: xgifb: delete driver version informationAaro Koskinen
Delete version information, it's just noise and serves no purpose. 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>
2011-08-24staging: xgifb: delete write-only variablesAaro Koskinen
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>
2011-08-24staging: nvec: convert to use platform register and mfdcellsMarc Dietrich
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>
2011-08-24staging:iio:trigger push functions that don't need to be generaly available ↵Jonathan Cameron
down into the core. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-24staging:iio:trigger core. Trivial code cleanups.Jonathan Cameron
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>
2011-08-24staging:iio: spit trigger.h into provider and consumer parts.Jonathan Cameron
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-24staging:iio:rename trigger_consumer.h to indicate it is core only.Jonathan Cameron
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>
2011-08-24staging:iio: prevent removal of module connected to trigger.Jonathan Cameron
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-24staging:iio:pollfunc: Make explicit that private data is always pointer to a ↵Jonathan Cameron
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>
2011-08-24staging:iio:trigger:sysfs trigger: Add a release function to avoid warning ↵Jonathan Cameron
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>
2011-08-24staging:iio:triggers reorder module put and device put to ensure that the ↵Jonathan Cameron
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>
2011-08-24staging:iio:triggers. Add a reference get to the core for triggers.Jonathan Cameron
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>
2011-08-24staging: iio: adis16220_core.c: add module.hGreg Kroah-Hartman
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>
2011-08-24staging: rts5139: add vmalloc.h to some files to fix the build.Greg Kroah-Hartman
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>
2011-08-24staging: rtl8192e: Convert typedefs that can be replaced with #defineLarry Finger
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24staging: rtl8192e: Convert typedef HT_AGGRE_SIZE_E to enum ht_aggre_sizeLarry Finger
Remove typedef from enum. Rename enum. Rename uses. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24staging: rtl8192e: Convert typedef RATR_TABLE_MODE_8192S to enum ↵Larry Finger
ratr_table_mode_8192s Remove typedef from enum. Rename enum. Rename uses. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24staging: rtl8192e: Convert typedef FW_CMD_IO_TYPE to enum fw_cmd_io_typeLarry Finger
Remove typedef from enum. Rename enum. Rename uses. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24staging: rtl8192e: Convert typedef SCAN_OPERATION_BACKUP_OPT to enum ↵Larry Finger
scan_op_backup_opt Remove typedef from enum. Rename enum. Rename uses. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24staging: rtl8192e: Convert typedef country_code_type_t to enum country_code_typeLarry Finger
Remove typedef from enum. Rename enum. Rename uses. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24staging: rtl8192e: Convert typedef WOLPATTERN_TYPE to enum wol_pattern_typeLarry Finger
Remove typedef from enum. Rename enum. Rename uses. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24staging: rtl8192e: Convert typedef RT_RF_POWER_STATE to enum rt_rf_power_stateLarry Finger
Remove typedef from enum. Rename enum. Rename uses. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24staging: rtl8192e: Convert typedef RT_JOIN_ACTION to enum rt_join_actionLarry Finger
Remove typedef from enum. Rename enum. Rename uses. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24staging: rtl8192e: Convert typedef IPS_CALLBACK_FUNCION to enum ↵Larry Finger
ips_callback_function Remove typedef from enum. Rename enum. Rename uses. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24staging: rtl8192e: Convert typedef RT_PS_MODE to enum rt_ps_modeLarry Finger
Remove typedef from enum. Rename enum. Rename uses. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24staging: rtl8192e: Convert typedef Fsync_State to enum fsync_stateLarry Finger
Remove typedef from enum. Rename enum. Rename uses. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24staging: rtl8192e: Convert typedef erp_t to enum erp_tLarry Finger
Remove typedef from enum. Rename enum. Rename uses. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24staging: rtl8192e: Convert typedef WIRELESS_NETWORK_TYPE to enum ↵Larry Finger
wireless_network_type Remove typedef from enum. Rename enum. Rename uses. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24staging: rtl8192e: Convert typedef WIRELESS_MODE to enum wireless_modeLarry Finger
Remove typedef from enum. Rename enum. Rename uses. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24staging: rtl8192e: Convert typedef RT_RF_TYPE_DEF to enum rt_rf_type_defLarry Finger
Remove typedef from enum. Rename enum. Rename uses. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24staging: rtl8192e: Convert typedef LED_CTL_MODE to enum led_ctl_modeLarry Finger
Remove typedef from enum. Rename enum. Rename uses. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24staging: rtl8192e: Convert typedef InitialGainOpType to enum init_gain_op_typeLarry Finger
Remove typedef from enum. Rename enum. Rename uses. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24staging: rtl8192e: Convert typedef BA_ACTION to enum ba_actionLarry Finger
Remove typedef from enum. Rename enum. Rename uses. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24staging: rtl8192e: Convert typedef TS_ACTION to enum ts_actionLarry Finger
Remove typedef from enum. Rename enum. Rename uses. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24staging: rtl8192e: Convert typedef ACT_CATEGORY to enum act_categoryLarry Finger
Remove typedef from enum. Rename enum. Rename uses. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24staging: rtl8192e: Convert typedef RT_OP_MODE to enum rt_op_modeLarry Finger
Remove typedef from enum. Rename enum. Rename uses. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24staging: rtl8192e: Convert typedef HW_VARIABLES to enum hw_variablesLarry Finger
Remove typedef from enum. Rename enum. Rename uses. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24staging: rtl8192e: Convert typedef HAL_DEF_VARIABLE to enum hal_def_variableLarry Finger
Remove typedef from enum. Rename enum. Rename uses. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24staging: rtl8192e: Convert typedef DM_DBG_E to enum dm_dbgLarry Finger
Remove typedef from enum. Rename enum. Rename uses. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24staging: rtl8192e: Convert typedef DM_CCK_Rx_Path_Method to enum ↵Larry Finger
dm_cck_rx_path_method Remove typedef from enum. Rename enum. Rename uses. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24staging: rtl8192e: Convert typedef dm_dig_cs_ratio_e to enum dm_dig_cs_ratioLarry Finger
Remove typedef from enum. Rename enum. Rename uses. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24staging: rtl8192e: Convert typedef dm_dig_pd_th_e to enum dm_dig_pd_thLarry Finger
Remove typedef from enum. Rename enum. Rename uses. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24staging: rtl8192e: Convert typedef dm_dig_connect_e to enum dm_dig_connectLarry Finger
Remove typedef from enum. Rename enum. Rename uses. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24staging: rtl8192e: Convert typedef dm_dig_dbg_e to enum dm_dig_dbgLarry Finger
Remove typedef from enum. Rename enum. Rename uses. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24staging: rtl8192e: Convert typedef DM_DIG_EXT_PORT_ALG_E to enum ↵Larry Finger
dm_dig_ext_port_alg Remove typedef from enum. Rename enum. Rename uses. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>