summaryrefslogtreecommitdiff
path: root/drivers
AgeCommit message (Collapse)Author
2011-10-17staging:rts_pstor:Fix SDIO issuewwang
Fix a bug that SDIO and SD normal card would appear simultaneously if a SDIO card inserted. Signed-off-by: wwang <wei_wang@realsil.com.cn> Acked-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-17Staging: comedi: fix brace coding style issue in ni_atmio.cJake Burton
This is a patch to the ni_atmio.c file which fixes a brace and whitespace warning found by the checkpatch.pl tool Signed-off-by: Jake Burton <jake5991@live.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-17Staging: comedi: c6xdigio: fixed missing KERN_* in printkNasir Abed
Fixed missing KERN_* in printk statements. Signed-off-by: Nasir Abed <nasirabed+kernel@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: clean up 2nd display stateAaro Koskinen
Convert the display type to enum and rename disp_state to display2. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: delete CRT1 stateAaro Koskinen
The driver does not need to manage CRT1 state. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: make DAC tables constAaro Koskinen
DAC tables are read-only and can be made const. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: make RAM type tables constAaro Koskinen
RAM type tables are read-only and can be made const. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: move XGINew_DataBusWidth into vb_device_infoAaro Koskinen
Move the memory bus width info to vb_device_info. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: move XGINew_ChannelAB into vb_device_infoAaro Koskinen
Move the memory channel info into vb_device_info. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: move XGINew_RAMType into vb_device_infoAaro Koskinen
The RAM type is device specific, so move it into vb_device_info. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: eliminate global XGI_Pr dataAaro Koskinen
Move vb_device_info into xgifb_video_info. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: make XGIbios_mode constAaro Koskinen
Comments are wrong, the table is read-only and can be made const. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: eliminate filter_tb global variableAaro Koskinen
filter_tb is only used inside a single function, and it does not need to be static. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: eliminate XGIfb_fixAaro Koskinen
Eliminate XGIfb_fix and initialize needed fields of fb_info->fix in probe(). Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: eliminate default_varAaro Koskinen
Eliminate default_var and initialize needed fields of fb_info->var in probe(). Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: eliminate XGIfb_CRT2_write_enable variableAaro Koskinen
Replace XGIfb_CRT2_write_enable with IND_XGI_CRT2_WRITE_ENABLE_315. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: move pseudo_palette into xgifb_video_infoAaro Koskinen
pseudo_palette should be dynamically allocated for each fb. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: move XGIfb_rate_idx into xgifb_video_infoAaro Koskinen
The current refresh rate index should be stored in the device-specific data allocated in probe(). Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: move xgifb_mode_idx into xgifb_video_infoAaro Koskinen
The current mode index should be stored in the device-specific data allocated in probe(). Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: eliminate XGIfb_mode_noAaro Koskinen
We can get the information from the table with mode index. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: dynamically allocate xgifb_video_infoAaro Koskinen
Delete global xgi_video_info and dynamically allocate the data. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: avoid direct references xgi_video_infoAaro Koskinen
Avoid direct references to global xgi_video_info. This will help changing the data from statically allocated to dynamically allocated. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: rename struct video_info to xgifb_video_infoAaro Koskinen
Rename struct video_info to xgifb_video_info. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: add a global variable for the default refresh rateAaro Koskinen
Add a global variable for the default refresh rate. This is done to get rid of references to xgi_video_info before the probe routine, which should allocate the xgi_video_info dynamically in the future. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: inline XGIfb_query_VGA_config_space()Aaro Koskinen
XGIfb_query_VGA_config_space() is used only once during the init and can be replaced with a single PCI configuration space read. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: eliminate global XGIhw_ext dataAaro Koskinen
Move xgi_hw_device_info into xgi_video_info. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: eliminate global fb_info variableAaro Koskinen
Move fb_info into xgi_video_info. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: use PCI drvdataAaro Koskinen
Don't access the global xgi_video_info directly in xgifb_remove(). Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: zcache: reduce tmem bucket lock contentionSeth Jennings
tmem uses hash buckets each with their own rbtree and lock to quickly lookup tmem objects. tmem has TMEM_HASH_BUCKETS (256) buckets per pool. However, because of the way the tmem_oid is generated for frontswap pages, only 16 unique tmem_oids are being generated, resulting in only 16 of the 256 buckets being used. This cause high lock contention for the per bucket locks. This patch changes SWIZ_BITS to include more bits of the offset. The result is that all 256 hash buckets are potentially used resulting in a 95% drop in hash bucket lock contention. Signed-off-by: Seth Jennings <sjenning@linux.vnet.ibm.com> Acked-by: Dan Magenheimer <dan.magenheimer@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: brcm80211: remove brcm80211 driver from the staging treeArend van Spriel
With the mainline patch being applied to the wireless-next repository by John Linville this driver is no longer needed under the staging directory. This patch ends its life under the staging tree. Cc: John W. Linville <linville@tuxdriver.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-11Staging: bcm: Fix coding style issues in InterfaceMisc.cKevin McKinney
This patch cleans up several code style issues found in InterfaceMisc.c reported by checkpatch.pl. Signed-off-by: Kevin McKinney <klmckinney1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-11Staging: bcm: Remove assignment from if conditions reported by checkpatch.plKevin McKinney
This patch removes an assignment from three if conditions. In all three cases, the line of code was attempting to allocate memory, and check if the memory was allocated in the if statement. This issue was reported by checkpatch.pl. Signed-off-by: Kevin McKinney <klmckinney1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-11Staging: bcm: Fix coding style issues reported by checkpatch.plKevin McKinney
This patch cleans up several code style issues found in InterfaceInit.c reported by checkpatch.pl. Signed-off-by: Kevin McKinney <klmckinney1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-11Staging: bcm: Fix assignment issue in if statement reported by checkpatch.pl.Kevin McKinney
This patch fixes an error where an assignment "=" was being used in an if statement to determine if Firmware was downloaded. This patch removes that assignment, and places it above the if statement. The if statement then evaluates the status to verify if "0" successful, or != 0 failure. Signed-off-by: Kevin McKinney <klmckinney1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-11Staging: bcm: Remove assignment in if condition reported by checkpatch.plKevin McKinney
There is a case where an assignment was being done in an if condition. This patch removes the assignment from the if condition and places the assignment above the if statement; thereby improving the readability of the code. Signed-off-by: Kevin McKinney <klmckinney1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-11Staging: bcm: Replace dated variable __FUNCTION__ reported by checkpatch.plKevin McKinney
This patch replaces the obsolete variable, __FUNCTION__, that holds the name of the current function with variable, __func__. Signed-off-by: Kevin McKinney <klmckinney1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-11Staging: bcm: Fix coding style issues reported by checkpatch.plKevin McKinney
This patch cleans up several hundred code style issues found in Misc.c reported by checkpatch.pl. Signed-off-by: Kevin McKinney <klmckinney1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-11staging: et131x: Update TODO listMark Einon
Added some more tasks to the TODO list, as highlighted by Francois Romieu <romieu@fr.zoreil.com>. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-11staging: et131x: Remove unused mac definesMark Einon
Remove some unused defines from et1310_mac.c. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-11staging: et131x: Fix et131x smatch issuesMark Einon
This fixes the following issues: et131x_initpci.c +488 et131x_adjust_link(45) error: we previously assumed 'phydev' could be null. et131x_initpci.c +504 et131x_adjust_link(61) warn: variable dereferenced before check 'phydev' Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-11staging: et131x: Fix et131x sparse warningsMark Einon
This fixes the following warnings: et1310_mac.c:375:44: warning: incorrect type in initializer (different address spaces) et1310_mac.c:382:28: warning: incorrect type in argument 2 (different address spaces) et1310_mac.c:384:31: warning: incorrect type in argument 2 (different address spaces) et131x_initpci.c:555:5: warning: symbol 'et131x_mii_probe' was not declared. Should it be static? et131x_netdev.c:267:5: warning: symbol 'et131x_ioctl' was not declared. Should it be static? et131x_netdev.c:285:5: warning: symbol 'et131x_set_packet_filter' was not declared. Should it be static? et131x_netdev.c:347:6: warning: symbol 'et131x_multicast' was not declared. Should it be static? et131x_netdev.c:420:5: warning: symbol 'et131x_tx' was not declared. Should it be static? et131x_netdev.c:453:6: warning: symbol 'et131x_tx_timeout' was not declared. Should it be static? et131x_netdev.c:511:5: warning: symbol 'et131x_change_mtu' was not declared. Should it be static? et131x_netdev.c:564:5: warning: symbol 'et131x_set_mac_addr' was not declared. Should it be static? Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-11staging: et131x: Remove file et131x_version.hMark Einon
Removed defines in et131x_version.h and replaced them by actual strings where convinient, or moved them to et131x.h Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-11staging: et131x: Move pm calls from pci device to driver deviceMark Einon
Move the pci driver suspend/resume calls up to the driver.pm ops structure, as they are not pci device specific. Thanks to Francois Romieu <romieu@fr.zoreil.com> for pointing this out. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-11staging: et131x: Remove error path from suspend/resume codeMark Einon
Removing an error path from et131x suspend/resume functions. Also added a call to phy_stop() to complement the phy_start() call during device start/stop routine. Thanks to Francois Romieu <romieu@fr.zoreil.com> for pointing this out. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-11staging: et131x: Removing Olaf Hartmann's email as it bouncesMark Einon
On 3 October 2011 18:51, Uwe Ranft <uwe.ranft@telozo.com> wrote: > Hello, > olaf is not more longer owner of this e-mailadress. he has left our > company. > Please remove olaf fron the mailing list! > Best Regards > Uwe Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-11staging: r8712u: Fix possible out-of-bounds index with TKIP and AES keysLarry Finger
Array XGrpKey has only 2 elements and uses (keyid - 1) as the index, which allows the possibility of memory corruption from an out-of-bounds index. This problem was reported by a new version of smatch. Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-11staging: zcache: fix crash on cpu removeSeth Jennings
In the case that a cpu is taken offline before zcache_do_preload() is ever called on the cpu, the per-cpu zcache_preloads structure will be uninitialized. In the CPU_DEAD case for zcache_cpu_notifier(), kp->obj is not checked before calling kmem_cache_free() on it. If it is NULL, a crash results. This patch ensures that both kp->obj and kp->page are not NULL before calling the respective free functions. In practice, just checking one or the other should be sufficient since they are assigned together in zcache_do_preload(), but I check both for safety. Signed-off-by: Seth Jennings <sjenning@linux.vnet.ibm.com> Acked-by: Dave Hansen <dave@linux.vnet.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-11Staging: dt3155v4l: silence a compiler warningDan Carpenter
The '!' is dead code that was left over from a previous version. It causes a compiler warning: drivers/staging/dt3155v4l/dt3155v4l.c:335:3: warning: value computed is not used Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-11easycap: fix ntsc module parameter descriptionThomas Petazzoni
Cc: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-11staging:iio:dac:ad5638: Fix channel addressLars-Peter Clausen
Commit c6fc806247 ("staging:iio: ABI rework - add in_ or out_ prefix to channnels") added the AD5868_CHANNEL macro to simplify channel initialization. Unfortunately the macro hardcodes the channel's address to AD5686_ADDR_DAC0. As a result writing to any of the channels will change the value of the first channel. This patch fixes the issue by calculating the channel address based on the channel number. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Acked-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>