git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
usbcore: trivial whitespace fixes
[safe/jmp/linux-2.6]
/
drivers
/
usb
/
core
/
devio.c
diff --git
a/drivers/usb/core/devio.c
b/drivers/usb/core/devio.c
index
2c9c946
..
2087766
100644
(file)
--- a/
drivers/usb/core/devio.c
+++ b/
drivers/usb/core/devio.c
@@
-522,19
+522,19
@@
static int check_ctrlrecip(struct dev_state *ps, unsigned int requesttype, unsig
static struct usb_device *usbdev_lookup_minor(int minor)
{
static struct usb_device *usbdev_lookup_minor(int minor)
{
- struct
class_device *class_dev
;
- struct usb_device *dev = NULL;
+ struct
device *device
;
+ struct usb_device *
u
dev = NULL;
down(&usb_device_class->sem);
down(&usb_device_class->sem);
- list_for_each_entry(
class_dev, &usb_device_class->children
, node) {
- if (
class_dev
->devt == MKDEV(USB_DEVICE_MAJOR, minor)) {
-
dev = class_dev->class
_data;
+ list_for_each_entry(
device, &usb_device_class->devices
, node) {
+ if (
device
->devt == MKDEV(USB_DEVICE_MAJOR, minor)) {
+
udev = device->platform
_data;
break;
}
}
up(&usb_device_class->sem);
break;
}
}
up(&usb_device_class->sem);
- return dev;
+ return
u
dev;
};
/*
};
/*
@@
-561,7
+561,7
@@
static int usbdev_open(struct inode *inode, struct file *file)
dev = inode->i_private;
if (!dev)
goto out;
dev = inode->i_private;
if (!dev)
goto out;
- ret = usb_autoresume_device(dev
, 1
);
+ ret = usb_autoresume_device(dev);
if (ret)
goto out;
if (ret)
goto out;
@@
-570,6
+570,7
@@
static int usbdev_open(struct inode *inode, struct file *file)
ps->dev = dev;
ps->file = file;
spin_lock_init(&ps->lock);
ps->dev = dev;
ps->file = file;
spin_lock_init(&ps->lock);
+ INIT_LIST_HEAD(&ps->list);
INIT_LIST_HEAD(&ps->async_pending);
INIT_LIST_HEAD(&ps->async_completed);
init_waitqueue_head(&ps->wait);
INIT_LIST_HEAD(&ps->async_pending);
INIT_LIST_HEAD(&ps->async_completed);
init_waitqueue_head(&ps->wait);
@@
-609,7
+610,7
@@
static int usbdev_release(struct inode *inode, struct file *file)
releaseintf(ps, ifnum);
}
destroy_all_async(ps);
releaseintf(ps, ifnum);
}
destroy_all_async(ps);
- usb_autosuspend_device(dev
, 1
);
+ usb_autosuspend_device(dev);
usb_unlock_device(dev);
usb_put_dev(dev);
put_pid(ps->disc_pid);
usb_unlock_device(dev);
usb_put_dev(dev);
put_pid(ps->disc_pid);
@@
-962,7
+963,11
@@
static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb,
kfree(dr);
return -EFAULT;
}
kfree(dr);
return -EFAULT;
}
- snoop(&ps->dev->dev, "control urb\n");
+ snoop(&ps->dev->dev, "control urb: bRequest=%02x "
+ "bRrequestType=%02x wValue=%04x "
+ "wIndex=%04x wLength=%04x\n",
+ dr->bRequest, dr->bRequestType, dr->wValue,
+ dr->wIndex, dr->wLength);
break;
case USBDEVFS_URB_TYPE_BULK:
break;
case USBDEVFS_URB_TYPE_BULK:
@@
-1216,7
+1221,7
@@
static int proc_submiturb_compat(struct dev_state *ps, void __user *arg)
{
struct usbdevfs_urb uurb;
{
struct usbdevfs_urb uurb;
- if (get_urb32(&uurb,(struct usbdevfs_urb32 *)arg))
+ if (get_urb32(&uurb,(struct usbdevfs_urb32
__user
*)arg))
return -EFAULT;
return proc_do_submiturb(ps, &uurb, ((struct usbdevfs_urb32 __user *)arg)->iso_frame_desc, arg);
return -EFAULT;
return proc_do_submiturb(ps, &uurb, ((struct usbdevfs_urb32 __user *)arg)->iso_frame_desc, arg);
@@
-1251,7
+1256,7
@@
static int processcompl_compat(struct async *as, void __user * __user *arg)
}
free_async(as);
}
free_async(as);
- if (put_user(
(u32)(u64)addr
, (u32 __user *)arg))
+ if (put_user(
ptr_to_compat(addr)
, (u32 __user *)arg))
return -EFAULT;
return 0;
}
return -EFAULT;
return 0;
}
@@
-1520,7
+1525,7
@@
static int usbdev_ioctl(struct inode *inode, struct file *file, unsigned int cmd
case USBDEVFS_IOCTL32:
snoop(&dev->dev, "%s: IOCTL\n", __FUNCTION__);
case USBDEVFS_IOCTL32:
snoop(&dev->dev, "%s: IOCTL\n", __FUNCTION__);
- ret = proc_ioctl_compat(ps,
(compat_uptr_t)(long)p
);
+ ret = proc_ioctl_compat(ps,
ptr_to_compat(p)
);
break;
#endif
break;
#endif
@@
-1588,20
+1593,23
@@
const struct file_operations usbfs_device_file_operations = {
.release = usbdev_release,
};
.release = usbdev_release,
};
-static
void
usbdev_add(struct usb_device *dev)
+static
int
usbdev_add(struct usb_device *dev)
{
int minor = ((dev->bus->busnum-1) * 128) + (dev->devnum-1);
{
int minor = ((dev->bus->busnum-1) * 128) + (dev->devnum-1);
- dev->
class_dev = class_device_create(usb_device_class, NULL
,
- MKDEV(USB_DEVICE_MAJOR, minor),
&dev->dev,
+ dev->
usbfs_dev = device_create(usb_device_class, &dev->dev
,
+ MKDEV(USB_DEVICE_MAJOR, minor),
"usbdev%d.%d", dev->bus->busnum, dev->devnum);
"usbdev%d.%d", dev->bus->busnum, dev->devnum);
+ if (IS_ERR(dev->usbfs_dev))
+ return PTR_ERR(dev->usbfs_dev);
- dev->class_dev->class_data = dev;
+ dev->usbfs_dev->platform_data = dev;
+ return 0;
}
static void usbdev_remove(struct usb_device *dev)
{
}
static void usbdev_remove(struct usb_device *dev)
{
-
class_device_unregister(dev->clas
s_dev);
+
device_unregister(dev->usbf
s_dev);
}
static int usbdev_notify(struct notifier_block *self, unsigned long action,
}
static int usbdev_notify(struct notifier_block *self, unsigned long action,
@@
-1609,7
+1617,8
@@
static int usbdev_notify(struct notifier_block *self, unsigned long action,
{
switch (action) {
case USB_DEVICE_ADD:
{
switch (action) {
case USB_DEVICE_ADD:
- usbdev_add(dev);
+ if (usbdev_add(dev))
+ return NOTIFY_BAD;
break;
case USB_DEVICE_REMOVE:
usbdev_remove(dev);
break;
case USB_DEVICE_REMOVE:
usbdev_remove(dev);