From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932702AbbDOHtw (ORCPT ); Wed, 15 Apr 2015 03:49:52 -0400 Received: from mail-pa0-f53.google.com ([209.85.220.53]:36800 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755975AbbDOHtX (ORCPT ); Wed, 15 Apr 2015 03:49:23 -0400 From: Sudip Mukherjee To: Jonathan Corbet , Jean Delvare , Wolfram Sang , Willy Tarreau , Greg Kroah-Hartman , One Thousand Gnomes , dan.carpenter@oracle.com Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org, devel@driverdev.osuosl.org, Sudip Mukherjee Subject: [PATCH 4/4] staging: panel: use parport in device-model Date: Wed, 15 Apr 2015 13:18:44 +0530 Message-Id: <1429084124-2271-5-git-send-email-sudipm.mukherjee@gmail.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1429084124-2271-1-git-send-email-sudipm.mukherjee@gmail.com> References: <1429084124-2271-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 modified the required functions to start using the new parport device-model Signed-off-by: Sudip Mukherjee --- drivers/staging/panel/panel.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/staging/panel/panel.c b/drivers/staging/panel/panel.c index ea54fb4..475c690 100644 --- a/drivers/staging/panel/panel.c +++ b/drivers/staging/panel/panel.c @@ -2188,25 +2188,26 @@ static struct notifier_block panel_notifier = { 0 }; -static void panel_attach(struct parport *port) +static int panel_attach(struct parport *port, + struct parport_driver *drv) { if (port->number != parport) - return; + return -ENODEV; if (pprt) { pr_err("%s: port->number=%d parport=%d, already registered!\n", __func__, port->number, parport); - return; + return -EAGAIN; } - pprt = parport_register_device(port, "panel", NULL, NULL, /* pf, kf */ + pprt = parport_register_dev(port, "panel", NULL, NULL, /* pf, kf */ NULL, /*PARPORT_DEV_EXCL */ - 0, (void *)&pprt); + 0, (void *)&pprt, drv); if (pprt == NULL) { pr_err("%s: port->number=%d parport=%d, parport_register_device() failed\n", __func__, port->number, parport); - return; + return -ENODEV; } if (parport_claim(pprt)) { @@ -2230,7 +2231,7 @@ static void panel_attach(struct parport *port) goto err_lcd_unreg; } register_reboot_notifier(&panel_notifier); - return; + return 0; err_lcd_unreg: if (lcd.enabled) @@ -2238,6 +2239,7 @@ err_lcd_unreg: err_unreg_device: parport_unregister_device(pprt); pprt = NULL; + return -ENODEV; } static void panel_detach(struct parport *port) @@ -2270,7 +2272,7 @@ static void panel_detach(struct parport *port) static struct parport_driver panel_driver = { .name = "panel", - .attach = panel_attach, + .attach_ret = panel_attach, .detach = panel_detach, }; @@ -2380,7 +2382,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; -- 1.8.1.2 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sudip Mukherjee Subject: [PATCH 4/4] staging: panel: use parport in device-model Date: Wed, 15 Apr 2015 13:18:44 +0530 Message-ID: <1429084124-2271-5-git-send-email-sudipm.mukherjee@gmail.com> References: <1429084124-2271-1-git-send-email-sudipm.mukherjee@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1429084124-2271-1-git-send-email-sudipm.mukherjee@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: driverdev-devel-bounces@linuxdriverproject.org Sender: "devel" To: Jonathan Corbet , Jean Delvare , Wolfram Sang , Willy Tarreau , Greg Kroah-Hartman , One Thousand Gnomes , dan.carpenter@oracle.com Cc: linux-i2c@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Sudip Mukherjee , linux-doc@vger.kernel.org List-Id: linux-i2c@vger.kernel.org modified the required functions to start using the new parport device-model Signed-off-by: Sudip Mukherjee --- drivers/staging/panel/panel.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/staging/panel/panel.c b/drivers/staging/panel/panel.c index ea54fb4..475c690 100644 --- a/drivers/staging/panel/panel.c +++ b/drivers/staging/panel/panel.c @@ -2188,25 +2188,26 @@ static struct notifier_block panel_notifier = { 0 }; -static void panel_attach(struct parport *port) +static int panel_attach(struct parport *port, + struct parport_driver *drv) { if (port->number != parport) - return; + return -ENODEV; if (pprt) { pr_err("%s: port->number=%d parport=%d, already registered!\n", __func__, port->number, parport); - return; + return -EAGAIN; } - pprt = parport_register_device(port, "panel", NULL, NULL, /* pf, kf */ + pprt = parport_register_dev(port, "panel", NULL, NULL, /* pf, kf */ NULL, /*PARPORT_DEV_EXCL */ - 0, (void *)&pprt); + 0, (void *)&pprt, drv); if (pprt == NULL) { pr_err("%s: port->number=%d parport=%d, parport_register_device() failed\n", __func__, port->number, parport); - return; + return -ENODEV; } if (parport_claim(pprt)) { @@ -2230,7 +2231,7 @@ static void panel_attach(struct parport *port) goto err_lcd_unreg; } register_reboot_notifier(&panel_notifier); - return; + return 0; err_lcd_unreg: if (lcd.enabled) @@ -2238,6 +2239,7 @@ err_lcd_unreg: err_unreg_device: parport_unregister_device(pprt); pprt = NULL; + return -ENODEV; } static void panel_detach(struct parport *port) @@ -2270,7 +2272,7 @@ static void panel_detach(struct parport *port) static struct parport_driver panel_driver = { .name = "panel", - .attach = panel_attach, + .attach_ret = panel_attach, .detach = panel_detach, }; @@ -2380,7 +2382,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; -- 1.8.1.2