Re: [PATCH 4/4] reset: oxnas: make it explicitly non-modular

[Neil Armstrong]

On 02/08/2017 01:18 AM, Paul Gortmaker wrote:
> The Kconfig currently controlling compilation of this code is:
> 
> drivers/reset/Kconfig:config RESET_OXNAS
> drivers/reset/Kconfig:  bool
> 
> ...meaning that it currently is not being built as a module by anyone.
> 
> Lets remove the couple traces of modular infrastructure use, so that
> when reading the driver there is no doubt it is builtin-only.
> 
> 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.
> 
> Cc: Philipp Zabel <p.zabel@xxxxxxxxxxxxxx>
> Cc: Neil Armstrong <narmstrong@xxxxxxxxxxxx>
> Cc: linux-oxnas@xxxxxxxxxxxxxxxxxxx
> Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
> ---
>  drivers/reset/reset-oxnas.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/reset/reset-oxnas.c b/drivers/reset/reset-oxnas.c
> index 0d9036dea010..cf5b9742b86e 100644
> --- a/drivers/reset/reset-oxnas.c
> +++ b/drivers/reset/reset-oxnas.c
> @@ -18,7 +18,7 @@
>   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
>   */
>  #include <linux/err.h>
> -#include <linux/module.h>
> +#include <linux/init.h>
>  #include <linux/of.h>
>  #include <linux/platform_device.h>
>  #include <linux/reset-controller.h>
> @@ -83,7 +83,6 @@ static const struct of_device_id oxnas_reset_dt_ids[] = {
>  	 { .compatible = "oxsemi,ox820-reset", },
>  	 { /* sentinel */ },
>  };
> -MODULE_DEVICE_TABLE(of, oxnas_reset_dt_ids);
>  
>  static int oxnas_reset_probe(struct platform_device *pdev)
>  {
> @@ -123,5 +122,4 @@ static struct platform_driver oxnas_reset_driver = {
>  		.of_match_table	= oxnas_reset_dt_ids,
>  	},
>  };
> -
> -module_platform_driver(oxnas_reset_driver);
> +builtin_platform_driver(oxnas_reset_driver);
> 

Acked-by: Neil Armstrong <narmstrong@xxxxxxxxxxxx>