ChangeSet 1.1587.3.43, 2004/05/11 14:31:48-07:00, [EMAIL PROTECTED]
[PATCH] USB: Add class support to drivers/usb/misc/tiglusb.c
drivers/usb/misc/tiglusb.c | 64 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 49 insertions(+), 15 deletions(-)
diff -Nru a/drivers/usb/misc/tiglusb.c b/drivers/usb/misc/tiglusb.c
--- a/drivers/usb/misc/tiglusb.c Fri May 14 15:29:16 2004
+++ b/drivers/usb/misc/tiglusb.c Fri May 14 15:29:16 2004
@@ -33,6 +33,7 @@
#include <linux/usb.h>
#include <linux/smp_lock.h>
#include <linux/devfs_fs_kernel.h>
+#include <linux/device.h>
#include <linux/ticable.h>
#include "tiglusb.h"
@@ -49,6 +50,7 @@
static tiglusb_t tiglusb[MAXTIGL];
static int timeout = TIMAXTIME; /* timeout in tenth of seconds */
+static struct class_simple *tiglusb_class;
/*---------- misc functions ------------------------------------------- */
@@ -336,7 +338,7 @@
{
struct usb_device *dev = interface_to_usbdev(intf);
int minor = -1;
- int i;
+ int i, err = 0;
ptiglusb_t s;
dbg ("probing vendor id 0x%x, device id 0x%x",
@@ -347,18 +349,23 @@
* the TIGL hardware, there's only 1 configuration.
*/
- if (dev->descriptor.bNumConfigurations != 1)
- return -ENODEV;
+ if (dev->descriptor.bNumConfigurations != 1) {
+ err = -ENODEV;
+ goto out;
+ }
if ((dev->descriptor.idProduct != 0xe001)
- && (dev->descriptor.idVendor != 0x451))
- return -ENODEV;
+ && (dev->descriptor.idVendor != 0x451)) {
+ err = -ENODEV;
+ goto out;
+ }
// NOTE: it's already in this config, this shouldn't be needed.
// is this working around some hardware bug?
if (usb_reset_configuration (dev) < 0) {
err ("tiglusb_probe: reset_configuration failed");
- return -ENODEV;
+ err = -ENODEV;
+ goto out;
}
/*
@@ -372,8 +379,10 @@
}
}
- if (minor == -1)
- return -ENODEV;
+ if (minor == -1) {
+ err = -ENODEV;
+ goto out;
+ }
s = &tiglusb[minor];
@@ -383,17 +392,28 @@
up (&s->mutex);
dbg ("bound to interface");
- devfs_mk_cdev(MKDEV(TIUSB_MAJOR, TIUSB_MINOR) + s->minor,
+ class_simple_device_add(tiglusb_class, MKDEV(TIUSB_MAJOR, TIUSB_MINOR +
s->minor),
+ NULL, "usb%d", s->minor);
+ err = devfs_mk_cdev(MKDEV(TIUSB_MAJOR, TIUSB_MINOR) + s->minor,
S_IFCHR | S_IRUGO | S_IWUGO,
"ticables/usb/%d", s->minor);
+ if (err)
+ goto out_class;
+
/* Display firmware version */
info ("firmware revision %i.%02x",
dev->descriptor.bcdDevice >> 8,
dev->descriptor.bcdDevice & 0xff);
usb_set_intfdata (intf, s);
- return 0;
+ err = 0;
+ goto out;
+
+out_class:
+ class_simple_device_remove(MKDEV(TIUSB_MAJOR, TIUSB_MINOR + s->minor));
+out:
+ return err;
}
static void
@@ -423,6 +443,7 @@
s->dev = NULL;
s->opened = 0;
+ class_simple_device_remove(MKDEV(TIUSB_MAJOR, TIUSB_MINOR + s->minor));
devfs_remove("ticables/usb/%d", s->minor);
info ("device %d removed", s->minor);
@@ -473,7 +494,7 @@
tiglusb_init (void)
{
unsigned u;
- int result;
+ int result, err = 0;
/* initialize struct */
for (u = 0; u < MAXTIGL; u++) {
@@ -490,28 +511,41 @@
/* register device */
if (register_chrdev (TIUSB_MAJOR, "tiglusb", &tiglusb_fops)) {
err ("unable to get major %d", TIUSB_MAJOR);
- return -EIO;
+ err = -EIO;
+ goto out;
}
/* Use devfs, tree: /dev/ticables/usb/[0..3] */
devfs_mk_dir ("ticables/usb");
+ tiglusb_class = class_simple_create(THIS_MODULE, "tiglusb");
+ if (IS_ERR(tiglusb_class)) {
+ err = PTR_ERR(tiglusb_class);
+ goto out_chrdev;
+ }
/* register USB module */
result = usb_register (&tiglusb_driver);
if (result < 0) {
- unregister_chrdev (TIUSB_MAJOR, "tiglusb");
- return -1;
+ err = -1;
+ goto out_chrdev;
}
info (DRIVER_DESC ", version " DRIVER_VERSION);
- return 0;
+ err = 0;
+ goto out;
+
+out_chrdev:
+ unregister_chrdev (TIUSB_MAJOR, "tiglusb");
+out:
+ return err;
}
static void __exit
tiglusb_cleanup (void)
{
usb_deregister (&tiglusb_driver);
+ class_simple_destroy(tiglusb_class);
devfs_remove("ticables/usb");
unregister_chrdev (TIUSB_MAJOR, "tiglusb");
}
-------------------------------------------------------
This SF.Net email is sponsored by: SourceForge.net Broadband
Sign-up now for SourceForge Broadband and get the fastest
6.0/768 connection for only $19.95/mo for the first 3 months!
http://ads.osdn.com/?ad_id%62&alloc_ida84&op=click
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
