Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

11 files changed, 21 insertions, 81 deletions

diff --git a/drivers/s390/Makefile b/drivers/s390/Makefile
index 4f4e7cf105d4..d0eae59bc366 100644
--- a/drivers/s390/Makefile
+++ b/drivers/s390/Makefile
@@ -4,7 +4,7 @@
 
 CFLAGS_sysinfo.o += -Iinclude/math-emu -Iarch/s390/math-emu -w
 
-obj-y += s390mach.o sysinfo.o s390_rdev.o
+obj-y += s390mach.o sysinfo.o
 obj-y += cio/ block/ char/ crypto/ net/ scsi/ kvm/
 
 drivers-y += drivers/s390/built-in.o
diff --git a/drivers/s390/block/dasd_eer.c b/drivers/s390/block/dasd_eer.c
index 892e2878d61b..f8e05ce98621 100644
--- a/drivers/s390/block/dasd_eer.c
+++ b/drivers/s390/block/dasd_eer.c
@@ -535,8 +535,8 @@ static int dasd_eer_open(struct inode *inp, struct file *filp)
             eerb->buffer_page_count > INT_MAX / PAGE_SIZE) {
                 kfree(eerb);
                 MESSAGE(KERN_WARNING, "can't open device since module "
-                        "parameter eer_pages is smaller then 1 or"
-                        " bigger then %d", (int)(INT_MAX / PAGE_SIZE));
+                        "parameter eer_pages is smaller than 1 or"
+                        " bigger than %d", (int)(INT_MAX / PAGE_SIZE));
                 unlock_kernel();
                 return -EINVAL;
         }
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index 26ffc6ab441d..cfdcf1aed33c 100644
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -18,7 +18,6 @@
 #include <asm/io.h>
 #include <linux/completion.h>
 #include <linux/interrupt.h>
-#include <asm/s390_rdev.h>
 
 #define DCSSBLK_NAME "dcssblk"
 #define DCSSBLK_MINORS_PER_DISK 1
@@ -946,7 +945,7 @@ dcssblk_check_params(void)
 static void __exit
 dcssblk_exit(void)
 {
-        s390_root_dev_unregister(dcssblk_root_dev);
+        root_device_unregister(dcssblk_root_dev);
         unregister_blkdev(dcssblk_major, DCSSBLK_NAME);
 }
 
@@ -955,22 +954,22 @@ dcssblk_init(void)
 {
         int rc;
 
-        dcssblk_root_dev = s390_root_dev_register("dcssblk");
+        dcssblk_root_dev = root_device_register("dcssblk");
         if (IS_ERR(dcssblk_root_dev))
                 return PTR_ERR(dcssblk_root_dev);
         rc = device_create_file(dcssblk_root_dev, &dev_attr_add);
         if (rc) {
-                s390_root_dev_unregister(dcssblk_root_dev);
+                root_device_unregister(dcssblk_root_dev);
                 return rc;
         }
         rc = device_create_file(dcssblk_root_dev, &dev_attr_remove);
         if (rc) {
-                s390_root_dev_unregister(dcssblk_root_dev);
+                root_device_unregister(dcssblk_root_dev);
                 return rc;
         }
         rc = register_blkdev(0, DCSSBLK_NAME);
         if (rc < 0) {
-                s390_root_dev_unregister(dcssblk_root_dev);
+                root_device_unregister(dcssblk_root_dev);
                 return rc;
         }
         dcssblk_major = rc;
diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c
index aabbeb909cc6..d8a2289fcb69 100644
--- a/drivers/s390/char/vmlogrdr.c
+++ b/drivers/s390/char/vmlogrdr.c
@@ -427,7 +427,7 @@ static int vmlogrdr_receive_data(struct vmlogrdr_priv_t *priv)
                         buffer = priv->buffer + sizeof(int);
                 }
                 /*
-                 * If the record is bigger then our buffer, we receive only
+                 * If the record is bigger than our buffer, we receive only
                  * a part of it. We can get the rest later.
                  */
                 if (iucv_data_count > NET_BUFFER_SIZE)
@@ -437,7 +437,7 @@ static int vmlogrdr_receive_data(struct vmlogrdr_priv_t *priv)
                                           0, buffer, iucv_data_count,
                                           &priv->residual_length);
                 spin_unlock_bh(&priv->priv_lock);
-                /* An rc of 5 indicates that the record was bigger then
+                /* An rc of 5 indicates that the record was bigger than
                  * the buffer, which is OK for us. A 9 indicates that the
                  * record was purged befor we could receive it.
                  */
diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
index 1f5f5d2d87d9..9c148406b980 100644
--- a/drivers/s390/crypto/ap_bus.c
+++ b/drivers/s390/crypto/ap_bus.c
@@ -36,7 +36,6 @@
 #include <linux/notifier.h>
 #include <linux/kthread.h>
 #include <linux/mutex.h>
-#include <asm/s390_rdev.h>
 #include <asm/reset.h>
 #include <asm/airq.h>
 #include <asm/atomic.h>
@@ -1522,7 +1521,7 @@ int __init ap_module_init(void)
         }
 
         /* Create /sys/devices/ap. */
-        ap_root_device = s390_root_dev_register("ap");
+        ap_root_device = root_device_register("ap");
         rc = IS_ERR(ap_root_device) ? PTR_ERR(ap_root_device) : 0;
         if (rc)
                 goto out_bus;
@@ -1565,7 +1564,7 @@ out_work:
         hrtimer_cancel(&ap_poll_timer);
         destroy_workqueue(ap_work_queue);
 out_root:
-        s390_root_dev_unregister(ap_root_device);
+        root_device_unregister(ap_root_device);
 out_bus:
         while (i--)
                 bus_remove_file(&ap_bus_type, ap_bus_attrs[i]);
@@ -1600,7 +1599,7 @@ void ap_module_exit(void)
         hrtimer_cancel(&ap_poll_timer);
         destroy_workqueue(ap_work_queue);
         tasklet_kill(&ap_tasklet);
-        s390_root_dev_unregister(ap_root_device);
+        root_device_unregister(ap_root_device);
         while ((dev = bus_find_device(&ap_bus_type, NULL, NULL,
                     __ap_match_all)))
         {
diff --git a/drivers/s390/kvm/kvm_virtio.c b/drivers/s390/kvm/kvm_virtio.c
index 28c90b89f2b4..cbc8566fab70 100644
--- a/drivers/s390/kvm/kvm_virtio.c
+++ b/drivers/s390/kvm/kvm_virtio.c
@@ -24,7 +24,6 @@
 #include <asm/kvm_virtio.h>
 #include <asm/setup.h>
 #include <asm/s390_ext.h>
-#include <asm/s390_rdev.h>
 
 #define VIRTIO_SUBCODE_64 0x0D00
 
@@ -335,7 +334,7 @@ static int __init kvm_devices_init(void)
         if (!MACHINE_IS_KVM)
                 return -ENODEV;
 
-        kvm_root = s390_root_dev_register("kvm_s390");
+        kvm_root = root_device_register("kvm_s390");
         if (IS_ERR(kvm_root)) {
                 rc = PTR_ERR(kvm_root);
                 printk(KERN_ERR "Could not register kvm_s390 root device");
@@ -344,7 +343,7 @@ static int __init kvm_devices_init(void)
 
         rc = vmem_add_mapping(real_memory_size, PAGE_SIZE);
         if (rc) {
-                s390_root_dev_unregister(kvm_root);
+                root_device_unregister(kvm_root);
                 return rc;
         }
 
diff --git a/drivers/s390/net/cu3088.c b/drivers/s390/net/cu3088.c
index f4a32375c037..48383459e99b 100644
--- a/drivers/s390/net/cu3088.c
+++ b/drivers/s390/net/cu3088.c
@@ -25,7 +25,6 @@
 #include <linux/module.h>
 #include <linux/err.h>
 
-#include <asm/s390_rdev.h>
 #include <asm/ccwdev.h>
 #include <asm/ccwgroup.h>
 
@@ -120,12 +119,12 @@ cu3088_init (void)
 {
         int rc;
 
-        cu3088_root_dev = s390_root_dev_register("cu3088");
+        cu3088_root_dev = root_device_register("cu3088");
         if (IS_ERR(cu3088_root_dev))
                 return PTR_ERR(cu3088_root_dev);
         rc = ccw_driver_register(&cu3088_driver);
         if (rc)
-                s390_root_dev_unregister(cu3088_root_dev);
+                root_device_unregister(cu3088_root_dev);
 
         return rc;
 }
@@ -134,7 +133,7 @@ static void __exit
 cu3088_exit (void)
 {
         ccw_driver_unregister(&cu3088_driver);
-        s390_root_dev_unregister(cu3088_root_dev);
+        root_device_unregister(cu3088_root_dev);
 }
 
 MODULE_DEVICE_TABLE(ccw,cu3088_ids);
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index 6811dd529f48..d1b5bebea7fb 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -24,7 +24,6 @@
 
 #include <asm/ebcdic.h>
 #include <asm/io.h>
-#include <asm/s390_rdev.h>
 
 #include "qeth_core.h"
 #include "qeth_core_offl.h"
@@ -4525,7 +4524,7 @@ static int __init qeth_core_init(void)
                                 &driver_attr_group);
         if (rc)
                 goto driver_err;
-        qeth_core_root_dev = s390_root_dev_register("qeth");
+        qeth_core_root_dev = root_device_register("qeth");
         rc = IS_ERR(qeth_core_root_dev) ? PTR_ERR(qeth_core_root_dev) : 0;
         if (rc)
                 goto register_err;
@@ -4539,7 +4538,7 @@ static int __init qeth_core_init(void)
 
         return 0;
 slab_err:
-        s390_root_dev_unregister(qeth_core_root_dev);
+        root_device_unregister(qeth_core_root_dev);
 register_err:
         driver_remove_file(&qeth_core_ccwgroup_driver.driver,
                            &driver_attr_group);
@@ -4557,7 +4556,7 @@ out_err:
 
 static void __exit qeth_core_exit(void)
 {
-        s390_root_dev_unregister(qeth_core_root_dev);
+        root_device_unregister(qeth_core_root_dev);
         driver_remove_file(&qeth_core_ccwgroup_driver.driver,
                            &driver_attr_group);
         ccwgroup_driver_unregister(&qeth_core_ccwgroup_driver);
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index e873d45f1a71..c4f1b046c3b1 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -20,8 +20,6 @@
 #include <linux/mii.h>
 #include <linux/ip.h>
 
-#include <asm/s390_rdev.h>
-
 #include "qeth_core.h"
 #include "qeth_core_offl.h"
 
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index eeeb35b07296..68d623ab7e6e 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -26,8 +26,6 @@
 #include <net/ip.h>
 #include <net/arp.h>
 
-#include <asm/s390_rdev.h>
-
 #include "qeth_l3.h"
 #include "qeth_core_offl.h"
 
diff --git a/drivers/s390/s390_rdev.c b/drivers/s390/s390_rdev.c
deleted file mode 100644
index 64371c05a3b3..000000000000
--- a/drivers/s390/s390_rdev.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  drivers/s390/s390_rdev.c
- *  s390 root device
- *
- *    Copyright (C) 2002, 2005 IBM Deutschland Entwicklung GmbH,
- *                       IBM Corporation
- *    Author(s): Cornelia Huck (cornelia.huck@de.ibm.com)
- *                Carsten Otte  (cotte@de.ibm.com)
- */
-
-#include <linux/slab.h>
-#include <linux/err.h>
-#include <linux/device.h>
-#include <asm/s390_rdev.h>
-
-static void
-s390_root_dev_release(struct device *dev)
-{
-        kfree(dev);
-}
-
-struct device *
-s390_root_dev_register(const char *name)
-{
-        struct device *dev;
-        int ret;
-
-        if (!strlen(name))
-                return ERR_PTR(-EINVAL);
-        dev = kzalloc(sizeof(struct device), GFP_KERNEL);
-        if (!dev)
-                return ERR_PTR(-ENOMEM);
-        dev_set_name(dev, name);
-        dev->release = s390_root_dev_release;
-        ret = device_register(dev);
-        if (ret) {
-                kfree(dev);
-                return ERR_PTR(ret);
-        }
-        return dev;
-}
-
-void
-s390_root_dev_unregister(struct device *dev)
-{
-        if (dev)
-                device_unregister(dev);
-}
-
-EXPORT_SYMBOL(s390_root_dev_register);
-EXPORT_SYMBOL(s390_root_dev_unregister);