pps: generator: use new parport device model

Modify pps generator driver to use the new parallel port device model.

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

diff --git a/drivers/pps/generators/pps_gen_parport.c b/drivers/pps/generators/pps_gen_parport.c
index 51cfde6afffd398b022719178f5f2b4960e4e70f..7fd36cac063b79936020b24494aacecf26056fb9 100644 (file)
--- a/drivers/pps/generators/pps_gen_parport.c
+++ b/drivers/pps/generators/pps_gen_parport.c
@@ -192,13 +192,18 @@ static inline ktime_t next_intr_time(struct pps_generator_pp *dev)
 
 static void parport_attach(struct parport *port)
 {
+       struct pardev_cb pps_cb;
+
        if (attached) {
                /* we already have a port */
                return;
        }
 
-       device.pardev = parport_register_device(port, KBUILD_MODNAME,
-                       NULL, NULL, NULL, PARPORT_FLAG_EXCL, &device);
+       memset(&pps_cb, 0, sizeof(pps_cb));
+       pps_cb.private = &device;
+       pps_cb.flags = PARPORT_FLAG_EXCL;
+       device.pardev = parport_register_dev_model(port, KBUILD_MODNAME,
+                                                  &pps_cb, 0);
        if (!device.pardev) {
                pr_err("couldn't register with %s\n", port->name);
                return;
@@ -236,8 +241,9 @@ static void parport_detach(struct parport *port)
 
 static struct parport_driver pps_gen_parport_driver = {
        .name = KBUILD_MODNAME,
-       .attach = parport_attach,
+       .match_port = parport_attach,
        .detach = parport_detach,
+       .devmodel = true,
 };
 
 /* module staff */