diff options
| author | Felipe Balbi <felipe.balbi@nokia.com> | 2009-12-15 11:08:39 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-02 14:53:29 -0800 |
| commit | 7ed069c12c866c5c06e4e05d26878797e3731829 (patch) | |
| tree | 1cdf8f8604a0e20a8b9d83f807d2aa660e329d23 /drivers/usb/musb/musb_core.h | |
| parent | 94375751d1d8af70df08beebdc32595f9e4537e1 (diff) | |
| download | blackbird-obmc-linux-7ed069c12c866c5c06e4e05d26878797e3731829.tar.gz blackbird-obmc-linux-7ed069c12c866c5c06e4e05d26878797e3731829.zip | |
USB: musb: remove some of the never defined defines
just makes the musb init code a bit cleaner.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/musb/musb_core.h')
| -rw-r--r-- | drivers/usb/musb/musb_core.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h index 03d50909b078..2ac0e6f7dd9d 100644 --- a/drivers/usb/musb/musb_core.h +++ b/drivers/usb/musb/musb_core.h @@ -412,21 +412,13 @@ struct musb { unsigned hb_iso_rx:1; /* high bandwidth iso rx? */ unsigned hb_iso_tx:1; /* high bandwidth iso tx? */ -#ifdef C_MP_TX - unsigned bulk_split:1; + unsigned bulk_split:1; #define can_bulk_split(musb,type) \ - (((type) == USB_ENDPOINT_XFER_BULK) && (musb)->bulk_split) -#else -#define can_bulk_split(musb, type) 0 -#endif + (((type) == USB_ENDPOINT_XFER_BULK) && (musb)->bulk_split) -#ifdef C_MP_RX - unsigned bulk_combine:1; + unsigned bulk_combine:1; #define can_bulk_combine(musb,type) \ - (((type) == USB_ENDPOINT_XFER_BULK) && (musb)->bulk_combine) -#else -#define can_bulk_combine(musb, type) 0 -#endif + (((type) == USB_ENDPOINT_XFER_BULK) && (musb)->bulk_combine) #ifdef CONFIG_USB_GADGET_MUSB_HDRC /* is_suspended means USB B_PERIPHERAL suspend */ |
