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

staging: panel: use new parport device model

Converted to use the new device-model parallel port.
Signed-off-by: default avatarSudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6fa45a22
...@@ -2190,6 +2190,8 @@ static struct notifier_block panel_notifier = { ...@@ -2190,6 +2190,8 @@ static struct notifier_block panel_notifier = {
static void panel_attach(struct parport *port) static void panel_attach(struct parport *port)
{ {
struct pardev_cb panel_cb;
if (port->number != parport) if (port->number != parport)
return; return;
...@@ -2199,10 +2201,11 @@ static void panel_attach(struct parport *port) ...@@ -2199,10 +2201,11 @@ static void panel_attach(struct parport *port)
return; return;
} }
pprt = parport_register_device(port, "panel", NULL, NULL, /* pf, kf */ memset(&panel_cb, 0, sizeof(panel_cb));
NULL, panel_cb.private = &pprt;
/*PARPORT_DEV_EXCL */ /* panel_cb.flags = 0 should be PARPORT_DEV_EXCL? */
0, (void *)&pprt);
pprt = parport_register_dev_model(port, "panel", &panel_cb, 0);
if (pprt == NULL) { if (pprt == NULL) {
pr_err("%s: port->number=%d parport=%d, parport_register_device() failed\n", pr_err("%s: port->number=%d parport=%d, parport_register_device() failed\n",
__func__, port->number, parport); __func__, port->number, parport);
...@@ -2270,8 +2273,9 @@ static void panel_detach(struct parport *port) ...@@ -2270,8 +2273,9 @@ static void panel_detach(struct parport *port)
static struct parport_driver panel_driver = { static struct parport_driver panel_driver = {
.name = "panel", .name = "panel",
.attach = panel_attach, .match_port = panel_attach,
.detach = panel_detach, .detach = panel_detach,
.devmodel = true,
}; };
/* init function */ /* init function */
......
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