From patchwork Fri Dec 18 13:05:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudip Mukherjee X-Patchwork-Id: 7883591 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 61A2BBEEE5 for ; Fri, 18 Dec 2015 13:06:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6F6832040F for ; Fri, 18 Dec 2015 13:06:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5C7BD20437 for ; Fri, 18 Dec 2015 13:06:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753502AbbLRNFu (ORCPT ); Fri, 18 Dec 2015 08:05:50 -0500 Received: from mail-pa0-f42.google.com ([209.85.220.42]:35333 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753354AbbLRNFt (ORCPT ); Fri, 18 Dec 2015 08:05:49 -0500 Received: by mail-pa0-f42.google.com with SMTP id jx14so31649010pad.2; Fri, 18 Dec 2015 05:05:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Y+QEt1awzsCG67BS32CqqmpniYjt39U76r5NBbwVyeY=; b=dTlhFMeStNbkcfSe9THEGxCT9of5QVFn3hg9SeS0kbatA+POCn31vecZU1dGeb3vgE lYFaRSXA6AEUL1bWj62LAf2NPTVG2LFrjcmFl3WhKQCE0e8dYVVzy2W/ADrbsHZkbEio 9ghLKwV5WLyVayBdrxtYa22IZ34oypfitQkkm7bX2LzOKUCSlfLs/4ICModwjkLMDdiH CUY+l3Olit+3Kj+YmbQQo6yyAhEMeQR7NIPaHQBRGNhvwzl9lh9KGEUMb7WeTzhtmroB Cb9gaWJzzQBTYqPTM1K20Rk9WbmqwWGNEAIu1WIjo8HUA9HpxdaL7BBXyBbEgLa9iAEf D9uA== X-Received: by 10.66.161.133 with SMTP id xs5mr5018269pab.70.1450443948723; Fri, 18 Dec 2015 05:05:48 -0800 (PST) Received: from sudip-pc.vectortproxy.org ([49.206.205.82]) by smtp.gmail.com with ESMTPSA id b26sm17982492pfd.6.2015.12.18.05.05.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 18 Dec 2015 05:05:48 -0800 (PST) From: Sudip Mukherjee To: Jarod Wilson , Mauro Carvalho Chehab , Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, devel@driverdev.osuosl.org, Sudip Mukherjee Subject: [PATCH 5/5] staging: media: lirc: use new parport device model Date: Fri, 18 Dec 2015 18:35:29 +0530 Message-Id: <1450443929-15305-5-git-send-email-sudipm.mukherjee@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1450443929-15305-1-git-send-email-sudipm.mukherjee@gmail.com> References: <1450443929-15305-1-git-send-email-sudipm.mukherjee@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Modify lirc_parallel driver to use the new parallel port device model. Signed-off-by: Sudip Mukherjee --- drivers/staging/media/lirc/lirc_parallel.c | 100 +++++++++++++++++++---------- 1 file changed, 65 insertions(+), 35 deletions(-) diff --git a/drivers/staging/media/lirc/lirc_parallel.c b/drivers/staging/media/lirc/lirc_parallel.c index 0156114..20ec9b6 100644 --- a/drivers/staging/media/lirc/lirc_parallel.c +++ b/drivers/staging/media/lirc/lirc_parallel.c @@ -629,43 +629,26 @@ static void kf(void *handle) */ } -/*** module initialization and cleanup ***/ - -static int __init lirc_parallel_init(void) +static void lirc_parallel_attach(struct parport *port) { - int result; + struct pardev_cb lirc_parallel_cb; - result = platform_driver_register(&lirc_parallel_driver); - if (result) { - pr_notice("platform_driver_register returned %d\n", result); - return result; - } + if (port->base != io) + return; - lirc_parallel_dev = platform_device_alloc(LIRC_DRIVER_NAME, 0); - if (!lirc_parallel_dev) { - result = -ENOMEM; - goto exit_driver_unregister; - } + pport = port; + memset(&lirc_parallel_cb, 0, sizeof(lirc_parallel_cb)); + lirc_parallel_cb.preempt = pf; + lirc_parallel_cb.wakeup = kf; + lirc_parallel_cb.irq_func = lirc_lirc_irq_handler; - result = platform_device_add(lirc_parallel_dev); - if (result) - goto exit_device_put; - - pport = parport_find_base(io); - if (!pport) { - pr_notice("no port at %x found\n", io); - result = -ENXIO; - goto exit_device_put; - } - ppdevice = parport_register_device(pport, LIRC_DRIVER_NAME, - pf, kf, lirc_lirc_irq_handler, 0, - NULL); - parport_put_port(pport); + ppdevice = parport_register_dev_model(port, LIRC_DRIVER_NAME, + &lirc_parallel_cb, 0); if (!ppdevice) { pr_notice("parport_register_device() failed\n"); - result = -ENXIO; - goto exit_device_put; + return; } + if (parport_claim(ppdevice) != 0) goto skip_init; is_claimed = 1; @@ -693,18 +676,66 @@ static int __init lirc_parallel_init(void) is_claimed = 0; parport_release(ppdevice); - skip_init: + +skip_init: + return; +} + +static void lirc_parallel_detach(struct parport *port) +{ + if (port->base != io) + return; + + parport_unregister_device(ppdevice); +} + +static struct parport_driver lirc_parport_driver = { + .name = LIRC_DRIVER_NAME, + .match_port = lirc_parallel_attach, + .detach = lirc_parallel_detach, + .devmodel = true, +}; + +/*** module initialization and cleanup ***/ + +static int __init lirc_parallel_init(void) +{ + int result; + + result = platform_driver_register(&lirc_parallel_driver); + if (result) { + pr_notice("platform_driver_register returned %d\n", result); + return result; + } + + lirc_parallel_dev = platform_device_alloc(LIRC_DRIVER_NAME, 0); + if (!lirc_parallel_dev) { + result = -ENOMEM; + goto exit_driver_unregister; + } + + result = platform_device_add(lirc_parallel_dev); + if (result) + goto exit_device_put; + + result = parport_register_driver(&lirc_parport_driver); + if (result) { + pr_notice("parport_register_driver returned %d\n", result); + goto exit_device_put; + } + driver.dev = &lirc_parallel_dev->dev; driver.minor = lirc_register_driver(&driver); if (driver.minor < 0) { pr_notice("register_chrdev() failed\n"); - parport_unregister_device(ppdevice); result = -EIO; - goto exit_device_put; + goto exit_unregister; } pr_info("installed using port 0x%04x irq %d\n", io, irq); return 0; +exit_unregister: + parport_unregister_driver(&lirc_parport_driver); exit_device_put: platform_device_put(lirc_parallel_dev); exit_driver_unregister: @@ -714,9 +745,8 @@ exit_driver_unregister: static void __exit lirc_parallel_exit(void) { - parport_unregister_device(ppdevice); lirc_unregister_driver(driver.minor); - + parport_unregister_driver(&lirc_parport_driver); platform_device_unregister(lirc_parallel_dev); platform_driver_unregister(&lirc_parallel_driver); }