2010-02-03 15:23:14

by Christoph Egger

Subject: Unreachable block in Kernel Code (CONFIG_SSB_SDIO)

Hi all!

As part of the VAMOS[0] research project at the University of
Erlangen we're checking referential integrity between kernel KConfig
options and in-code Conditional blocks.

In git commit 24ea602e183ca20a7577ebe253323d0e5d0f9847 you
introduced SDIO in drivers/ssb/main.c. While most of the config checks
look for CONFIG_SSB_SDIOHOST there's one check for CONFIG_SSB_SDIO
which looks wrong (and is one of the CONFIG_ vars that are not defined
anywhere in source neither avaiable in kconfig.

Changing this only occurence to SDIOHOST [0] as well however
unfortunately results in a build failure [1] I can't find the correct
way to fix. Maybe you know how to correctly handle that?

Please keep me informed of this patch getting confirmed /
merged so we can keep track of it.

Regards

Christoph Egger

[0]
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -494,7 +494,7 @@ static int ssb_devices_register(struct ssb_bus
*bus)
#endif
break;
case SSB_BUSTYPE_SDIO:
-#ifdef CONFIG_SSB_SDIO
+#ifdef CONFIG_SSB_SDIOHOST
sdev->irq = bus->host_sdio->dev.irq;
dev->parent = &bus->host_sdio->dev;
#endif

[1]
drivers/ssb/main.c: In function 'ssb_devices_register':
drivers/ssb/main.c:498: error: 'struct device' has no member named 'irq'

2010-02-03 17:25:02

by Michael Büsch

Subject: [PATCH] ssb: Fix CONFIG_SSB_SDIOHOST typo

This fixes a CONFIG_SSB_SDIOHOST typo.

Signed-off-by: Michael Buesch <[email protected]>
Reported-by: Christoph Egger <[email protected]>

---
drivers/ssb/main.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

--- wireless-testing.orig/drivers/ssb/main.c
+++ wireless-testing/drivers/ssb/main.c
@@ -494,8 +494,7 @@ static int ssb_devices_register(struct s
#endif
break;
case SSB_BUSTYPE_SDIO:
-#ifdef CONFIG_SSB_SDIO
- sdev->irq = bus->host_sdio->dev.irq;
+#ifdef CONFIG_SSB_SDIOHOST
dev->parent = &bus->host_sdio->dev;
#endif
break;

--
Greetings, Michael.

2010-02-03 17:44:45

by Albert Herranz

Subject: Re: [PATCH] ssb: Fix CONFIG_SSB_SDIOHOST typo

Michael Buesch wrote:
> This fixes a CONFIG_SSB_SDIOHOST typo.
>
> Signed-off-by: Michael Buesch <[email protected]>
> Reported-by: Christoph Egger <[email protected]>
>
> ---
> drivers/ssb/main.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> --- wireless-testing.orig/drivers/ssb/main.c
> +++ wireless-testing/drivers/ssb/main.c
> @@ -494,8 +494,7 @@ static int ssb_devices_register(struct s
> #endif
> break;
> case SSB_BUSTYPE_SDIO:
> -#ifdef CONFIG_SSB_SDIO
> - sdev->irq = bus->host_sdio->dev.irq;
> +#ifdef CONFIG_SSB_SDIOHOST
> dev->parent = &bus->host_sdio->dev;
> #endif
> break;
>

Tested-By: Albert Herranz <[email protected]>

Thanks,
Albert