From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754976AbbDUNwy (ORCPT ); Tue, 21 Apr 2015 09:52:54 -0400 Received: from mail-pa0-f51.google.com ([209.85.220.51]:33026 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754835AbbDUNwt (ORCPT ); Tue, 21 Apr 2015 09:52:49 -0400 From: Sudip Mukherjee To: gregkh@linuxfoundation.org, dan.carpenter@oracle.com Cc: linux-kernel@vger.kernel.org, Sudip Mukherjee Subject: [PATCH v2 WIP 2/2] staging: panel: modify driver to use new parport device model Date: Tue, 21 Apr 2015 19:22:35 +0530 Message-Id: <1429624355-9252-2-git-send-email-sudipm.mukherjee@gmail.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1429624355-9252-1-git-send-email-sudipm.mukherjee@gmail.com> References: <1429624355-9252-1-git-send-email-sudipm.mukherjee@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org modify panel driver to use the new parallel port device model. Signed-off-by: Sudip Mukherjee --- drivers/staging/panel/panel.c | 53 +++++++++++++++---------------------------- 1 file changed, 18 insertions(+), 35 deletions(-) diff --git a/drivers/staging/panel/panel.c b/drivers/staging/panel/panel.c index ea54fb4..e9511ee 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(port, "panel", &panel_cb); if (pprt == NULL) { pr_err("%s: port->number=%d parport=%d, parport_register_device() failed\n", __func__, port->number, parport); @@ -2240,38 +2250,10 @@ err_unreg_device: 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; -} - static struct parport_driver panel_driver = { .name = "panel", - .attach = panel_attach, - .detach = panel_detach, + .check = panel_attach, + .probe = panel_probe, }; /* init function */ @@ -2380,7 +2362,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 +2380,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