Patchwork [-next] mtd: fix sbc2_flash build when PCI is not enabled

login
register
mail settings
Submitter Randy.Dunlap
Date April 16, 2012, 7:50 p.m.
Message ID <4F8C780D.9010702@xenotime.net>
Download mbox | patch
Permalink /patch/152947/
State Accepted
Commit 47d0505bdba39f3bf247b5d57d94b4a5fa8ae475
Headers show

Comments

Randy.Dunlap - April 16, 2012, 7:50 p.m.
From: Randy Dunlap <rdunlap@xenotime.net>

sbc2_flash.c is a PCI driver, but its build fails when CONFIG_PCI
is not enabled, so make it depend on PCI.

drivers/mtd/maps/scb2_flash.c:237:1: warning: data definition has no type or storage class
drivers/mtd/maps/scb2_flash.c:237:1: warning: type defaults to 'int' in declaration of 'module_pci_driver'
drivers/mtd/maps/scb2_flash.c:237:1: warning: parameter names (without types) in function declaration

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Cc:	David Woodhouse <dwmw2@infradead.org>
Cc:	linux-mtd@lists.infradead.org
---
 drivers/mtd/maps/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Paul Gortmaker - April 16, 2012, 10:20 p.m.
On Mon, Apr 16, 2012 at 3:50 PM, Randy Dunlap <rdunlap@xenotime.net> wrote:
> From: Randy Dunlap <rdunlap@xenotime.net>
>
> sbc2_flash.c is a PCI driver, but its build fails when CONFIG_PCI

Minor nit -- above line and subject reference sbc2, when fail comes
from scb2 source module.

Paul.
--

> is not enabled, so make it depend on PCI.
>
> drivers/mtd/maps/scb2_flash.c:237:1: warning: data definition has no type or storage class
> drivers/mtd/maps/scb2_flash.c:237:1: warning: type defaults to 'int' in declaration of 'module_pci_driver'
> drivers/mtd/maps/scb2_flash.c:237:1: warning: parameter names (without types) in function declaration
>
> Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
> Cc:     David Woodhouse <dwmw2@infradead.org>
> Cc:     linux-mtd@lists.infradead.org
> ---
>  drivers/mtd/maps/Kconfig |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> --- linux-next-20120416.orig/drivers/mtd/maps/Kconfig
> +++ linux-next-20120416/drivers/mtd/maps/Kconfig
> @@ -224,7 +224,7 @@ config MTD_CK804XROM
>
>  config MTD_SCB2_FLASH
>        tristate "BIOS flash chip on Intel SCB2 boards"
> -       depends on X86 && MTD_JEDECPROBE
> +       depends on X86 && MTD_JEDECPROBE && PCI
>        help
>          Support for treating the BIOS flash chip on Intel SCB2 boards
>          as an MTD device - with this you can reprogram your BIOS.
> --
> To unsubscribe from this list: send the line "unsubscribe linux-next" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
Randy.Dunlap - April 17, 2012, 1:25 a.m.
On 04/16/2012 03:20 PM, Paul Gortmaker wrote:

> On Mon, Apr 16, 2012 at 3:50 PM, Randy Dunlap <rdunlap@xenotime.net> wrote:
>> From: Randy Dunlap <rdunlap@xenotime.net>
>>
>> sbc2_flash.c is a PCI driver, but its build fails when CONFIG_PCI
> 
> Minor nit -- above line and subject reference sbc2, when fail comes
> from scb2 source module.

Ack.  I noticed later that I had botched that.

Thanks.

> Paul.
> --
> 
>> is not enabled, so make it depend on PCI.
>>
>> drivers/mtd/maps/scb2_flash.c:237:1: warning: data definition has no type or storage class
>> drivers/mtd/maps/scb2_flash.c:237:1: warning: type defaults to 'int' in declaration of 'module_pci_driver'
>> drivers/mtd/maps/scb2_flash.c:237:1: warning: parameter names (without types) in function declaration
>>
>> Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
>> Cc:     David Woodhouse <dwmw2@infradead.org>
>> Cc:     linux-mtd@lists.infradead.org
>> ---
>>  drivers/mtd/maps/Kconfig |    2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> --- linux-next-20120416.orig/drivers/mtd/maps/Kconfig
>> +++ linux-next-20120416/drivers/mtd/maps/Kconfig
>> @@ -224,7 +224,7 @@ config MTD_CK804XROM
>>
>>  config MTD_SCB2_FLASH
>>        tristate "BIOS flash chip on Intel SCB2 boards"
>> -       depends on X86 && MTD_JEDECPROBE
>> +       depends on X86 && MTD_JEDECPROBE && PCI
>>        help
>>          Support for treating the BIOS flash chip on Intel SCB2 boards
>>          as an MTD device - with this you can reprogram your BIOS.
>> --
Artem Bityutskiy - April 25, 2012, 11:05 a.m.
On Mon, 2012-04-16 at 12:50 -0700, Randy Dunlap wrote:
> From: Randy Dunlap <rdunlap@xenotime.net>
> 
> sbc2_flash.c is a PCI driver, but its build fails when CONFIG_PCI
> is not enabled, so make it depend on PCI.
> 
> drivers/mtd/maps/scb2_flash.c:237:1: warning: data definition has no type or storage class
> drivers/mtd/maps/scb2_flash.c:237:1: warning: type defaults to 'int' in declaration of 'module_pci_driver'
> drivers/mtd/maps/scb2_flash.c:237:1: warning: parameter names (without types) in function declaration
> 
> Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>

Pushed to l2-mtd.git, thanks!
Artem Bityutskiy - April 25, 2012, 3:33 p.m.
On Mon, 2012-04-16 at 12:50 -0700, Randy Dunlap wrote:
> From: Randy Dunlap <rdunlap@xenotime.net>
> 
> sbc2_flash.c is a PCI driver, but its build fails when CONFIG_PCI
> is not enabled, so make it depend on PCI.
> 
> drivers/mtd/maps/scb2_flash.c:237:1: warning: data definition has no type or storage class
> drivers/mtd/maps/scb2_flash.c:237:1: warning: type defaults to 'int' in declaration of 'module_pci_driver'
> drivers/mtd/maps/scb2_flash.c:237:1: warning: parameter names (without types) in function declaration
> 
> Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>

Pushed to l2-mtd.git, thanks!

Patch

--- linux-next-20120416.orig/drivers/mtd/maps/Kconfig
+++ linux-next-20120416/drivers/mtd/maps/Kconfig
@@ -224,7 +224,7 @@  config MTD_CK804XROM
 
 config MTD_SCB2_FLASH
 	tristate "BIOS flash chip on Intel SCB2 boards"
-	depends on X86 && MTD_JEDECPROBE
+	depends on X86 && MTD_JEDECPROBE && PCI
 	help
 	  Support for treating the BIOS flash chip on Intel SCB2 boards
 	  as an MTD device - with this you can reprogram your BIOS.