[PATCH] devfs: Remove devfs_mk_cdev() function from the kernel tree

[firefly-linux-kernel-4.4.55.git] / drivers / char / viotape.c

diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
index a5e104f428f8449602ffea248a3168d486212ca4..4c1a128fd77b537f72eeaecae4083a063a52457a 100644 (file)
--- a/drivers/char/viotape.c
+++ b/drivers/char/viotape.c
@@ -29,10 +29,9 @@
  *
  * All tape operations are performed by sending messages back and forth to
  * the OS/400 partition.  The format of the messages is defined in
- * iSeries/vio.h
+ * iseries/vio.h
  */
 #include <linux/config.h>
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
@@ -54,10 +53,10 @@
 #include <asm/ioctls.h>
 
 #include <asm/vio.h>
-#include <asm/iSeries/vio.h>
-#include <asm/iSeries/HvLpEvent.h>
-#include <asm/iSeries/HvCallEvent.h>
-#include <asm/iSeries/HvLpConfig.h>
+#include <asm/iseries/vio.h>
+#include <asm/iseries/hv_lp_event.h>
+#include <asm/iseries/hv_call_event.h>
+#include <asm/iseries/hv_lp_config.h>
 
 #define VIOTAPE_VERSION                "1.2"
 #define VIOTAPE_MAXREQ         1
@@ -247,7 +246,6 @@ static struct device *tape_device[VIOTAPE_MAX_TAPE];
  */
 static struct {
        unsigned char   cur_part;
-       int             dev_handle;
        unsigned char   part_stat_rwi[MAX_PARTITIONS];
 } state[VIOTAPE_MAX_TAPE];
 
@@ -960,12 +958,7 @@ static int viotape_probe(struct vio_dev *vdev, const struct vio_device_id *id)
                        "iseries!vt%d", i);
        class_device_create(tape_class, NULL, MKDEV(VIOTAPE_MAJOR, i | 0x80),
                        NULL, "iseries!nvt%d", i);
-       devfs_mk_cdev(MKDEV(VIOTAPE_MAJOR, i), S_IFCHR | S_IRUSR | S_IWUSR,
-                       "iseries/vt%d", i);
-       devfs_mk_cdev(MKDEV(VIOTAPE_MAJOR, i | 0x80),
-                       S_IFCHR | S_IRUSR | S_IWUSR, "iseries/nvt%d", i);
        sprintf(tapename, "iseries/vt%d", i);
-       state[i].dev_handle = devfs_register_tape(tapename);
        printk(VIOTAPE_KERN_INFO "tape %s is iSeries "
                        "resource %10.10s type %4.4s, model %3.3s\n",
                        tapename, viotape_unitinfo[i].rsrcname,
@@ -979,7 +972,6 @@ static int viotape_remove(struct vio_dev *vdev)
 
        devfs_remove("iseries/nvt%d", i);
        devfs_remove("iseries/vt%d", i);
-       devfs_unregister_tape(state[i].dev_handle);
        class_device_destroy(tape_class, MKDEV(VIOTAPE_MAJOR, i | 0x80));
        class_device_destroy(tape_class, MKDEV(VIOTAPE_MAJOR, i));
        return 0;
@@ -990,16 +982,19 @@ static int viotape_remove(struct vio_dev *vdev)
  * support.
  */
 static struct vio_device_id viotape_device_table[] __devinitdata = {
-       { "viotape", "" },
+       { "byte", "IBM,iSeries-viotape" },
        { "", "" }
 };
-
 MODULE_DEVICE_TABLE(vio, viotape_device_table);
+
 static struct vio_driver viotape_driver = {
-       .name = "viotape",
        .id_table = viotape_device_table,
        .probe = viotape_probe,
-       .remove = viotape_remove
+       .remove = viotape_remove,
+       .driver = {
+               .name = "viotape",
+               .owner = THIS_MODULE,
+       }
 };