Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git

4 files changed, 17 insertions, 18 deletions

diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index b5e076043431..80ec9aa575bb 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -2202,9 +2202,8 @@ boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         if (vortex_debug > 6) {
                 printk(KERN_DEBUG "boomerang_start_xmit()\n");
-                if (vortex_debug > 3)
-                        printk(KERN_DEBUG "%s: Trying to send a packet, Tx index %d.\n",
-                                   dev->name, vp->cur_tx);
+                printk(KERN_DEBUG "%s: Trying to send a packet, Tx index %d.\n",
+                           dev->name, vp->cur_tx);
         }
 
         if (vp->cur_tx - vp->dirty_tx >= TX_RING_SIZE) {
diff --git a/drivers/net/8390.c b/drivers/net/8390.c
index bab16bcc9ae5..6d76f3a99b17 100644
--- a/drivers/net/8390.c
+++ b/drivers/net/8390.c
@@ -225,9 +225,9 @@ void ei_tx_timeout(struct net_device *dev)
         unsigned long icucr;
 
         local_irq_save(flags);
-        icucr = inl(ICUCR1);
+        icucr = inl(M32R_ICU_CR1_PORTL);
         icucr |= M32R_ICUCR_ISMOD11;
-        outl(icucr, ICUCR1);
+        outl(icucr, M32R_ICU_CR1_PORTL);
         local_irq_restore(flags);
 #endif
         ei_local->stat.tx_errors++;
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index ad4b58af6b76..ab726ab43798 100644
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -273,7 +273,7 @@ static int ppp_connect_channel(struct channel *pch, int unit);
 static int ppp_disconnect_channel(struct channel *pch);
 static void ppp_destroy_channel(struct channel *pch);
 
-static struct class_simple *ppp_class;
+static struct class *ppp_class;
 
 /* Translates a PPP protocol number to a NP index (NP == network protocol) */
 static inline int proto_to_npindex(int proto)
@@ -858,12 +858,12 @@ static int __init ppp_init(void)
         printk(KERN_INFO "PPP generic driver version " PPP_VERSION "\n");
         err = register_chrdev(PPP_MAJOR, "ppp", &ppp_device_fops);
         if (!err) {
-                ppp_class = class_simple_create(THIS_MODULE, "ppp");
+                ppp_class = class_create(THIS_MODULE, "ppp");
                 if (IS_ERR(ppp_class)) {
                         err = PTR_ERR(ppp_class);
                         goto out_chrdev;
                 }
-                class_simple_device_add(ppp_class, MKDEV(PPP_MAJOR, 0), NULL, "ppp");
+                class_device_create(ppp_class, MKDEV(PPP_MAJOR, 0), NULL, "ppp");
                 err = devfs_mk_cdev(MKDEV(PPP_MAJOR, 0),
                                 S_IFCHR|S_IRUSR|S_IWUSR, "ppp");
                 if (err)
@@ -876,8 +876,8 @@ out:
         return err;
 
 out_class:
-        class_simple_device_remove(MKDEV(PPP_MAJOR,0));
-        class_simple_destroy(ppp_class);
+        class_device_destroy(ppp_class, MKDEV(PPP_MAJOR,0));
+        class_destroy(ppp_class);
 out_chrdev:
         unregister_chrdev(PPP_MAJOR, "ppp");
         goto out;
@@ -2654,8 +2654,8 @@ static void __exit ppp_cleanup(void)
         if (unregister_chrdev(PPP_MAJOR, "ppp") != 0)
                 printk(KERN_ERR "PPP: failed to unregister PPP device\n");
         devfs_remove("ppp");
-        class_simple_device_remove(MKDEV(PPP_MAJOR, 0));
-        class_simple_destroy(ppp_class);
+        class_device_destroy(ppp_class, MKDEV(PPP_MAJOR, 0));
+        class_destroy(ppp_class);
 }
 
 /*
diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c
index 921a573372e9..7ff814fd65d0 100644
--- a/drivers/net/wan/cosa.c
+++ b/drivers/net/wan/cosa.c
@@ -235,7 +235,7 @@ static int dma[MAX_CARDS+1];
 static int irq[MAX_CARDS+1] = { -1, -1, -1, -1, -1, -1, 0, };
 
 /* for class stuff*/
-static struct class_simple *cosa_class;
+static struct class *cosa_class;
 
 #ifdef MODULE
 module_param_array(io, int, NULL, 0);
@@ -394,19 +394,19 @@ static int __init cosa_init(void)
                 goto out;
         }
         devfs_mk_dir("cosa");
-        cosa_class = class_simple_create(THIS_MODULE, "cosa");
+        cosa_class = class_create(THIS_MODULE, "cosa");
         if (IS_ERR(cosa_class)) {
                 err = PTR_ERR(cosa_class);
                 goto out_chrdev;
         }
         for (i=0; i<nr_cards; i++) {
-                class_simple_device_add(cosa_class, MKDEV(cosa_major, i),
+                class_device_create(cosa_class, MKDEV(cosa_major, i),
                                 NULL, "cosa%d", i);
                 err = devfs_mk_cdev(MKDEV(cosa_major, i),
                                 S_IFCHR|S_IRUSR|S_IWUSR,
                                 "cosa/%d", i);
                 if (err) {
-                        class_simple_device_remove(MKDEV(cosa_major, i));
+                        class_device_destroy(cosa_class, MKDEV(cosa_major, i));
                         goto out_chrdev;                
                 }
         }
@@ -427,10 +427,10 @@ static void __exit cosa_exit(void)
         printk(KERN_INFO "Unloading the cosa module\n");
 
         for (i=0; i<nr_cards; i++) {
-                class_simple_device_remove(MKDEV(cosa_major, i));
+                class_device_destroy(cosa_class, MKDEV(cosa_major, i));
                 devfs_remove("cosa/%d", i);
         }
-        class_simple_destroy(cosa_class);
+        class_destroy(cosa_class);
         devfs_remove("cosa");
         for (cosa=cosa_cards; nr_cards--; cosa++) {
                 /* Clean up the per-channel data */