2008-07-11 14:37:20

by David Howells

Subject: [PATCH] Fix the fcpnp_driver declaration to only exist if CONFIG_PNP=y

Fix the fcpnp_driver declaration to only exist if CONFIG_PNP=y as it's only
accessed in that case.

The PNP=n variant was added by patch 30d55e71a81b1f5a8136f191dc9f4c21f18e77e6.

Signed-off-by: David Howells <[email protected]>
---

drivers/isdn/hisax/hisax_fcpcipnp.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)


diff --git a/drivers/isdn/hisax/hisax_fcpcipnp.c b/drivers/isdn/hisax/hisax_fcpcipnp.c
index c0b4db2..1925118 100644
--- a/drivers/isdn/hisax/hisax_fcpcipnp.c
+++ b/drivers/isdn/hisax/hisax_fcpcipnp.c
@@ -974,8 +974,6 @@ static struct pnp_driver fcpnp_driver = {
.remove = __devexit_p(fcpnp_remove),
.id_table = fcpnp_ids,
};
-#else
-static struct pnp_driver fcpnp_driver;
#endif

static void __devexit fcpci_remove(struct pci_dev *pdev)

2008-07-11 15:07:21

by Bjorn Helgaas

Subject: Re: [PATCH] Fix the fcpnp_driver declaration to only exist if CONFIG_PNP=y

On Friday 11 July 2008 8:36:48 am David Howells wrote:
> Fix the fcpnp_driver declaration to only exist if CONFIG_PNP=y as it's only
> accessed in that case.
>
> The PNP=n variant was added by patch
> 30d55e71a81b1f5a8136f191dc9f4c21f18e77e6.
>
> Signed-off-by: David Howells <[email protected]>

Acked-by: Bjorn Helgaas <[email protected]>

> ---
>
> drivers/isdn/hisax/hisax_fcpcipnp.c | 2 --
> 1 files changed, 0 insertions(+), 2 deletions(-)
>
>
> diff --git a/drivers/isdn/hisax/hisax_fcpcipnp.c
> b/drivers/isdn/hisax/hisax_fcpcipnp.c index c0b4db2..1925118 100644
> --- a/drivers/isdn/hisax/hisax_fcpcipnp.c
> +++ b/drivers/isdn/hisax/hisax_fcpcipnp.c
> @@ -974,8 +974,6 @@ static struct pnp_driver fcpnp_driver = {
> .remove = __devexit_p(fcpnp_remove),
> .id_table = fcpnp_ids,
> };
> -#else
> -static struct pnp_driver fcpnp_driver;
> #endif
>
> static void __devexit fcpci_remove(struct pci_dev *pdev)

2008-07-13 05:17:45

by Andrew Morton

Subject: Re: [PATCH] Fix the fcpnp_driver declaration to only exist if CONFIG_PNP=y

On Fri, 11 Jul 2008 15:36:48 +0100 David Howells <[email protected]> wrote:

> Fix the fcpnp_driver declaration to only exist if CONFIG_PNP=y as it's only
> accessed in that case.
>
> The PNP=n variant was added by patch 30d55e71a81b1f5a8136f191dc9f4c21f18e77e6.
>

Does this fix a build error or a warning or what? A warning, I think.

>
> diff --git a/drivers/isdn/hisax/hisax_fcpcipnp.c b/drivers/isdn/hisax/hisax_fcpcipnp.c
> index c0b4db2..1925118 100644
> --- a/drivers/isdn/hisax/hisax_fcpcipnp.c
> +++ b/drivers/isdn/hisax/hisax_fcpcipnp.c
> @@ -974,8 +974,6 @@ static struct pnp_driver fcpnp_driver = {
> .remove = __devexit_p(fcpnp_remove),
> .id_table = fcpnp_ids,
> };
> -#else
> -static struct pnp_driver fcpnp_driver;
> #endif
>
> static void __devexit fcpci_remove(struct pci_dev *pdev)

I have to run around and work out of the fix is needed in 2.6.25
or 2.6.26 or linux-next. Telling me this is always appreciated.

2008-07-13 08:55:41

by David Howells

Subject: Re: [PATCH] Fix the fcpnp_driver declaration to only exist if CONFIG_PNP=y

Andrew Morton <[email protected]> wrote:

> Does this fix a build error or a warning or what? A warning, I think.

An unused variable warning.

David