Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca444073 authored by Sudip Mukherjee's avatar Sudip Mukherjee Committed by David S. Miller
Browse files

hamradio: baycom: use new parport device model 



Modify baycom driver to use the new parallel port device model.

Signed-off-by: default avatarSudip Mukherjee <sudipm.mukherjee@gmail.com>
Acked-By: default avatarThomas Sailer <t.sailer@alumni.ethz.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2df9d673

drivers/net/hamradio/baycom_epp.c

+46 −4
Original line number Diff line number Diff line
@@ -840,6 +840,7 @@ static int epp_open(struct net_device *dev) 
	unsigned char tmp[128];

	unsigned char stat;

	unsigned long tstart;

	struct pardev_cb par_cb;

	

        if (!pp) {

                printk(KERN_ERR "%s: parport at 0x%lx unknown\n", bc_drvname, dev->base_addr);
@@ -859,8 +860,21 @@ static int epp_open(struct net_device *dev) 
                return -EIO;

	}

	memset(&bc->modem, 0, sizeof(bc->modem));

        bc->pdev = parport_register_device(pp, dev->name, NULL, epp_wakeup, 

					   NULL, PARPORT_DEV_EXCL, dev);

	memset(&par_cb, 0, sizeof(par_cb));

	par_cb.wakeup = epp_wakeup;

	par_cb.private = (void *)dev;

	par_cb.flags = PARPORT_DEV_EXCL;

	for (i = 0; i < NR_PORTS; i++)

		if (baycom_device[i] == dev)

			break;



	if (i == NR_PORTS) {

		pr_err("%s: no device found\n", bc_drvname);

		parport_put_port(pp);

		return -ENODEV;

	}



	bc->pdev = parport_register_dev_model(pp, dev->name, &par_cb, i);

	parport_put_port(pp);

        if (!bc->pdev) {

                printk(KERN_ERR "%s: cannot register parport at 0x%lx\n", bc_drvname, pp->base);
@@ -1185,6 +1199,23 @@ MODULE_LICENSE("GPL"); 


/* --------------------------------------------------------------------- */



static int baycom_epp_par_probe(struct pardevice *par_dev)

{

	struct device_driver *drv = par_dev->dev.driver;

	int len = strlen(drv->name);



	if (strncmp(par_dev->name, drv->name, len))

		return -ENODEV;



	return 0;

}



static struct parport_driver baycom_epp_par_driver = {

	.name = "bce",

	.probe = baycom_epp_par_probe,

	.devmodel = true,

};



static void __init baycom_epp_dev_setup(struct net_device *dev)

{

	struct baycom_state *bc = netdev_priv(dev);
@@ -1204,10 +1235,15 @@ static void __init baycom_epp_dev_setup(struct net_device *dev) 


static int __init init_baycomepp(void)

{

	int i, found = 0;

	int i, found = 0, ret;

	char set_hw = 1;



	printk(bc_drvinfo);



	ret = parport_register_driver(&baycom_epp_par_driver);

	if (ret)

		return ret;



	/*

	 * register net devices

	 */
@@ -1241,7 +1277,12 @@ static int __init init_baycomepp(void) 
		found++;

	}



	return found ? 0 : -ENXIO;

	if (found == 0) {

		parport_unregister_driver(&baycom_epp_par_driver);

		return -ENXIO;

	}



	return 0;

}



static void __exit cleanup_baycomepp(void)
@@ -1260,6 +1301,7 @@ static void __exit cleanup_baycomepp(void) 
				printk(paranoia_str, "cleanup_module");

		}

	}

	parport_unregister_driver(&baycom_epp_par_driver);

}



module_init(init_baycomepp);