Merge branch 'linux-2.6' into for-linus

5 files changed, 23 insertions, 27 deletions

diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c
index aca165d43aa0..defd5743dba6 100644
--- a/drivers/isdn/gigaset/common.c
+++ b/drivers/isdn/gigaset/common.c
@@ -616,7 +616,7 @@ static struct bc_state *gigaset_initbcs(struct bc_state *bcs,
         } else if ((bcs->skb = dev_alloc_skb(SBUFSIZE + HW_HDR_LEN)) != NULL)
                 skb_reserve(bcs->skb, HW_HDR_LEN);
         else {
-                dev_warn(cs->dev, "could not allocate skb\n");
+                warn("could not allocate skb\n");
                 bcs->inputstate |= INS_skip_frame;
         }
 
@@ -702,7 +702,7 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,
         cs->open_count = 0;
         cs->dev = NULL;
         cs->tty = NULL;
-        cs->class = NULL;
+        cs->tty_dev = NULL;
         cs->cidmode = cidmode != 0;
 
         //if(onechannel) { //FIXME
diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h
index 884bd72c1bf4..06298cc52bf5 100644
--- a/drivers/isdn/gigaset/gigaset.h
+++ b/drivers/isdn/gigaset/gigaset.h
@@ -444,7 +444,7 @@ struct cardstate {
         struct gigaset_driver *driver;
         unsigned minor_index;
         struct device *dev;
-        struct class_device *class;
+        struct device *tty_dev;
 
         const struct gigaset_ops *ops;
 
diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
index 596f3aebe2f7..7edea015867e 100644
--- a/drivers/isdn/gigaset/interface.c
+++ b/drivers/isdn/gigaset/interface.c
@@ -625,13 +625,13 @@ void gigaset_if_init(struct cardstate *cs)
                 return;
 
         tasklet_init(&cs->if_wake_tasklet, &if_wake, (unsigned long) cs);
-        cs->class = tty_register_device(drv->tty, cs->minor_index, NULL);
+        cs->tty_dev = tty_register_device(drv->tty, cs->minor_index, NULL);
 
-        if (!IS_ERR(cs->class))
-                class_set_devdata(cs->class, cs);
+        if (!IS_ERR(cs->tty_dev))
+                dev_set_drvdata(cs->tty_dev, cs);
         else {
                 warn("could not register device to the tty subsystem");
-                cs->class = NULL;
+                cs->tty_dev = NULL;
         }
 }
 
@@ -645,7 +645,7 @@ void gigaset_if_free(struct cardstate *cs)
 
         tasklet_disable(&cs->if_wake_tasklet);
         tasklet_kill(&cs->if_wake_tasklet);
-        cs->class = NULL;
+        cs->tty_dev = NULL;
         tty_unregister_device(drv->tty, cs->minor_index);
 }
 
diff --git a/drivers/isdn/gigaset/proc.c b/drivers/isdn/gigaset/proc.c
index 9ad840e95dbe..e767afa55abf 100644
--- a/drivers/isdn/gigaset/proc.c
+++ b/drivers/isdn/gigaset/proc.c
@@ -16,11 +16,12 @@
 #include "gigaset.h"
 #include <linux/ctype.h>
 
-static ssize_t show_cidmode(struct class_device *class, char *buf)
+static ssize_t show_cidmode(struct device *dev,
+                            struct device_attribute *attr, char *buf)
 {
         int ret;
         unsigned long flags;
-        struct cardstate *cs = class_get_devdata(class);
+        struct cardstate *cs = dev_get_drvdata(dev);
 
         spin_lock_irqsave(&cs->lock, flags);
         ret = sprintf(buf, "%u\n", cs->cidmode);
@@ -29,10 +30,10 @@ static ssize_t show_cidmode(struct class_device *class, char *buf)
         return ret;
 }
 
-static ssize_t set_cidmode(struct class_device *class,
+static ssize_t set_cidmode(struct device *dev, struct device_attribute *attr,
                            const char *buf, size_t count)
 {
-        struct cardstate *cs = class_get_devdata(class);
+        struct cardstate *cs = dev_get_drvdata(dev);
         long int value;
         char *end;
 
@@ -64,25 +65,25 @@ static ssize_t set_cidmode(struct class_device *class,
         return count;
 }
 
-static CLASS_DEVICE_ATTR(cidmode, S_IRUGO|S_IWUSR, show_cidmode, set_cidmode);
+static DEVICE_ATTR(cidmode, S_IRUGO|S_IWUSR, show_cidmode, set_cidmode);
 
 /* free sysfs for device */
 void gigaset_free_dev_sysfs(struct cardstate *cs)
 {
-        if (!cs->class)
+        if (!cs->tty_dev)
                 return;
 
         gig_dbg(DEBUG_INIT, "removing sysfs entries");
-        class_device_remove_file(cs->class, &class_device_attr_cidmode);
+        device_remove_file(cs->tty_dev, &dev_attr_cidmode);
 }
 
 /* initialize sysfs for device */
 void gigaset_init_dev_sysfs(struct cardstate *cs)
 {
-        if (!cs->class)
+        if (!cs->tty_dev)
                 return;
 
         gig_dbg(DEBUG_INIT, "setting up sysfs");
-        if (class_device_create_file(cs->class, &class_device_attr_cidmode))
+        if (device_create_file(cs->tty_dev, &dev_attr_cidmode))
                 dev_err(cs->dev, "could not create sysfs attribute\n");
 }
diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
index 4ffa9eb1c28e..5ebf49ac9b23 100644
--- a/drivers/isdn/gigaset/usb-gigaset.c
+++ b/drivers/isdn/gigaset/usb-gigaset.c
@@ -815,14 +815,11 @@ static int gigaset_probe(struct usb_interface *interface,
         return 0;
 
 error:
-        if (ucs->read_urb)
-                usb_kill_urb(ucs->read_urb);
+        usb_kill_urb(ucs->read_urb);
         kfree(ucs->bulk_out_buffer);
-        if (ucs->bulk_out_urb != NULL)
-                usb_free_urb(ucs->bulk_out_urb);
+        usb_free_urb(ucs->bulk_out_urb);
         kfree(cs->inbuf[0].rcvbuf);
-        if (ucs->read_urb != NULL)
-                usb_free_urb(ucs->read_urb);
+        usb_free_urb(ucs->read_urb);
         usb_set_intfdata(interface, NULL);
         ucs->read_urb = ucs->bulk_out_urb = NULL;
         cs->inbuf[0].rcvbuf = ucs->bulk_out_buffer = NULL;
@@ -850,11 +847,9 @@ static void gigaset_disconnect(struct usb_interface *interface)
         usb_kill_urb(ucs->bulk_out_urb);        /* FIXME: only if active? */
 
         kfree(ucs->bulk_out_buffer);
-        if (ucs->bulk_out_urb != NULL)
-                usb_free_urb(ucs->bulk_out_urb);
+        usb_free_urb(ucs->bulk_out_urb);
         kfree(cs->inbuf[0].rcvbuf);
-        if (ucs->read_urb != NULL)
-                usb_free_urb(ucs->read_urb);
+        usb_free_urb(ucs->read_urb);
         ucs->read_urb = ucs->bulk_out_urb = NULL;
         cs->inbuf[0].rcvbuf = ucs->bulk_out_buffer = NULL;