lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

USB: musb: remove some of the never defined defines

Browse Source 
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>
This commit is contained in:
Felipe Balbi
2009-12-15 11:08:39 +02:00
committed by Greg Kroah-Hartman
parent 94375751d1
commit 7ed069c12c
2 changed files with 4 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/usb/musb/musb_core.c
View File

@@ -1314,9 +1314,6 @@ enum { MUSB_CONTROLLER_MHDRC, MUSB_CONTROLLER_HDRC, };
*/ */
static int __init musb_core_init(u16 musb_type, struct musb *musb) static int __init musb_core_init(u16 musb_type, struct musb *musb)
{ {
#ifdef MUSB_AHB_ID
u32 data;
#endif
u8 reg; u8 reg;
char *type; char *type;
char aInfo[90], aRevision[32], aDate[12]; char aInfo[90], aRevision[32], aDate[12];
@@ -1332,19 +1329,11 @@ static int __init musb_core_init(u16 musb_type, struct musb *musb)
strcat(aInfo, ", dyn FIFOs"); strcat(aInfo, ", dyn FIFOs");
if (reg & MUSB_CONFIGDATA_MPRXE) { if (reg & MUSB_CONFIGDATA_MPRXE) {
strcat(aInfo, ", bulk combine"); strcat(aInfo, ", bulk combine");
#ifdef C_MP_RX
musb->bulk_combine = true; musb->bulk_combine = true;
#else
strcat(aInfo, " (X)"); /* no driver support */
#endif
} }
if (reg & MUSB_CONFIGDATA_MPTXE) { if (reg & MUSB_CONFIGDATA_MPTXE) {
strcat(aInfo, ", bulk split"); strcat(aInfo, ", bulk split");
#ifdef C_MP_TX
musb->bulk_split = true; musb->bulk_split = true;
#else
strcat(aInfo, " (X)"); /* no driver support */
#endif
} }
if (reg & MUSB_CONFIGDATA_HBRXE) { if (reg & MUSB_CONFIGDATA_HBRXE) {
strcat(aInfo, ", HB-ISO Rx"); strcat(aInfo, ", HB-ISO Rx");
@@ -1360,20 +1349,7 @@ static int __init musb_core_init(u16 musb_type, struct musb *musb)
printk(KERN_DEBUG "%s: ConfigData=0x%02x (%s)\n", printk(KERN_DEBUG "%s: ConfigData=0x%02x (%s)\n",
musb_driver_name, reg, aInfo); musb_driver_name, reg, aInfo);
#ifdef MUSB_AHB_ID
data = musb_readl(mbase, 0x404);
sprintf(aDate, "%04d-%02x-%02x", (data & 0xffff),
(data >> 16) & 0xff, (data >> 24) & 0xff);
/* FIXME ID2 and ID3 are unused */
data = musb_readl(mbase, 0x408);
printk(KERN_DEBUG "ID2=%lx\n", (long unsigned)data);
data = musb_readl(mbase, 0x40c);
printk(KERN_DEBUG "ID3=%lx\n", (long unsigned)data);
reg = musb_readb(mbase, 0x400);
musb_type = ('M' == reg) ? MUSB_CONTROLLER_MHDRC : MUSB_CONTROLLER_HDRC;
#else
aDate[0] = 0; aDate[0] = 0;
#endif
if (MUSB_CONTROLLER_MHDRC == musb_type) { if (MUSB_CONTROLLER_MHDRC == musb_type) {
musb->is_multipoint = 1; musb->is_multipoint = 1;
type = "M"; type = "M";

16
drivers/usb/musb/musb_core.h
View File

@@ -412,21 +412,13 @@ struct musb {
unsigned hb_iso_rx:1; /* high bandwidth iso rx? */ unsigned hb_iso_rx:1; /* high bandwidth iso rx? */
unsigned hb_iso_tx:1; /* high bandwidth iso tx? */ 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) \ #define can_bulk_split(musb,type) \
(((type) == USB_ENDPOINT_XFER_BULK) && (musb)->bulk_split) (((type) == USB_ENDPOINT_XFER_BULK) && (musb)->bulk_split)
#else
#define can_bulk_split(musb, type) 0
#endif
#ifdef C_MP_RX unsigned bulk_combine:1;
unsigned bulk_combine:1;
#define can_bulk_combine(musb,type) \ #define can_bulk_combine(musb,type) \
(((type) == USB_ENDPOINT_XFER_BULK) && (musb)->bulk_combine) (((type) == USB_ENDPOINT_XFER_BULK) && (musb)->bulk_combine)
#else
#define can_bulk_combine(musb, type) 0
#endif
#ifdef CONFIG_USB_GADGET_MUSB_HDRC #ifdef CONFIG_USB_GADGET_MUSB_HDRC
/* is_suspended means USB B_PERIPHERAL suspend */ /* is_suspended means USB B_PERIPHERAL suspend */