From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757430AbcIMIvX (ORCPT ); Tue, 13 Sep 2016 04:51:23 -0400 Received: from mail-wm0-f52.google.com ([74.125.82.52]:35765 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756061AbcIMIvQ (ORCPT ); Tue, 13 Sep 2016 04:51:16 -0400 Date: Tue, 13 Sep 2016 09:53:13 +0100 From: Lee Jones To: Paul Gortmaker Cc: linux-kernel@vger.kernel.org, Tony Lindgren , Samuel Ortiz , linux-omap@vger.kernel.org Subject: Re: [PATCH 6/6] mfd: twl-core: Make it explicitly non-modular Message-ID: <20160913085313.GF24465@dell> References: <20160912144054.27522-1-paul.gortmaker@windriver.com> <20160912144054.27522-7-paul.gortmaker@windriver.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20160912144054.27522-7-paul.gortmaker@windriver.com> User-Agent: Mutt/1.6.2 (2016-07-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 12 Sep 2016, Paul Gortmaker wrote: > The Kconfig currently controlling compilation of this code is: > > drivers/mfd/Kconfig:config TWL4030_CORE > drivers/mfd/Kconfig: bool "TI TWL4030/TWL5030/TWL6030/TPS659x0 Support" > > ...meaning that it currently is not being built as a module by anyone. > > Lets remove what modular code that we can, so that when reading the > driver there is less doubt that it is builtin-only. Note that we can't > remove the twl_remove() itself ; it is still used by the probe unwind > routine. So we leave it linked into the .remove as well, even though > it will most likely never be called via that path from an unbind. > > Since module_i2c_driver() uses the same init level priority as > builtin_i2c_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: Samuel Ortiz > Cc: Lee Jones > Cc: linux-omap@vger.kernel.org > Signed-off-by: Paul Gortmaker > --- > drivers/mfd/twl-core.c | 9 +-------- > 1 file changed, 1 insertion(+), 8 deletions(-) Applied, thanks. > diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c > index a49d3db6d936..c64615dca2bd 100644 > --- a/drivers/mfd/twl-core.c > +++ b/drivers/mfd/twl-core.c > @@ -30,7 +30,6 @@ > > #include > #include > -#include > #include > #include > #include > @@ -1258,7 +1257,6 @@ static const struct i2c_device_id twl_ids[] = { > { "twl6032", TWL6030_CLASS | TWL6032_SUBCLASS }, /* "Phoenix lite" */ > { /* end of list */ }, > }; > -MODULE_DEVICE_TABLE(i2c, twl_ids); > > /* One Client Driver , 4 Clients */ > static struct i2c_driver twl_driver = { > @@ -1267,9 +1265,4 @@ static struct i2c_driver twl_driver = { > .probe = twl_probe, > .remove = twl_remove, > }; > - > -module_i2c_driver(twl_driver); > - > -MODULE_AUTHOR("Texas Instruments, Inc."); > -MODULE_DESCRIPTION("I2C Core interface for TWL"); > -MODULE_LICENSE("GPL"); > +builtin_i2c_driver(twl_driver); -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog