Commit 8891f41a authored by Sudip Mukherjee's avatar Sudip Mukherjee Committed by Greg Kroah-Hartman
Browse files

i2c-parport: use new parport device model 



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

Tested-by: default avatarJean Delvare <jdelvare@suse.de>
Acked-by: default avatarWolfram Sang <wsa@the-dreams.de>
Signed-off-by: default avatarSudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 19a4fb21

drivers/i2c/busses/i2c-parport.c

+10 −5
Original line number Diff line number Diff line
@@ -185,11 +185,15 @@ static void i2c_parport_attach(struct parport *port) 
		printk(KERN_ERR "i2c-parport: Failed to kzalloc\n");

		return;

	}

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

	i2c_parport_cb.flags = PARPORT_FLAG_EXCL;

	i2c_parport_cb.irq_func = i2c_parport_irq;

	i2c_parport_cb.private = adapter;



	pr_debug("i2c-parport: attaching to %s\n", port->name);

	parport_disable_irq(port);

	adapter->pdev = parport_register_device(port, "i2c-parport",

		NULL, NULL, i2c_parport_irq, PARPORT_FLAG_EXCL, adapter);

	adapter->pdev = parport_register_dev_model(port, "i2c-parport",

						   &i2c_parport_cb, i);

	if (!adapter->pdev) {

		printk(KERN_ERR "i2c-parport: Unable to register with parport\n");

		goto err_free;
@@ -284,8 +288,9 @@ static void i2c_parport_detach(struct parport *port) 


static struct parport_driver i2c_parport_driver = {

	.name = "i2c-parport",

	.attach	= i2c_parport_attach,

	.match_port = i2c_parport_attach,

	.detach = i2c_parport_detach,

	.devmodel = true,

};



/* ----- Module loading, unloading and information ------------------------ */