parport: daisy: use new parport device model

Modify parport daisy driver to use the new parallel port device model.

Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

3 files changed, 41 insertions, 3 deletions

diff --git a/drivers/parport/daisy.c b/drivers/parport/daisy.c
index 5484a46dafda..56dd83a45e55 100644
--- a/drivers/parport/daisy.c
+++ b/drivers/parport/daisy.c
@@ -213,10 +213,12 @@ void parport_daisy_fini(struct parport *port)
 struct pardevice *parport_open(int devnum, const char *name)
 {
         struct daisydev *p = topology;
+        struct pardev_cb par_cb;
         struct parport *port;
         struct pardevice *dev;
         int daisy;
 
+        memset(&par_cb, 0, sizeof(par_cb));
         spin_lock(&topology_lock);
         while (p && p->devnum != devnum)
                 p = p->next;
@@ -230,7 +232,7 @@ struct pardevice *parport_open(int devnum, const char *name)
         port = parport_get_port(p->port);
         spin_unlock(&topology_lock);
 
-        dev = parport_register_device(port, name, NULL, NULL, NULL, 0, NULL);
+        dev = parport_register_dev_model(port, name, &par_cb, devnum);
         parport_put_port(port);
         if (!dev)
                 return NULL;
@@ -480,3 +482,31 @@ static int assign_addrs(struct parport *port)
         kfree(deviceid);
         return detected;
 }
+
+static int daisy_drv_probe(struct pardevice *par_dev)
+{
+        struct device_driver *drv = par_dev->dev.driver;
+
+        if (strcmp(drv->name, "daisy_drv"))
+                return -ENODEV;
+        if (strcmp(par_dev->name, daisy_dev_name))
+                return -ENODEV;
+
+        return 0;
+}
+
+static struct parport_driver daisy_driver = {
+        .name = "daisy_drv",
+        .probe = daisy_drv_probe,
+        .devmodel = true,
+};
+
+int daisy_drv_init(void)
+{
+        return parport_register_driver(&daisy_driver);
+}
+
+void daisy_drv_exit(void)
+{
+        parport_unregister_driver(&daisy_driver);
+}
diff --git a/drivers/parport/probe.c b/drivers/parport/probe.c
index e035174ba205..e5e6a463a941 100644
--- a/drivers/parport/probe.c
+++ b/drivers/parport/probe.c
@@ -257,7 +257,7 @@ static ssize_t parport_read_device_id (struct parport *port, char *buffer,
 ssize_t parport_device_id (int devnum, char *buffer, size_t count)
 {
         ssize_t retval = -ENXIO;
-        struct pardevice *dev = parport_open (devnum, "Device ID probe");
+        struct pardevice *dev = parport_open(devnum, daisy_dev_name);
         if (!dev)
                 return -ENXIO;
 
diff --git a/drivers/parport/share.c b/drivers/parport/share.c
index 5dc53d420ca8..0171b8dbcdcd 100644
--- a/drivers/parport/share.c
+++ b/drivers/parport/share.c
@@ -137,11 +137,19 @@ static struct bus_type parport_bus_type = {
 
 int parport_bus_init(void)
 {
-        return bus_register(&parport_bus_type);
+        int retval;
+
+        retval = bus_register(&parport_bus_type);
+        if (retval)
+                return retval;
+        daisy_drv_init();
+
+        return 0;
 }
 
 void parport_bus_exit(void)
 {
+        daisy_drv_exit();
         bus_unregister(&parport_bus_type);
 }