Messages in this thread Patch in this message | | | From | Sudip Mukherjee <> | Subject | [PATCH v4 WIP 4/4] staging: panel: modify driver to use new parport device model | Date | Tue, 28 Apr 2015 17:00:23 +0530 |
| |
converted to use the new device-model parallel port. I have the lcd part of the hardware and has been tested.
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org> --- drivers/staging/panel/panel.c | 53 ++++++++++++++++--------------------------- 1 file changed, 19 insertions(+), 34 deletions(-)
diff --git a/drivers/staging/panel/panel.c b/drivers/staging/panel/panel.c index ea54fb4..2e24cd5 100644 --- a/drivers/staging/panel/panel.c +++ b/drivers/staging/panel/panel.c @@ -2188,6 +2188,19 @@ static struct notifier_block panel_notifier = { 0 }; +static int panel_probe(struct device *dev) +{ + if (strcmp(dev_name(dev), "panel")) + return -ENODEV; + + return 0; +} + +struct pardev_cb panel_cb = { + .flags = 0, /*PARPORT_DEV_EXCL */ + .private = &pprt, +}; + static void panel_attach(struct parport *port) { if (port->number != parport) @@ -2199,10 +2212,7 @@ static void panel_attach(struct parport *port) return; } - pprt = parport_register_device(port, "panel", NULL, NULL, /* pf, kf */ - NULL, - /*PARPORT_DEV_EXCL */ - 0, (void *)&pprt); + pprt = parport_register_dev_model(port, "panel", &panel_cb); if (pprt == NULL) { pr_err("%s: port->number=%d parport=%d, parport_register_device() failed\n", __func__, port->number, parport); @@ -2238,40 +2248,14 @@ err_lcd_unreg: err_unreg_device: parport_unregister_device(pprt); pprt = NULL; -} - -static void panel_detach(struct parport *port) -{ - if (port->number != parport) - return; - - if (!pprt) { - pr_err("%s: port->number=%d parport=%d, nothing to unregister.\n", - __func__, port->number, parport); - return; - } - - unregister_reboot_notifier(&panel_notifier); - if (keypad.enabled && keypad_initialized) { - misc_deregister(&keypad_dev); - keypad_initialized = 0; - } - - if (lcd.enabled && lcd.initialized) { - misc_deregister(&lcd_dev); - lcd.initialized = false; - } - - parport_release(pprt); - parport_unregister_device(pprt); - pprt = NULL; + return; } static struct parport_driver panel_driver = { .name = "panel", - .attach = panel_attach, - .detach = panel_detach, + .match_port = panel_attach, + .probe = panel_probe, }; /* init function */ @@ -2380,7 +2364,7 @@ static int __init panel_init_module(void) return -ENODEV; } - err = parport_register_driver(&panel_driver); + err = parport_register_drv(&panel_driver); if (err) { pr_err("could not register with parport. Aborting.\n"); return err; @@ -2398,6 +2382,7 @@ static int __init panel_init_module(void) static void __exit panel_cleanup_module(void) { + unregister_reboot_notifier(&panel_notifier); if (scan_timer.function != NULL) del_timer_sync(&scan_timer); -- 1.8.1.2
| |