From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752031AbbEFKQl (ORCPT ); Wed, 6 May 2015 06:16:41 -0400 Received: from mail-pa0-f51.google.com ([209.85.220.51]:36014 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751962AbbEFKQg (ORCPT ); Wed, 6 May 2015 06:16:36 -0400 From: Sudip Mukherjee To: Greg KH , Dan Carpenter , One Thousand Gnomes , Jean Delvare Cc: linux-kernel@vger.kernel.org, Sudip Mukherjee Subject: [PATCH v5 WIP 2/5] staging: panel: use new parport device model Date: Wed, 6 May 2015 15:46:14 +0530 Message-Id: <1430907377-17147-2-git-send-email-sudipm.mukherjee@gmail.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1430907377-17147-1-git-send-email-sudipm.mukherjee@gmail.com> References: <1430907377-17147-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 converted to use the new device-model parallel port. Signed-off-by: Sudip Mukherjee --- drivers/staging/panel/panel.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/drivers/staging/panel/panel.c b/drivers/staging/panel/panel.c index 1d8ed8b..772a82a 100644 --- a/drivers/staging/panel/panel.c +++ b/drivers/staging/panel/panel.c @@ -2188,6 +2188,18 @@ static struct notifier_block panel_notifier = { 0 }; +static int panel_probe(struct pardevice *par_dev) +{ + if (strcmp(par_dev->name, "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 +2211,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, 0); if (pprt == NULL) { pr_err("%s: port->number=%d parport=%d, parport_register_device() failed\n", __func__, port->number, parport); @@ -2256,8 +2265,9 @@ static void panel_detach(struct parport *port) static struct parport_driver panel_driver = { .name = "panel", - .attach = panel_attach, + .match_port = panel_attach, .detach = panel_detach, + .probe = panel_probe, }; /* init function */ -- 1.8.1.2