Commit fdfaef21 authored by Sudip Mukherjee's avatar Sudip Mukherjee Committed by Greg Kroah-Hartman

char: lp: use new parport device model

Modify lp driver to use the new parallel port device model.
Signed-off-by: default avatarSudip Mukherjee <sudipm.mukherjee@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e379c1a4
...@@ -912,9 +912,13 @@ static int __init lp_setup(char *str) ...@@ -912,9 +912,13 @@ static int __init lp_setup(char *str)
static int lp_register(int nr, struct parport *port) static int lp_register(int nr, struct parport *port)
{ {
lp_table[nr].dev = parport_register_device(port, "lp", struct pardev_cb ppdev_cb;
lp_preempt, NULL, NULL, 0,
(void *) &lp_table[nr]); memset(&ppdev_cb, 0, sizeof(ppdev_cb));
ppdev_cb.preempt = lp_preempt;
ppdev_cb.private = &lp_table[nr];
lp_table[nr].dev = parport_register_dev_model(port, "lp",
&ppdev_cb, nr);
if (lp_table[nr].dev == NULL) if (lp_table[nr].dev == NULL)
return 1; return 1;
lp_table[nr].flags |= LP_EXIST; lp_table[nr].flags |= LP_EXIST;
...@@ -1002,8 +1006,9 @@ static void lp_detach(struct parport *port) ...@@ -1002,8 +1006,9 @@ static void lp_detach(struct parport *port)
static struct parport_driver lp_driver = { static struct parport_driver lp_driver = {
.name = "lp", .name = "lp",
.attach = lp_attach, .match_port = lp_attach,
.detach = lp_detach, .detach = lp_detach,
.devmodel = true,
}; };
static int __init lp_init(void) static int __init lp_init(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment