From patchwork Wed Mar 3 09:16:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 393291 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F79DC432C3 for ; Thu, 4 Mar 2021 00:30:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4A21964EEC for ; Thu, 4 Mar 2021 00:30:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349976AbhCDAaR (ORCPT ); Wed, 3 Mar 2021 19:30:17 -0500 Received: from mga11.intel.com ([192.55.52.93]:56415 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351711AbhCCKrW (ORCPT ); Wed, 3 Mar 2021 05:47:22 -0500 IronPort-SDR: wzjZjHaZeWo7fNwnzKgvlyRtNLH4qPrdLxQIsoGkn55xiReaiO9HT3ws76aYkOWeAMEgbTclzJ w0Q5ZsNh5TBA== X-IronPort-AV: E=McAfee;i="6000,8403,9911"; a="183768262" X-IronPort-AV: E=Sophos;i="5.81,219,1610438400"; d="scan'208";a="183768262" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Mar 2021 01:16:57 -0800 IronPort-SDR: X7GnzVR7l94NygCRBXx3DEslwh+5xN3BNprdvyowD8nBcrufaFrfoyQQJ/nltU78wtpG5AT7ll 3ZpQmuan/k/Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,219,1610438400"; d="scan'208";a="600075825" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga005.fm.intel.com with ESMTP; 03 Mar 2021 01:16:54 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 8FBC513A; Wed, 3 Mar 2021 11:16:54 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , Mark Brown , Sudip Mukherjee , Mauro Carvalho Chehab , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman Subject: [PATCH v3 1/3] parport: Introduce module_parport_driver() helper macro Date: Wed, 3 Mar 2021 11:16:40 +0200 Message-Id: <20210303091642.23929-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210303091642.23929-1-andriy.shevchenko@linux.intel.com> References: <20210303091642.23929-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org Introduce module_parport_driver() helper macro to reduce boilerplate in the existing and new code. Signed-off-by: Andy Shevchenko Acked-by: Sudip Mukherjee Reviewed-by: Greg Kroah-Hartman --- include/linux/parport.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/include/linux/parport.h b/include/linux/parport.h index f981f794c850..1c16ffb8b908 100644 --- a/include/linux/parport.h +++ b/include/linux/parport.h @@ -332,9 +332,19 @@ int __must_check __parport_register_driver(struct parport_driver *, __parport_register_driver(driver, THIS_MODULE, KBUILD_MODNAME) /* Unregister a high-level driver. */ -extern void parport_unregister_driver (struct parport_driver *); void parport_unregister_driver(struct parport_driver *); +/** + * module_parport_driver() - Helper macro for registering a modular parport driver + * @__parport_driver: struct parport_driver to be used + * + * Helper macro for parport drivers which do not do anything special in module + * init and exit. This eliminates a lot of boilerplate. Each module may only + * use this macro once, and calling it replaces module_init() and module_exit(). + */ +#define module_parport_driver(__parport_driver) \ + module_driver(__parport_driver, parport_register_driver, parport_unregister_driver) + /* If parport_register_driver doesn't fit your needs, perhaps * parport_find_xxx does. */ extern struct parport *parport_find_number (int); From patchwork Wed Mar 3 09:16:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 393289 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 96A95C4332D for ; Thu, 4 Mar 2021 00:30:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6E0F66023B for ; Thu, 4 Mar 2021 00:30:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234046AbhCDAa1 (ORCPT ); Wed, 3 Mar 2021 19:30:27 -0500 Received: from mga04.intel.com ([192.55.52.120]:40801 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357397AbhCCKtl (ORCPT ); Wed, 3 Mar 2021 05:49:41 -0500 IronPort-SDR: x+OvfQ8kh9yE037ElUIzsaBKYWSxr6BKdPxAlElRkJfpNR3NAFAvsTsYQmpc1wnfJ48AvbhatQ Fl9LMYay4hkA== X-IronPort-AV: E=McAfee;i="6000,8403,9911"; a="184731228" X-IronPort-AV: E=Sophos;i="5.81,219,1610438400"; d="scan'208";a="184731228" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Mar 2021 01:16:57 -0800 IronPort-SDR: HlrOf6E20vkvsulGkFFHov5kbYGgScgOU705rG0tVprAQJlL53Chwuhqnj8YK/T275m/+SyAx/ 5Sl1CPw8OKrg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,219,1610438400"; d="scan'208";a="383914452" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga002.jf.intel.com with ESMTP; 03 Mar 2021 01:16:55 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 47207F4; Wed, 3 Mar 2021 11:16:55 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , Mark Brown , Sudip Mukherjee , Mauro Carvalho Chehab , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman Subject: [PATCH v3 2/3] spi: butterfly: Switch to use module_parport_driver() Date: Wed, 3 Mar 2021 11:16:41 +0200 Message-Id: <20210303091642.23929-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210303091642.23929-1-andriy.shevchenko@linux.intel.com> References: <20210303091642.23929-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org Switch to use module_parport_driver() to reduce boilerplate code. Note, device_initcall() is a default for module_init(). Signed-off-by: Andy Shevchenko Acked-by: Mark Brown --- drivers/spi/spi-butterfly.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/spi/spi-butterfly.c b/drivers/spi/spi-butterfly.c index 7e71a351f3b7..cceae816cebc 100644 --- a/drivers/spi/spi-butterfly.c +++ b/drivers/spi/spi-butterfly.c @@ -317,18 +317,7 @@ static struct parport_driver butterfly_driver = { .detach = butterfly_detach, .devmodel = true, }; - -static int __init butterfly_init(void) -{ - return parport_register_driver(&butterfly_driver); -} -device_initcall(butterfly_init); - -static void __exit butterfly_exit(void) -{ - parport_unregister_driver(&butterfly_driver); -} -module_exit(butterfly_exit); +module_parport_driver(butterfly_driver); MODULE_DESCRIPTION("Parport Adapter driver for AVR Butterfly"); MODULE_LICENSE("GPL"); From patchwork Wed Mar 3 09:16:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 393290 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B45E3C4332B for ; Thu, 4 Mar 2021 00:30:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 81C5664E56 for ; Thu, 4 Mar 2021 00:30:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236765AbhCDAaS (ORCPT ); Wed, 3 Mar 2021 19:30:18 -0500 Received: from mga01.intel.com ([192.55.52.88]:16872 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356571AbhCCKrp (ORCPT ); Wed, 3 Mar 2021 05:47:45 -0500 IronPort-SDR: gcYlS7q+Kn0ts8+weWNUoUryCMuOveFCE9ljsz+tzPTMgTZONYpeneKuTQtTR5+V3q4OHOeXU+ U2FWND0sgHow== X-IronPort-AV: E=McAfee;i="6000,8403,9911"; a="206833510" X-IronPort-AV: E=Sophos;i="5.81,219,1610438400"; d="scan'208";a="206833510" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Mar 2021 01:18:21 -0800 IronPort-SDR: x4qll68f1qKzE/mO1wM9dYjUNY5uiabN43HLRt81uuD/69MrqvYxWljJkUROf+dRKUogBTUJCu OAH+gmOfAaCw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,219,1610438400"; d="scan'208";a="435956918" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga002.fm.intel.com with ESMTP; 03 Mar 2021 01:17:08 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 366B0F4; Wed, 3 Mar 2021 11:16:58 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , Mark Brown , Sudip Mukherjee , Mauro Carvalho Chehab , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman Subject: [PATCH v3 3/3] spi: lm70llp: Switch to use module_parport_driver() Date: Wed, 3 Mar 2021 11:16:42 +0200 Message-Id: <20210303091642.23929-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210303091642.23929-1-andriy.shevchenko@linux.intel.com> References: <20210303091642.23929-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org Switch to use module_parport_driver() to reduce boilerplate code. Signed-off-by: Andy Shevchenko Acked-by: Mark Brown --- drivers/spi/spi-lm70llp.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/spi/spi-lm70llp.c b/drivers/spi/spi-lm70llp.c index 174dba29b1dd..f914b8d2043e 100644 --- a/drivers/spi/spi-lm70llp.c +++ b/drivers/spi/spi-lm70llp.c @@ -320,18 +320,7 @@ static struct parport_driver spi_lm70llp_drv = { .detach = spi_lm70llp_detach, .devmodel = true, }; - -static int __init init_spi_lm70llp(void) -{ - return parport_register_driver(&spi_lm70llp_drv); -} -module_init(init_spi_lm70llp); - -static void __exit cleanup_spi_lm70llp(void) -{ - parport_unregister_driver(&spi_lm70llp_drv); -} -module_exit(cleanup_spi_lm70llp); +module_parport_driver(spi_lm70llp_drv); MODULE_AUTHOR("Kaiwan N Billimoria "); MODULE_DESCRIPTION(