[PATCH] spi: Remove CONFIG_ prefix from Kconfig select

[PATCH] spi: Remove CONFIG_ prefix from Kconfig select

[Joe Perches]

commit a2ca53b52e00 ("spi: Add HiSilicon v3xx SPI NOR flash
controller driver") likely inadvertently used a select statement
with a CONFIG_ prefix, remove the prefix.

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/spi/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 82177d..2dc7bd 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -292,7 +292,7 @@ config SPI_HISI_SFC_V3XX
 	tristate "HiSilicon SPI-NOR Flash Controller for Hi16XX chipsets"
 	depends on (ARM64 && ACPI) || COMPILE_TEST
 	depends on HAS_IOMEM
-	select CONFIG_MTD_SPI_NOR
+	select MTD_SPI_NOR
 	help
 	  This enables support for HiSilicon v3xx SPI-NOR flash controller
 	  found in hi16xx chipsets.

Re: [PATCH] spi: Remove CONFIG_ prefix from Kconfig select

[John Garry]

On 05/03/2020 15:15, Joe Perches wrote:
> commit a2ca53b52e00 ("spi: Add HiSilicon v3xx SPI NOR flash
> controller driver") likely inadvertently used a select statement
> with a CONFIG_ prefix, remove the prefix.
> 
> Signed-off-by: Joe Perches <joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>

It's a pity checkpatch can't pick this stuff up...

The select is just for enabling the driver of a slave driver, so should 
not cause any build issues when not enabled. thanks

FWIW,
Acked-by: John Garry <john.garry-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>

> ---
>   drivers/spi/Kconfig | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
> index 82177d..2dc7bd 100644
> --- a/drivers/spi/Kconfig
> +++ b/drivers/spi/Kconfig
> @@ -292,7 +292,7 @@ config SPI_HISI_SFC_V3XX
>   	tristate "HiSilicon SPI-NOR Flash Controller for Hi16XX chipsets"
>   	depends on (ARM64 && ACPI) || COMPILE_TEST
>   	depends on HAS_IOMEM
> -	select CONFIG_MTD_SPI_NOR
> +	select MTD_SPI_NOR
>   	help
>   	  This enables support for HiSilicon v3xx SPI-NOR flash controller
>   	  found in hi16xx chipsets.
> 
> 
> .
> 

Re: [PATCH] spi: Remove CONFIG_ prefix from Kconfig select

[Joe Perches]

On Thu, 2020-03-05 at 15:53 +0000, John Garry wrote:
> On 05/03/2020 15:15, Joe Perches wrote:
> > commit a2ca53b52e00 ("spi: Add HiSilicon v3xx SPI NOR flash
> > controller driver") likely inadvertently used a select statement
> > with a CONFIG_ prefix, remove the prefix.
> > 
> > Signed-off-by: Joe Perches <joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>
> 
> It's a pity checkpatch can't pick this stuff up...

You are free to write a rule and submit a patch.

The grammar is pretty hard to verify from a patch
fragment though.

There are 2 existing nominal false positives.

$ git grep 'select\b.*\bCONFIG_' -- '*/Kconfig*'
drivers/edac/Kconfig:     select CONFIG_ACPI_NFIT.
drivers/edac/Kconfig:     select CONFIG_ACPI_NFIT.

Re: [PATCH] spi: Remove CONFIG_ prefix from Kconfig select

[John Garry]

On 05/03/2020 16:01, Joe Perches wrote:
> On Thu, 2020-03-05 at 15:53 +0000, John Garry wrote:
>> On 05/03/2020 15:15, Joe Perches wrote:
>>> commit a2ca53b52e00 ("spi: Add HiSilicon v3xx SPI NOR flash
>>> controller driver") likely inadvertently used a select statement
>>> with a CONFIG_ prefix, remove the prefix.
>>>
>>> Signed-off-by: Joe Perches <joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>
>>
>> It's a pity checkpatch can't pick this stuff up...
> 
> You are free to write a rule and submit a patch.
> 

I'm not opposed to the idea...

> The grammar is pretty hard to verify from a patch
> fragment though.
> 
> There are 2 existing nominal false positives.
> 
> $ git grep 'select\b.*\bCONFIG_' -- '*/Kconfig*'
> drivers/edac/Kconfig:     select CONFIG_ACPI_NFIT.
> drivers/edac/Kconfig:     select CONFIG_ACPI_NFIT.

Ah, that's in the help text. I guess that those can be ignored simply 
based on the indentation.

I also see these:

drivers/i2c/busses/Kconfig:       to also select CONFIG_TYPEC_FUSB302=m.
drivers/platform/chrome/Kconfig:        select CONFIG_MFD_CROS_EC_DEV

The 2nd looks like it's incorrect.

And then also:
$ git grep 'depends on\b.*\bCONFIG_' -- '*/Kconfig*'
samples/Kconfig:        depends on CONFIG_ANDROID_BINDERFS

Thanks,
John

Re: [PATCH] spi: Remove CONFIG_ prefix from Kconfig select

[Randy Dunlap]

On 3/5/20 8:20 AM, John Garry wrote:
> On 05/03/2020 16:01, Joe Perches wrote:
>> On Thu, 2020-03-05 at 15:53 +0000, John Garry wrote:
>>> On 05/03/2020 15:15, Joe Perches wrote:
>>>> commit a2ca53b52e00 ("spi: Add HiSilicon v3xx SPI NOR flash
>>>> controller driver") likely inadvertently used a select statement
>>>> with a CONFIG_ prefix, remove the prefix.
>>>>
>>>> Signed-off-by: Joe Perches <joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>
>>>
>>> It's a pity checkpatch can't pick this stuff up...
>>
>> You are free to write a rule and submit a patch.
>>
> 
> I'm not opposed to the idea...
> 
>> The grammar is pretty hard to verify from a patch
>> fragment though.
>>
>> There are 2 existing nominal false positives.
>>
>> $ git grep 'select\b.*\bCONFIG_' -- '*/Kconfig*'
>> drivers/edac/Kconfig:     select CONFIG_ACPI_NFIT.
>> drivers/edac/Kconfig:     select CONFIG_ACPI_NFIT.
> 
> Ah, that's in the help text. I guess that those can be ignored simply based on the indentation.
> 
> I also see these:
> 
> drivers/i2c/busses/Kconfig:       to also select CONFIG_TYPEC_FUSB302=m.
> drivers/platform/chrome/Kconfig:        select CONFIG_MFD_CROS_EC_DEV
> 
> The 2nd looks like it's incorrect.

Yes, we just got a patch for that one today.

> 
> And then also:
> $ git grep 'depends on\b.*\bCONFIG_' -- '*/Kconfig*'
> samples/Kconfig:        depends on CONFIG_ANDROID_BINDERFS
> 
> Thanks,
> John


-- 
~Randy
Reported-by: Randy Dunlap <rdunlap-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>

Re: [PATCH] spi: Remove CONFIG_ prefix from Kconfig select

[Joe Perches]

On Thu, 2020-03-05 at 08:21 -0800, Randy Dunlap wrote:
> On 3/5/20 8:20 AM, John Garry wrote:
> > On 05/03/2020 16:01, Joe Perches wrote:
> > > On Thu, 2020-03-05 at 15:53 +0000, John Garry wrote:
> > > > On 05/03/2020 15:15, Joe Perches wrote:
> > > > > commit a2ca53b52e00 ("spi: Add HiSilicon v3xx SPI NOR flash
> > > > > controller driver") likely inadvertently used a select statement
> > > > > with a CONFIG_ prefix, remove the prefix.
> > > > > 
> > > > > Signed-off-by: Joe Perches <joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>
> > > > 
> > > > It's a pity checkpatch can't pick this stuff up...
> > > 
> > > You are free to write a rule and submit a patch.
> > > 
> > 
> > I'm not opposed to the idea...

It'd be better I think to update the grammar
verification in the tool that parses these files.

see: scripts/kconfig/...

> > > The grammar is pretty hard to verify from a patch
> > > fragment though.
> > > 
> > > There are 2 existing nominal false positives.
> > > 
> > > $ git grep 'select\b.*\bCONFIG_' -- '*/Kconfig*'
> > > drivers/edac/Kconfig:     select CONFIG_ACPI_NFIT.
> > > drivers/edac/Kconfig:     select CONFIG_ACPI_NFIT.
> > 
> > Ah, that's in the help text. I guess that those can be ignored simply based on the indentation.

The grammar is per line whitespace independent, so not necessarily.

> > drivers/platform/chrome/Kconfig:        select CONFIG_MFD_CROS_EC_DEV
> > 
> > The 2nd looks like it's incorrect.
> 
> Yes, we just got a patch for that one today.

That's the reason I submitted this one.

Applied "spi: Remove CONFIG_ prefix from Kconfig select" to the spi tree

[Mark Brown]

The patch

   spi: Remove CONFIG_ prefix from Kconfig select

has been applied to the spi tree at

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git 

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

>From e14572c52546c16e159c4c1814984843a119e823 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>
Date: Thu, 5 Mar 2020 07:15:53 -0800
Subject: [PATCH] spi: Remove CONFIG_ prefix from Kconfig select

commit a2ca53b52e00 ("spi: Add HiSilicon v3xx SPI NOR flash
controller driver") likely inadvertently used a select statement
with a CONFIG_ prefix, remove the prefix.

Reported-by: Randy Dunlap <rdunlap-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>
Signed-off-by: Joe Perches <joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>
Acked-by: John Garry <john.garry-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
Link: https://lore.kernel.org/r/f8ac6b32a29b9a05b58a7e58ffe8b780642abbf1.camel-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org
Signed-off-by: Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
---
 drivers/spi/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 887fefe87fd5..9c5dadb238dc 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -292,7 +292,7 @@ config SPI_HISI_SFC_V3XX
 	tristate "HiSilicon SPI-NOR Flash Controller for Hi16XX chipsets"
 	depends on (ARM64 && ACPI) || COMPILE_TEST
 	depends on HAS_IOMEM
-	select CONFIG_MTD_SPI_NOR
+	select MTD_SPI_NOR
 	help
 	  This enables support for HiSilicon v3xx SPI-NOR flash controller
 	  found in hi16xx chipsets.
-- 
2.20.1