summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* staging: et131x: Remove unused mac definesMark Einon2011-10-111-8/+0
| | | | | | | 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>
* staging: et131x: Fix et131x smatch issuesMark Einon2011-10-111-2/+2
| | | | | | | | | | 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>
* staging: et131x: Fix et131x sparse warningsMark Einon2011-10-113-9/+9
| | | | | | | | | | | | | | | | | | | 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>
* staging: et131x: Remove file et131x_version.hMark Einon2011-10-1112-91/+10
| | | | | | | | 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>
* staging: et131x: Move pm calls from pci device to driver deviceMark Einon2011-10-111-8/+12
| | | | | | | | | | 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>
* staging: et131x: Remove error path from suspend/resume codeMark Einon2011-10-113-32/+45
| | | | | | | | | | | | 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>
* staging: et131x: Removing Olaf Hartmann's email as it bouncesMark Einon2011-10-111-4/+1
| | | | | | | | | | | | | 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>
* staging: r8712u: Fix possible out-of-bounds index with TKIP and AES keysLarry Finger2011-10-111-0/+4
| | | | | | | | | | | 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>
* staging: zcache: fix crash on cpu removeSeth Jennings2011-10-111-2/+8
| | | | | | | | | | | | | | | | | 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>
* Staging: dt3155v4l: silence a compiler warningDan Carpenter2011-10-111-1/+1
| | | | | | | | | | 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>
* easycap: fix ntsc module parameter descriptionThomas Petazzoni2011-10-111-1/+1
| | | | | | | 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>
* staging:iio:dac:ad5638: Fix channel addressLars-Peter Clausen2011-10-111-5/+2
| | | | | | | | | | | | | | | 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>
* staging:iio:dac/dds/impedance dev_info to indio_dev for consistencyJonathan Cameron2011-10-115-62/+62
| | | | | | | | | | | We had a random missmatch of these two. Lets pick the most common and get rid of the other. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> For adxxxx parts Acked-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging:iio:adc:naming: dev_info to indio_dev for consistencyJonathan Cameron2011-10-1110-95/+95
| | | | | | | | | We had a random missmatch of these two. Lets pick the most common and get rid of the other. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Acked-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging:iio:accel:sca3000 dev_info to indio_dev renaming.Jonathan Cameron2011-10-111-8/+8
| | | | | | | | Again, there is a mix of the two names for the struct iio_dev. Lets pick one and run with it. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging:iio:core:naming: dev_info to indio_dev for consistencyJonathan Cameron2011-10-116-194/+195
| | | | | | | | | We had a random missmatch of these two. Lets pick the most common and get rid of the other. This patch covers the core. Others will clean up the drivers. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: iio/adc/ad7150: release lock on errorDan Carpenter2011-10-111-1/+1
| | | | | | | | | The error_ret label should have been before the mutex_unlock(). It's a typo. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: iio/light/tsl2563: fix compile warningDan Carpenter2011-10-111-1/+1
| | | | | | | | | | | | | | | | This fixes a compile warning: drivers/staging/iio/light/tsl2563.c:696:2: warning: initialization from incompatible pointer type [enabled by default] drivers/staging/iio/light/tsl2563.c:696:2: warning: (near initialization for ‘tsl2563_info.write_event_value’) [enabled by default] The tsl2563_write_thresh() function returns zero on success and error codes on failure, so nothing is lost by making the return type int instead of ssize_t. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: iio/light/tsl2563: unlock on an error pathDan Carpenter2011-10-111-1/+2
| | | | | | | | We need to unlock here before returning. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* hv: remove struct hv_device_info from hyperv.hGreg Kroah-Hartman2011-10-112-18/+19
| | | | | | | This is only used/needed by the vmbus core code, so move it out of the hyperv.h file and into the .c file that uses it. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* hv: remove free_channel() from hyperv.hGreg Kroah-Hartman2011-10-112-3/+1
| | | | | | | | This function is only used in the file it is declared in (channel_mgmt.c) so make it static and remove it from the hyperv.h file. Cc: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* hv: hyperv.h: remove unneeded forward declarations of structuresGreg Kroah-Hartman2011-10-111-3/+0
| | | | | | | | This file was created by mushing different .h files together and it shows. This change removes some unneeded forward declarations. Cc: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* hv: hyperv.h: remove unused module macrosGreg Kroah-Hartman2011-10-111-23/+0
| | | | | | | | I have no idea what these were ever for, but they aren't used, so delete them. Cc: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* hv: remove unused LOWORD and HIWORD macros from hyperv.hGreg Kroah-Hartman2011-10-111-4/+0
| | | | | | | | They aren't used anywhere anymore now that the debugging macros are gone, so remove it from hyperv.h as well. Cc: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: hv: remove vmbus_loglevel as it is not used at all anymoreGreg Kroah-Hartman2011-10-112-10/+0
| | | | | | | | | As there is no user of this variable, it's time to delete it. For dynamic debugging of the hyperv code, use the standard dynamic debug kernel interface. Cc: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: hv: remove last user of DPRINT() macroGreg Kroah-Hartman2011-10-113-41/+0
| | | | | | | This also removed the unused function hv_dump_ring_info(). Cc: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: hv: storvsc: remove last usage of DPRINT_WARNGreg Kroah-Hartman2011-10-112-14/+8
| | | | | | | Used the correct dev_warn() call instead. Cc: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* hv: remove a bunch of unused debug macros from hyperv.hGreg Kroah-Hartman2011-10-111-24/+0
| | | | | | | | These aren't used by anyone anymore, so remove them before someone tries to use them again. Cc: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* hv: rename prep_negotiate_resp() to vmbus_prep_negotiate_resp()Greg Kroah-Hartman2011-10-114-11/+10
| | | | | | | | It's a global symbol, so properly prefix it and use the proper EXPORT value as well. Cc: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: hv: remove unneeded asm include file in hyperv.hGreg Kroah-Hartman2011-10-114-6/+3
| | | | | | | | No one outside of the hyperv core needs to include the asm/hyperv.h file, so don't put it in the "global" include/linux/hyperv.h file. Cc: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: hv: move hyperv code out of staging directoryGreg Kroah-Hartman2011-10-1021-45/+41
| | | | | | | | | | After many years wandering the desert, it is finally time for the Microsoft HyperV code to move out of the staging directory. Or at least the core hyperv bus code, and the utility driver, the rest still have some review to get through by the various subsystem maintainers. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
* Staging: hv: netvsc: Fix a dereferencing issueK. Y. Srinivasan2011-10-101-2/+2
| | | | | | | | | net_dev is being de-referenced without proper checking; fix it. Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: hv: storvsc: ignore SET_WINDOW scsi commandOlaf Hering2011-10-101-0/+20
| | | | | | | | | Some commands sent by smartd will offline the device. With this change applied, smartd sill not monitor the device anymore. Signed-off-by: Olaf Hering <olaf@aepfle.de> Acked-by: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: hv: util: Invoke cn_netlink_send() in a work contextK. Y. Srinivasan2011-10-101-7/+11
| | | | | | | | | | | | | Invoke cn_netlink_send() in a work context as opposed being called in the context of channel callback. On entry into the channel callback code the channel inbound spin lock is held and deferring to a work context avoids having to invoke cn_netlink_send() while holding the inbound lock. As part of this adjustment, also increase the timeout value for waiting for the user level component of KVP. 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>
* Staging: hv: util: Fix a bug in kvp implementationK. Y. Srinivasan2011-10-101-8/+5
| | | | | | | | | | | | | | | | | | | | The host gurantees that there can be only one kvp transaction active against the guest. So, the transaction active state is needed only to protect against spurious user level calls. The current code had a race condition where the guest could prematurely return because the previous transaction state was not cleared - this state was being cleared after sending the response to the host and there was a window where the host could notify the guest of a new transaction before the transaction active state was properly set. Also deal with the case when the user mode component does not respond in a timely fashion correctly. I would like to thank Long Li <longli@microsoft.com> for identifying the problem. Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Diagnosed-by: Long Li <longli@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging:iio:resolver:ad2s1210 cleanup gpio handling.Jonathan Cameron2011-10-051-33/+18
| | | | | | | | | | | Basically make use of the gpio array functions. Technically the free doesn't need as much info as given here, but this keeps it clean and easy to follow. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Acked-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging:iio:resolver:ad2s1210 drop raw config register accessJonathan Cameron2011-10-051-44/+0
| | | | | | | | This should never have been exposed to userspace Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Acked-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging:iio:resolver:ad2s1210 minimal chan spec conversion.Jonathan Cameron2011-10-051-51/+63
| | | | | | | | Just convert the raw reads in this patch. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Acked-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging:iio:resolver:ad2s1210 ensure iio_dev->name is setJonathan Cameron2011-10-051-0/+7
| | | | | | | | | | This is needed to ensure the required name attribute is created. Using an id table is the route most consistent with other drivers. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Acked-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging:iio:resolver rename ad2s120x ->ad2s1200Jonathan Cameron2011-10-053-28/+37
| | | | | | | | | | There are far too many possible part numbers that are not covered in here to have such a generic name. So move to naming after one of the supported parts. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Acked-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging:iio:resolver:ad2s120x chan spec conversionJonathan Cameron2011-10-051-37/+37
| | | | | | | | Straight forward conversion. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Acked-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging:iio:Documentation gyro -> anglvel updates in attribute namesJonathan Cameron2011-10-051-54/+54
| | | | | | | | Follows directly from change made in previous patch. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Acked-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging:iio: rename gyro channels to anglvelJonathan Cameron2011-10-058-22/+22
| | | | | | | | | | Ensure naming reflects what is measured, not how it is done. Resolvers can measure the same thing for starters. IIO_GYRO->IIO_ANGL_VEL to ensure consistent naming. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Acked-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging:iio:resolver:ad2s90 chan spec conversionJonathan Cameron2011-10-051-23/+18
| | | | | | | | Trivial conversion. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Acked-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging:iio:resolver:ad2s90 ensure name is passed to iio_core.Jonathan Cameron2011-10-051-3/+8
| | | | | | | | | | Scraps the pointless name define and adds an id table. It's not technically required in drivers with only one supported part but it does make the probe code more consistent. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Acked-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging:iio:resolver:ad2s90 fix registration of null pointerJonathan Cameron2011-10-051-3/+2
| | | | | | | | | | When the new allocation code was introduced a stray pointer to iio_dev structure was left in the chip state structure. This was never set but was then registered with the core. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Acked-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging:iio:lisght:isl29018 use IIO_PROCESSED enum value.Jonathan Cameron2011-10-051-1/+1
| | | | | | | | No functional change, just a trivial tidy up so all drivers do the same thing. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging:iio:adc:ad7314 removal. Supported via hwmon.Jonathan Cameron2011-10-053-289/+0
| | | | | | | | Driver ported over to hwmon where it fits much better. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Acked-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: brcm80211: remove brcmf_op_if from fullmacFranky Lin2011-10-051-70/+50
| | | | | | | | | | Absorb related code into brcmf_add_if/brcmf_del_if. This is part of the net device interface clean up. Reviewed-by: Roland Vossen <rvossen@broadcom.com> Reviewed-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: brcm80211: clean up struct brcmf_if in fullmacFranky Lin2011-10-051-9/+5
| | | | | | | | | | Some elements in structure brcmf_if are unused at all or redundant. This patch cleans it up. Reviewed-by: Roland Vossen <rvossen@broadcom.com> Reviewed-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
OpenPOWER on IntegriCloud