| Message ID | 1356526466-27360-1-git-send-email-zajec5@gmail.com |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, 2012-12-26 at 13:54 +0100, Rafał Miłecki wrote: > This is needed to add clean support for other buses (like SSB) in the > future. > > Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Cannot compile-test this patch because of the following build regression in 3.8-rc4: In file included from arch/mips/pci/pci-bcm47xx.c:27:0: include/linux/ssb/ssb.h:440:19: error: field 'gpio' has incomplete type In file included from include/linux/bcma/bcma.h:7:0, from arch/mips/pci/pci-bcm47xx.c:28: include/linux/bcma/bcma_driver_chipcommon.h:582:19: error: field 'gpio' has incomplete type make[2]: *** [arch/mips/pci/pci-bcm47xx.o] Error 1
2013/1/15 Artem Bityutskiy <dedekind1@gmail.com>: > On Wed, 2012-12-26 at 13:54 +0100, Rafał Miłecki wrote: >> This is needed to add clean support for other buses (like SSB) in the >> future. >> >> Signed-off-by: Rafał Miłecki <zajec5@gmail.com> > > Cannot compile-test this patch because of the following build regression > in 3.8-rc4: > > In file included from arch/mips/pci/pci-bcm47xx.c:27:0: > include/linux/ssb/ssb.h:440:19: error: field 'gpio' has incomplete type > In file included from include/linux/bcma/bcma.h:7:0, > from arch/mips/pci/pci-bcm47xx.c:28: > include/linux/bcma/bcma_driver_chipcommon.h:582:19: error: field 'gpio' has incomplete type > make[2]: *** [arch/mips/pci/pci-bcm47xx.o] Error 1 This was already explained by Hauke and I believe you applied proper patch to the maintaining tools. Can you re-try to add this patch?
2013/1/18 Rafał Miłecki <zajec5@gmail.com>: > 2013/1/15 Artem Bityutskiy <dedekind1@gmail.com>: >> On Wed, 2012-12-26 at 13:54 +0100, Rafał Miłecki wrote: >>> This is needed to add clean support for other buses (like SSB) in the >>> future. >>> >>> Signed-off-by: Rafał Miłecki <zajec5@gmail.com> >> >> Cannot compile-test this patch because of the following build regression >> in 3.8-rc4: >> >> In file included from arch/mips/pci/pci-bcm47xx.c:27:0: >> include/linux/ssb/ssb.h:440:19: error: field 'gpio' has incomplete type >> In file included from include/linux/bcma/bcma.h:7:0, >> from arch/mips/pci/pci-bcm47xx.c:28: >> include/linux/bcma/bcma_driver_chipcommon.h:582:19: error: field 'gpio' has incomplete type >> make[2]: *** [arch/mips/pci/pci-bcm47xx.o] Error 1 > > This was already explained by Hauke and I believe you applied proper > patch to the maintaining tools. > > Can you re-try to add this patch? I can see it doesn't apply cleanly anymore. If you didn't resolve that yet, you can drop this patch and just apply patchset [PATCH 0/6] mtd: bcm47xx: some fixes for the flash drivers that applies cleanly. I can resend this patch rebased on a [PATCH 0/6] mtd: bcm47xx: some fixes for the flash drivers
diff --git a/drivers/mtd/devices/bcm47xxsflash.c b/drivers/mtd/devices/bcm47xxsflash.c index 4714584..f293682 100644 --- a/drivers/mtd/devices/bcm47xxsflash.c +++ b/drivers/mtd/devices/bcm47xxsflash.c @@ -40,7 +40,7 @@ static void bcm47xxsflash_fill_mtd(struct bcma_sflash *sflash, mtd->writebufsize = mtd->writesize = 1; } -static int bcm47xxsflash_probe(struct platform_device *pdev) +static int bcm47xxsflash_bcma_probe(struct platform_device *pdev) { struct bcma_sflash *sflash = dev_get_platdata(&pdev->dev); int err; @@ -66,7 +66,7 @@ out: return err; } -static int bcm47xxsflash_remove(struct platform_device *pdev) +static int bcm47xxsflash_bcma_remove(struct platform_device *pdev) { struct bcma_sflash *sflash = dev_get_platdata(&pdev->dev); @@ -77,7 +77,7 @@ static int bcm47xxsflash_remove(struct platform_device *pdev) } static struct platform_driver bcma_sflash_driver = { - .remove = bcm47xxsflash_remove, + .remove = bcm47xxsflash_bcma_remove, .driver = { .name = "bcma_sflash", .owner = THIS_MODULE, @@ -88,7 +88,8 @@ static int __init bcm47xxsflash_init(void) { int err; - err = platform_driver_probe(&bcma_sflash_driver, bcm47xxsflash_probe); + err = platform_driver_probe(&bcma_sflash_driver, + bcm47xxsflash_bcma_probe); if (err) pr_err("Failed to register BCMA serial flash driver: %d\n", err);
This is needed to add clean support for other buses (like SSB) in the future. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> --- drivers/mtd/devices/bcm47xxsflash.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-)