From patchwork Wed Dec 18 20:48:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Gortmaker X-Patchwork-Id: 11301939 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9CCB76C1 for ; Wed, 18 Dec 2019 20:49:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 84CBF2176D for ; Wed, 18 Dec 2019 20:49:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727608AbfLRUtj (ORCPT ); Wed, 18 Dec 2019 15:49:39 -0500 Received: from mail.windriver.com ([147.11.1.11]:47841 "EHLO mail.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727553AbfLRUtd (ORCPT ); Wed, 18 Dec 2019 15:49:33 -0500 Received: from yow-cube1.wrs.com (yow-cube1.wrs.com [128.224.56.98]) by mail.windriver.com (8.15.2/8.15.2) with ESMTP id xBIKn0ia000214; Wed, 18 Dec 2019 12:49:11 -0800 (PST) From: Paul Gortmaker To: Lee Jones Cc: linux-kernel@vger.kernel.org, Paul Gortmaker , Tony Lindgren , Peter Ujfalusi , linux-omap@vger.kernel.org Subject: [PATCH 08/18] mfd: twl4030-audio: Make it explicitly non-modular Date: Wed, 18 Dec 2019 15:48:47 -0500 Message-Id: <1576702137-25905-9-git-send-email-paul.gortmaker@windriver.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1576702137-25905-1-git-send-email-paul.gortmaker@windriver.com> References: <1576702137-25905-1-git-send-email-paul.gortmaker@windriver.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org The Kconfig currently controlling compilation of this code is: drivers/mfd/Kconfig:config MFD_TWL4030_AUDIO drivers/mfd/Kconfig: bool "TI TWL4030 Audio" ...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: Tony Lindgren Cc: Lee Jones Cc: Peter Ujfalusi Cc: linux-omap@vger.kernel.org Signed-off-by: Paul Gortmaker Acked-by: Peter Ujfalusi --- drivers/mfd/twl4030-audio.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/drivers/mfd/twl4030-audio.c b/drivers/mfd/twl4030-audio.c index 4536d829b43e..7612997e3b86 100644 --- a/drivers/mfd/twl4030-audio.c +++ b/drivers/mfd/twl4030-audio.c @@ -8,7 +8,7 @@ * Copyright: (C) 2009 Nokia Corporation */ -#include +#include #include #include #include @@ -258,32 +258,17 @@ static int twl4030_audio_probe(struct platform_device *pdev) return ret; } -static int twl4030_audio_remove(struct platform_device *pdev) -{ - mfd_remove_devices(&pdev->dev); - twl4030_audio_dev = NULL; - - return 0; -} - static const struct of_device_id twl4030_audio_of_match[] = { {.compatible = "ti,twl4030-audio", }, { }, }; -MODULE_DEVICE_TABLE(of, twl4030_audio_of_match); static struct platform_driver twl4030_audio_driver = { .driver = { .name = "twl4030-audio", .of_match_table = twl4030_audio_of_match, + .suppress_bind_attrs = true, }, .probe = twl4030_audio_probe, - .remove = twl4030_audio_remove, }; - -module_platform_driver(twl4030_audio_driver); - -MODULE_AUTHOR("Peter Ujfalusi "); -MODULE_DESCRIPTION("TWL4030 audio block MFD driver"); -MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:twl4030-audio"); +builtin_platform_driver(twl4030_audio_driver);