X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fusb%2Fclass%2Fusb-midi.c;h=a9dc047a04a76d72ba845bb123511751e6d2a22c;hb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;hp=3546b9b9615c023c5fe23b3cbcd6b8c3b5971edd;hpb=5273a3df6485dc2ad6aa7ddd441b9a21970f003b;p=linux-2.6.git diff --git a/drivers/usb/class/usb-midi.c b/drivers/usb/class/usb-midi.c index 3546b9b96..a9dc047a0 100644 --- a/drivers/usb/class/usb-midi.c +++ b/drivers/usb/class/usb-midi.c @@ -55,39 +55,39 @@ /* ------------------------------------------------------------------------- */ static int singlebyte = 0; -MODULE_PARM(singlebyte,"i"); +module_param(singlebyte, int, 0); MODULE_PARM_DESC(singlebyte,"Enable sending MIDI messages with single message packet"); static int maxdevices = 4; -MODULE_PARM(maxdevices,"i"); +module_param(maxdevices, int, 0); MODULE_PARM_DESC(maxdevices,"Max number of allocatable MIDI device"); static int uvendor = -1; -MODULE_PARM(uvendor,"i"); +module_param(uvendor, int, 0); MODULE_PARM_DESC(uvendor, "The USB Vendor ID of a semi-compliant interface"); static int uproduct = -1; -MODULE_PARM(uproduct,"i"); +module_param(uproduct, int, 0); MODULE_PARM_DESC(uproduct, "The USB Product ID of a semi-compliant interface"); static int uinterface = -1; -MODULE_PARM(uinterface,"i"); +module_param(uinterface, int, 0); MODULE_PARM_DESC(uinterface, "The Interface number of a semi-compliant interface"); static int ualt = -1; -MODULE_PARM(ualt,"i"); +module_param(ualt, int, 0); MODULE_PARM_DESC(ualt, "The optional alternative setting of a semi-compliant interface"); static int umin = -1; -MODULE_PARM(umin,"i"); +module_param(umin, int, 0); MODULE_PARM_DESC(umin, "The input endpoint of a semi-compliant interface"); static int umout = -1; -MODULE_PARM(umout,"i"); +module_param(umout, int, 0); MODULE_PARM_DESC(umout, "The output endpoint of a semi-compliant interface"); static int ucable = -1; -MODULE_PARM(ucable,"i"); +module_param(ucable, int, 0); MODULE_PARM_DESC(ucable, "The cable number used for a semi-compliant interface"); /** Note -- the usb_string() returns only Latin-1 characters. @@ -95,7 +95,7 @@ MODULE_PARM_DESC(ucable, "The cable number used for a semi-compliant interface") * unicode16LE-to-JIS routine is needed to wrap around usb_get_string(). **/ static unsigned short ulangid = 0x0409; /** 0x0411 for Japanese **/ -MODULE_PARM(ulangid,"h"); +module_param(ulangid, ushort, 0); MODULE_PARM_DESC(ulangid, "The optional preferred USB Language ID for all devices"); MODULE_AUTHOR("NAGANO Daisuke "); @@ -646,9 +646,6 @@ static ssize_t usb_midi_read(struct file *file, char __user *buffer, size_t coun ssize_t ret; DECLARE_WAITQUEUE(wait, current); - if ( ppos != &file->f_pos ) { - return -ESPIPE; - } if ( !access_ok(VERIFY_READ, buffer, count) ) { return -EFAULT; } @@ -728,9 +725,6 @@ static ssize_t usb_midi_write(struct file *file, const char __user *buffer, size ssize_t ret; unsigned long int flags; - if ( ppos != &file->f_pos ) { - return -ESPIPE; - } if ( !access_ok(VERIFY_READ, buffer, count) ) { return -EFAULT; } @@ -823,9 +817,9 @@ static int usb_midi_open(struct inode *inode, struct file *file) for(;;) { down(&open_sem); - for (devs = mididevs.next; devs != &mididevs; devs = devs->next) { + list_for_each(devs, &mididevs) { s = list_entry(devs, struct usb_midi_state, mididev); - for (mdevs = s->midiDevList.next; mdevs != &s->midiDevList; mdevs = mdevs->next) { + list_for_each(mdevs, &s->midiDevList) { m = list_entry(mdevs, struct usb_mididev, list); if ( !((m->dev_midi ^ minor) & ~0xf) ) goto device_found; @@ -920,7 +914,7 @@ static int usb_midi_open(struct inode *inode, struct file *file) printk(KERN_INFO "usb-midi: Open Succeeded. minor= %d.\n", minor); #endif - return 0; /** Success. **/ + return nonseekable_open(inode, file); /** Success. **/ } @@ -951,7 +945,7 @@ static int usb_midi_release(struct inode *inode, struct file *file) if ( m->open_mode & FMODE_READ ) { unsigned long int flagsep; spin_lock_irqsave( &m->min.ep->lock, flagsep ); - m->min.ep->cables[m->min.cableId] = 0; // discard cable + m->min.ep->cables[m->min.cableId] = NULL; // discard cable m->min.ep->readers -= 1; m->open_mode &= ~FMODE_READ; if ( m->min.ep->readers == 0 && @@ -967,7 +961,7 @@ static int usb_midi_release(struct inode *inode, struct file *file) up(&open_sem); wake_up(&open_wait); - file->private_data = 0; + file->private_data = NULL; return 0; } @@ -1294,7 +1288,7 @@ static struct usb_midi_device *parse_descriptor( struct usb_device *d, unsigned unsigned char jack2string[256]; #endif - u = 0; + u = NULL; /* find audiocontrol interface */ p1 = find_csinterface_descriptor( buffer, bufSize, NULL, MS_HEADER, ifnum, altSetting); @@ -1314,7 +1308,7 @@ static struct usb_midi_device *parse_descriptor( struct usb_device *d, unsigned if ( !u ) { return NULL; } - u->deviceName = 0; + u->deviceName = NULL; u->idVendor = d->descriptor.idVendor; u->idProduct = d->descriptor.idProduct; u->interface = ifnum; @@ -1388,7 +1382,7 @@ static struct usb_midi_device *parse_descriptor( struct usb_device *d, unsigned if (quirks==0) { /* MIDISTREAM */ - p2 = 0; + p2 = NULL; for (p1 = find_descriptor(buffer, bufSize, NULL, USB_DT_ENDPOINT, ifnum, altSetting ); p1; p1 = next ) { next = find_descriptor(buffer, bufSize, p1, USB_DT_ENDPOINT, @@ -1397,7 +1391,7 @@ static struct usb_midi_device *parse_descriptor( struct usb_device *d, unsigned ifnum, altSetting ); if ( p2 && next && ( p2 > next ) ) - p2 = 0; + p2 = NULL; if ( p1[0] < 9 || !p2 || p2[0] < 4 ) continue; @@ -1940,8 +1934,8 @@ static int detect_by_hand(struct usb_device *d, unsigned int ifnum, struct usb_m if ( ucable < 0 || ucable > 15 ) ucable = 0; - u.deviceName = 0; /* A flag for alloc_usb_midi_device to get device name - from device. */ + u.deviceName = NULL; /* A flag for alloc_usb_midi_device to get device + name from device. */ u.idVendor = uvendor; u.idProduct = uproduct; u.interface = uinterface; @@ -2018,7 +2012,7 @@ static void usb_midi_disconnect(struct usb_interface *intf) s->usbdev = NULL; usb_set_intfdata (intf, NULL); - for ( list = s->midiDevList.next; list != &s->midiDevList; list = list->next ) { + list_for_each(list, &s->midiDevList) { m = list_entry(list, struct usb_mididev, list); wake_up(&(m->min.ep->wait)); wake_up(&(m->mout.ep->wait));