diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-15 18:06:13 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-15 18:06:13 -0800 |
commit | dab363f938a53ddaee60bfecc1aebdbb3d3af5f0 (patch) | |
tree | ccdb11a6e6191ba71fbc7716714c47b79172070d /drivers/staging/bcm/InterfaceAdapter.h | |
parent | Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394 (diff) | |
parent | Staging: slicoss: Fix long line issues in slicoss.c (diff) | |
download | linux-dev-dab363f938a53ddaee60bfecc1aebdbb3d3af5f0.tar.xz linux-dev-dab363f938a53ddaee60bfecc1aebdbb3d3af5f0.zip |
Merge tag 'staging-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging driver updates from Greg KH:
"Here's the big staging tree pull request for 3.19-rc1.
We continued to delete more lines than were added, always a good
thing, but not at a huge rate this release, only about 70k lines
removed overall mostly from removing the horrid bcm driver.
Lots of normal staging driver cleanups and fixes all over the place,
well over a thousand of them, the shortlog shows all the horrid
details.
The "contentious" thing here is the movement of the Android binder
code out of staging into the "real" part of the kernel. This is code
that has been stable for a few years now and is working as-is in the
tens of millions of devices with no issues. Yes, the code is horrid,
and the userspace api leaves a lot to be desired, but it's not going
to change due to legacy issues that we have no control over. Because
so many devices and companies rely on this, and the code is stable,
might as well promote it out of staging.
This was all discussed at the Linux Plumbers conference, and everyone
participating agreed that this was the best way forward.
There is work happening to replace the binder code with something new
that is happening right now, but I don't expect to see the results of
that work for another year at the earliest. If that ever happens, and
Android switches over to it, I'll gladly remove this version.
As for maintainers, I'll be glad to maintain this code, I've been
doing it for the past few years with no problems. I'll send a
MAINTAINERS entry for it before 3.19-final is out, still need to talk
to the Google developers about if they are willing to help with it or
not, last I checked they were, which was good.
All of these patches have been in linux-next for a while with no
reported issues"
* tag 'staging-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1382 commits)
Staging: slicoss: Fix long line issues in slicoss.c
staging: rtl8712: remove unnecessary else after return
staging: comedi: change some printk calls to pr_err
staging: rtl8723au: hal: Removed the extra semicolon
lustre: Deletion of unnecessary checks before three function calls
staging: lustre: fix sparse warnings: static function declaration
staging: lustre: fixed sparse warnings related to static declarations
staging: unisys: remove duplicate header
staging: unisys: remove unneeded structure
staging: ft1000 : replace __attribute ((__packed__) with __packed
drivers: staging: rtl8192e: Include "asm/unaligned.h" instead of "access_ok.h" in "rtl819x_BAProc.c"
Drivers:staging:rtl8192e: Fixed checkpatch warning
Drivers:staging:clocking-wizard: Added a newline
staging: clocking-wizard: check for a valid clk_name pointer
staging: rtl8723au: Hal_InitPGData() avoid unnecessary typecasts
staging: rtl8723au: _DisableAnalog(): Avoid zero-init variables unnecessarily
staging: rtl8723au: Remove unnecessary wrapper _ResetDigitalProcedure1()
staging: rtl8723au: _ResetDigitalProcedure1_92C() reduce code obfuscation
staging: rtl8723au: Remove unnecessary wrapper _DisableRFAFEAndResetBB()
staging: rtl8723au: _DisableRFAFEAndResetBB8192C(): Reduce code obfuscation
...
Diffstat (limited to 'drivers/staging/bcm/InterfaceAdapter.h')
-rw-r--r-- | drivers/staging/bcm/InterfaceAdapter.h | 79 |
1 files changed, 0 insertions, 79 deletions
diff --git a/drivers/staging/bcm/InterfaceAdapter.h b/drivers/staging/bcm/InterfaceAdapter.h deleted file mode 100644 index 06a6b18bca48..000000000000 --- a/drivers/staging/bcm/InterfaceAdapter.h +++ /dev/null @@ -1,79 +0,0 @@ -#ifndef _INTERFACE_ADAPTER_H -#define _INTERFACE_ADAPTER_H - -struct bcm_bulk_endpoint_in { - char *bulk_in_buffer; - size_t bulk_in_size; - unsigned char bulk_in_endpointAddr; - unsigned int bulk_in_pipe; -}; - -struct bcm_bulk_endpoint_out { - unsigned char bulk_out_buffer; - size_t bulk_out_size; - unsigned char bulk_out_endpointAddr; - unsigned int bulk_out_pipe; - /* this is used when int out endpoint is used as bulk out end point */ - unsigned char int_out_interval; -}; - -struct bcm_intr_endpoint_in { - char *int_in_buffer; - size_t int_in_size; - unsigned char int_in_endpointAddr; - unsigned char int_in_interval; - unsigned int int_in_pipe; -}; - -struct bcm_intr_endpoint_out { - char *int_out_buffer; - size_t int_out_size; - unsigned char int_out_endpointAddr; - unsigned char int_out_interval; - unsigned int int_out_pipe; -}; - -struct bcm_usb_tcb { - struct urb *urb; - void *psIntfAdapter; - bool bUsed; -}; - -struct bcm_usb_rcb { - struct urb *urb; - void *psIntfAdapter; - bool bUsed; -}; - -/* - * This is the interface specific Sub-Adapter - * Structure. - */ -struct bcm_interface_adapter { - struct usb_device *udev; - struct usb_interface *interface; - /* Bulk endpoint in info */ - struct bcm_bulk_endpoint_in sBulkIn; - /* Bulk endpoint out info */ - struct bcm_bulk_endpoint_out sBulkOut; - /* Interrupt endpoint in info */ - struct bcm_intr_endpoint_in sIntrIn; - /* Interrupt endpoint out info */ - struct bcm_intr_endpoint_out sIntrOut; - unsigned long ulInterruptData[2]; - struct urb *psInterruptUrb; - struct bcm_usb_tcb asUsbTcb[MAXIMUM_USB_TCB]; - struct bcm_usb_rcb asUsbRcb[MAXIMUM_USB_RCB]; - atomic_t uNumTcbUsed; - atomic_t uCurrTcb; - atomic_t uNumRcbUsed; - atomic_t uCurrRcb; - struct bcm_mini_adapter *psAdapter; - bool bFlashBoot; - bool bHighSpeedDevice; - bool bSuspended; - bool bPreparingForBusSuspend; - struct work_struct usbSuspendWork; -}; - -#endif |