spi: lm70llp: use new parport device model
authorSudip Mukherjee <sudipm.mukherjee@gmail.com>
Thu, 3 Dec 2015 12:59:59 +0000 (18:29 +0530)
committerMark Brown <broonie@kernel.org>
Fri, 4 Dec 2015 12:19:10 +0000 (12:19 +0000)
Modify spi-lm70llp driver to use the new parallel port device model.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-lm70llp.c

index 62d0f6dbbe4541016f0c06b229eab94ab1780016..ef829081abd7ce8754d4079aeac602ba98698cda 100644 (file)
@@ -197,6 +197,7 @@ static void spi_lm70llp_attach(struct parport *p)
        struct spi_lm70llp      *pp;
        struct spi_master       *master;
        int                     status;
+       struct pardev_cb        lm70llp_cb;
 
        if (lm70llp) {
                printk(KERN_WARNING
@@ -228,9 +229,11 @@ static void spi_lm70llp_attach(struct parport *p)
         * Parport hookup
         */
        pp->port = p;
-       pd = parport_register_device(p, DRVNAME,
-                                    NULL, NULL, NULL,
-                                    PARPORT_FLAG_EXCL, pp);
+       memset(&lm70llp_cb, 0, sizeof(lm70llp_cb));
+       lm70llp_cb.private = pp;
+       lm70llp_cb.flags = PARPORT_FLAG_EXCL;
+       pd = parport_register_dev_model(p, DRVNAME, &lm70llp_cb, 0);
+
        if (!pd) {
                status = -ENOMEM;
                goto out_free_master;
@@ -322,8 +325,9 @@ static void spi_lm70llp_detach(struct parport *p)
 
 static struct parport_driver spi_lm70llp_drv = {
        .name =         DRVNAME,
-       .attach =       spi_lm70llp_attach,
+       .match_port =   spi_lm70llp_attach,
        .detach =       spi_lm70llp_detach,
+       .devmodel =     true,
 };
 
 static int __init init_spi_lm70llp(void)