From patchwork Tue Jun 7 02:43:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Gortmaker X-Patchwork-Id: 631269 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3rNwrr3rXfz9t43 for ; Tue, 7 Jun 2016 12:44:44 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753169AbcFGCni (ORCPT ); Mon, 6 Jun 2016 22:43:38 -0400 Received: from mail5.windriver.com ([192.103.53.11]:58684 "EHLO mail5.wrs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753152AbcFGCng (ORCPT ); Mon, 6 Jun 2016 22:43:36 -0400 Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail5.wrs.com (8.15.2/8.15.2) with ESMTPS id u572hW6c031933 (version=TLSv1 cipher=AES128-SHA bits=128 verify=OK); Mon, 6 Jun 2016 19:43:33 -0700 Received: from yow-lpgnfs-02.corp.ad.wrs.com (128.224.149.8) by ALA-HCA.corp.ad.wrs.com (147.11.189.40) with Microsoft SMTP Server id 14.3.248.2; Mon, 6 Jun 2016 19:43:32 -0700 From: Paul Gortmaker To: CC: Paul Gortmaker , Linus Walleij , , Ken Xue , Jeff Wu Subject: [PATCH 5/9] pinctrl: amd: make it explicitly non-modular Date: Mon, 6 Jun 2016 22:43:04 -0400 Message-ID: <1465267388-17884-6-git-send-email-paul.gortmaker@windriver.com> X-Mailer: git-send-email 2.8.0 In-Reply-To: <1465267388-17884-1-git-send-email-paul.gortmaker@windriver.com> References: <1465267388-17884-1-git-send-email-paul.gortmaker@windriver.com> MIME-Version: 1.0 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org The Kconfig currently controlling compilation of this code is: config PINCTRL_AMD bool "AMD GPIO pin control" ...meaning that it currently is not being built as a module by anyone. Lets remove the modular code that is essentially orphaned, so that when reading the driver there is no doubt it is builtin-only. We explicitly disallow a driver unbind, since that doesn't have a sensible use case anyway, and it allows us to drop the ".remove" code for non-modular drivers. Since module_platform_driver() uses the same init level priority as builtin_platform_driver() the init ordering remains unchanged with this commit. Also note that MODULE_DEVICE_TABLE is a no-op for non-modular code. We also delete the MODULE_LICENSE tag etc. since all that information is already contained at the top of the file in the comments. Cc: Linus Walleij Cc: linux-gpio@vger.kernel.org Cc: Ken Xue Cc: Jeff Wu Signed-off-by: Paul Gortmaker --- drivers/pinctrl/pinctrl-amd.c | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/drivers/pinctrl/pinctrl-amd.c b/drivers/pinctrl/pinctrl-amd.c index 634b4d30eefb..b466d70b9004 100644 --- a/drivers/pinctrl/pinctrl-amd.c +++ b/drivers/pinctrl/pinctrl-amd.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -828,35 +828,18 @@ out2: return ret; } -static int amd_gpio_remove(struct platform_device *pdev) -{ - struct amd_gpio *gpio_dev; - - gpio_dev = platform_get_drvdata(pdev); - - gpiochip_remove(&gpio_dev->gc); - - return 0; -} - static const struct acpi_device_id amd_gpio_acpi_match[] = { { "AMD0030", 0 }, { "AMDI0030", 0}, { }, }; -MODULE_DEVICE_TABLE(acpi, amd_gpio_acpi_match); static struct platform_driver amd_gpio_driver = { .driver = { .name = "amd_gpio", + .suppress_bind_attrs = true, .acpi_match_table = ACPI_PTR(amd_gpio_acpi_match), }, .probe = amd_gpio_probe, - .remove = amd_gpio_remove, }; - -module_platform_driver(amd_gpio_driver); - -MODULE_LICENSE("GPL v2"); -MODULE_AUTHOR("Ken Xue , Jeff Wu "); -MODULE_DESCRIPTION("AMD GPIO pinctrl driver"); +builtin_platform_driver(amd_gpio_driver);