summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-10-04staging: et131x: Fix add_timer() from et131x_openMark Einon
The error_timer was only getting initialised and an initial jiffies value set following a probe. This could result in the timer needlessly expiring immediately after et131x_open is called. Now this is all done from the open call instead. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04staging: et131x: Add pci suspend & resume functionsMark Einon
Added basic suspend & resume functionality. Tested on an et1310 device, and putting Fedora15 host in and out of hibernation successfully. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04staging: et131x: Remove adapter->bmsr, replace with phydev equivalentsMark Einon
adapter->bmsr is no longer being updated, but is also used to check the link state in places. Remove bmsr from adapter, and replace link state checks with phydev->link check. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04staging: et131x: Introduce et1310_in_phy_coma() callMark Einon
In several places in the code, the pm_csr register is read and the PHY_SW_COMA bit checked. Move this check into its own small function to make the code more readable. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04staging: et131x: Remove TODO entry 'alloc_etherdev initilising memory with zero'Mark Einon
Removing this as I'm pretty sure its not true, and alloc_etherdev isn't provided by this driver anyway. Alternatively, its a badly written comment and I don't understand it. This drivers use of alloc_etherdev() is within keeping with other net devices, so I'm happy. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04staging: wlags49_h2: Remove bad debug messageDavid Kilroy
The message is in the wrong place. We definitely don't want to return at this point, as we may need to turn off encryption. Reported-by: Henk de Groot <pe1dnn@amsat.org> Signed-off-by: David Kiroy <kilroyd@googlemail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04staging: wlags49_h2: Remove unused debug functionDavid Kilroy
The function no longer compiles, so we just remove it. Reported-by: Henk de Groot <pe1dnn@amsat.org> Signed-off-by: David Kilroy <kilroyd@googlemail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04staging: wlags49_h2: Use C99 __func__David Kilroy
in DBG machinery so you don't have to declare DBG_FUNC at the start of all functions. This just makes it easy to add DBG conforming to existing code. The patch reformats the changed #defines to satisfy checkstyle.pl Signed-off-by: David Kilroy <kilroyd@googlemail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04Staging: hv: mousevsc: Get rid of unnecessary commentsK. Y. Srinivasan
Get rid of unnecessary comments. 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>
2011-10-04Staging: hv: mousevsc: Enable autoloading of the mouse driverK. Y. Srinivasan
Now that the mouse driver is functional, enable the auto-loading of the driver. 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>
2011-10-04Staging: hv: mousevsc: Cleanup mousevsc_on_device_add()K. Y. Srinivasan
Cleanup mousevsc_on_device_add(). 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>
2011-10-04Staging: hv: mousevsc: Get rid of mousevsc_on_receive_input_report() by inliningK. Y. Srinivasan
Get rid of mousevsc_on_receive_input_report() by inlining the code. 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>
2011-10-04Staging: hv: mousevsc: Cleanup camel cased enumsK. Y. Srinivasan
Cleanup all camel cased names. 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>
2011-10-04Staging: hv: mousevsc: Get rid of ref_count state in struct mousevsc_devK. Y. Srinivasan
Now get rid of the machinery for managing the life-cycle of the mousevsc_dev as this is not needed. 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>
2011-10-04Staging: hv: mousevsc: Now cleanup mousevsc_remove()K. Y. Srinivasan
Now, cleanup mousevsc_remove(). The mouse driver once initialized only receives data from the host. So, by closing the channel first in the unload path, we can properly deal with inflight packets. So, we don't need the machinery for managing the life-cycle of the mousevsc_dev object. Get rid of the unnecessary code. 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>
2011-10-04Staging: hv: mousevsc: Get rid of mousevsc_on_device_remove() by inlining codeK. Y. Srinivasan
Get rid of mousevsc_on_device_remove() by inlining code. 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>
2011-10-04Staging: hv: mousevsc: Cleanup mousevsc_connect_to_vsp()K. Y. Srinivasan
Cleanup mousevsc_connect_to_vsp(). There is no need to take reference on the mousevsc device object when we are setting up the device. As part of this cleanup get rid of get_input_device() as this function is only used here. 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>
2011-10-04Staging: hv: mousevsc: Get rid of mousevsc_on_send_completion()K. Y. Srinivasan
We don't need to handle the "send complete" callback - nothing needs to be done here; get rid of the code. 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>
2011-10-04Staging: hv: mousevsc: Cleanup alloc_input_device()K. Y. Srinivasan
Cleanup alloc_input_device(); you can directly set the reference count. 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>
2011-10-04Staging: hv: mousevsc: Get rid of the unused state: num_outstanding_reqK. Y. Srinivasan
Get rid of the unused state: num_outstanding_req in struct mousevsc_dev. 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>
2011-10-04Staging: hv: mousevsc: Free allocated memory in free_input_device()K. Y. Srinivasan
Free all allocated memory in free_input_device(). 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>
2011-10-04Staging: hv: mousevsc: Get rid of unnecessary pr_* callsK. Y. Srinivasan
Get rid of unnecessary pr_* calls. 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>
2011-10-04Staging: hv: mousevsc: Cleanup error handlingK. Y. Srinivasan
Cleanup error handling in this driver; use standard Linux error codes. 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>
2011-10-04Staging: hv: mousevsc: Get rid of unnecessary DPRINT callsK. Y. Srinivasan
Get rid of unnecessary DPRINT calls. 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>
2011-10-04Staging: hv: mousevsc: Cleanup and properly implement reportdesc_callback()K. Y. Srinivasan
Cleanup and properly implement reportdesc_callback(); properly allocate the hid_device and properly initialize the hid device structure. 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>
2011-10-04Staging: hv: mousevsc: Use completion primitive to synchronizeK. Y. Srinivasan
Use completion primitive to synchronize. 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>
2011-10-04Staging: hv: mousevsc: Correctly initialize the header sizeK. Y. Srinivasan
Correctly initialize the header size. 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>
2011-10-04Staging: hv: mousevsc: Handle the case where we may get bogus report desc sizeK. Y. Srinivasan
Handle the case where we may get bogus report desc size from the host. 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>
2011-10-04Staging: hv: mousevsc: Change the allocation flags to reflect interrupt contextK. Y. Srinivasan
Change the allocation flags to reflect interrupt context. 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>
2011-10-04Staging: hv: mousevsc: Fixup some bogus WARN_ON() callsK. Y. Srinivasan
Fix the bogus WARN_ON() calls. 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>
2011-10-04Staging: hv: mousevsc: Get rid of the struct input_device_contextK. Y. Srinivasan
The state maintained in struct input_device_context can easily be included in the struct mousevsc_dev structure. Simplify the code by consolidating the state. 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>
2011-10-04Staging: hv: mousevsc: Fixup struct hv_input_dev_infoK. Y. Srinivasan
This structure is protocol defined structure and must match the definition on the host side. Make appropriate adjustments. 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>
2011-10-04Merge git://github.com/davem330/netLinus Torvalds
* git://github.com/davem330/net: pch_gbe: Fixed the issue on which a network freezes pch_gbe: Fixed the issue on which PC was frozen when link was downed. make PACKET_STATISTICS getsockopt report consistently between ring and non-ring net: xen-netback: correctly restart Tx after a VM restore/migrate bonding: properly stop queuing work when requested can bcm: fix incomplete tx_setup fix RDSRDMA: Fix cleanup of rds_iw_mr_pool net: Documentation: Fix type of variables ibmveth: Fix oops on request_irq failure ipv6: nullify ipv6_ac_list and ipv6_fl_list when creating new socket cxgb4: Fix EEH on IBM P7IOC can bcm: fix tx_setup off-by-one errors MAINTAINERS: tehuti: Alexander Indenbaum's address bounces dp83640: reduce driver noise ptp: fix L2 event message recognition
2011-10-04staging: iio: if(__LITTLE_ENDIAN) -> #ifdef __LITTLE_ENDIANJonathan Cameron
Unsuprisingly this symbol isn't defined on big endian systems. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04staging: r8712u: include module.h where neededStephen Rothwell
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Acked-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04staging: iio: adc: add includes of module.h and stat.hStephen Rothwell
fixes these build problems: drivers/staging/iio/adc/ad7746.c:345:8: error: 'S_IWUSR' undeclared here (not in a function) drivers/staging/iio/adc/ad7746.c:436:8: error: 'S_IRUGO' undeclared here (not in a function) drivers/staging/iio/adc/ad7746.c:681:19: error: 'THIS_MODULE' undeclared here (not in a function) drivers/staging/iio/adc/ad7746.c:778:1: warning: data definition has no type or storage class [enabled by default] drivers/staging/iio/adc/ad7746.c:778:1: warning: type defaults to 'int' in declaration of 'MODULE_DEVICE_TABLE' [-Wimplicit-int] drivers/staging/iio/adc/ad7746.c:778:1: warning: parameter names (without types) in function declaration [enabled by default] drivers/staging/iio/adc/ad7746.c:799:15: error: expected declaration specifiers or '...' before string constant drivers/staging/iio/adc/ad7746.c:800:20: error: expected declaration specifiers or '...' before string constant drivers/staging/iio/adc/ad7746.c:801:16: error: expected declaration specifiers or '...' before string constant Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Acked-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04USB: ftdi_sio: add PID for Sony Ericsson UrbanHakan Kvist
Add PID 0xfc8a, 0xfc8b for device Sony Ericsson Urban Signed-off-by: Hakan Kvist <hakan.kvist@sonyericsson.com> Signed-off-by: Oskar Andero <oskar.andero@sonyericsson.com> Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04usb: Add module.h to various dwc3 driversPaul Gortmaker
These files uses the full set of MODULE_ macros and so need to include module.h directly. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04usb: dwc3: convert structures into bitshiftsFelipe Balbi
our parameter structures need to be written to HW, so instead of assuming little endian, we convert those into bit shifts. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04usb: dwc3: gadget: allow clock gating to workFelipe Balbi
The dwc3 core has internal clock gating support. Let's allow that to happen by clearing the disable bit in GCTL register. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04usb: dwc3: core: cache GHWPARAMS* registersFelipe Balbi
cache the contents of GHWPARAMS* registers in our device structure for easy access. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04usb: dwc3: add struct dwc3_hwparamsFelipe Balbi
That structure will hold a copy of readonly GHWPARAMS* registers for ease accessing by the driver. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04usb: dwc3: gadget: implement streams supportFelipe Balbi
The following patch adds support for streams to dwc3 driver. While at that, also fix one small issue on endpoint disable where we should clear all flags not only ENABLED. Reviewied-by: Paul Zimmerman <paulz@synopsys.com> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04usb: dwc3: gadget: add support for BurstsFelipe Balbi
We already have the value from gadget drivers, just need to pass it to our controller. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04usb: dwc3: gadget: fix DMA offset calculationPaul Zimmerman
Fix offset calculation in dwc3_trb_dma_offset() Signed-off-by: Paul Zimmerman <paulz@synopsys.com> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04usb: dwc3: gadget: make DWC3_EP_WEDGE do the right thingPaul Zimmerman
This makes DWC3_EP_WEDGE do the right thing, which is prevent DWC3_EP_WEDGE from ever being cleared by a ClearFeature(HALT) command. [ balbi@ti.com : allowed set_wedge to send SetHalt command to controller ] Signed-off-by: Paul Zimmerman <paulz@synopsys.com> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04usb: dwc3: gadget: driver should not wait for RxFIFO to drainPaul Zimmerman
An older version of the databook said to wait for the FIFO to drain, but that has been removed from the newer databooks. Waiting for RxFIFO to drain caused problems when testing against one of the host controllers available in the market. After talking to one of the RTL engineers, he stated that we should _not_ wait for RxFIFO to drain. Signed-off-by: Paul Zimmerman <paulz@synopsys.com> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04usb: dwc3: gadget: fix DEPSTARTCFG for non-EP0 EPsPaul Zimmerman
DEPSTARTCFG for non-EP0 EPs must only be sent once per config [ balbi@ti.com : changed config_start to start_config_issued ] Signed-off-by: Paul Zimmerman <paulz@synopsys.com> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04usb: dwc: remove "All rights reserved" statement.Sebastian Andrzej Siewior
Some people think that this line is not compatible with the GPL. The statement was required due to the Buenos Aires Convention and is now deprecated. I remove it because it is said that it is pointless nowdays. Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04usb: dwc3: ep0: fix debug outputSebastian Andrzej Siewior
Use "ep0in" and "ep0out" instead "ep1in" and "ep0out" which is confusing and not consistent with the remaining output. Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>