* [PATCH] [SCSI] aic7xxx: Fix warnings with CONFIG_PM=n
@ 2007-11-08 23:03 Frank Lichtenheld
2007-11-08 23:58 ` Randy Dunlap
0 siblings, 1 reply; 7+ messages in thread
From: Frank Lichtenheld @ 2007-11-08 23:03 UTC (permalink / raw)
To: Hannes Reinecke; +Cc: linux-scsi, trivial, Frank Lichtenheld
Fixes the following warnings:
CC [M] drivers/scsi/aic7xxx/aic79xx_osm_pci.o
drivers/scsi/aic7xxx/aic79xx_osm_pci.c:101: warning: ‘ahd_linux_pci_dev_suspend’ defined but not used
drivers/scsi/aic7xxx/aic79xx_osm_pci.c:121: warning: ‘ahd_linux_pci_dev_resume’ defined but not used
CC [M] drivers/scsi/aic7xxx/aic7xxx_osm_pci.o
drivers/scsi/aic7xxx/aic7xxx_osm_pci.c:148: warning: ‘ahc_linux_pci_dev_suspend’ defined but not used
drivers/scsi/aic7xxx/aic7xxx_osm_pci.c:166: warning: ‘ahc_linux_pci_dev_resume’ defined but not used
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
---
drivers/scsi/aic7xxx/aic79xx_osm_pci.c | 4 ++++
drivers/scsi/aic7xxx/aic7xxx_osm_pci.c | 4 ++++
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
index 66f0259..36d7618 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
@@ -50,8 +50,10 @@ static int ahd_linux_pci_reserve_io_regions(struct ahd_softc *ahd,
static int ahd_linux_pci_reserve_mem_region(struct ahd_softc *ahd,
u_long *bus_addr,
uint8_t __iomem **maddr);
+#ifdef CONFIG_PM
static int ahd_linux_pci_dev_suspend(struct pci_dev *pdev, pm_message_t mesg);
static int ahd_linux_pci_dev_resume(struct pci_dev *pdev);
+#endif
static void ahd_linux_pci_dev_remove(struct pci_dev *pdev);
/* Define the macro locally since it's different for different class of chips.
@@ -96,6 +98,7 @@ static struct pci_driver aic79xx_pci_driver = {
.id_table = ahd_linux_pci_id_table
};
+#ifdef CONFIG_PM
static int
ahd_linux_pci_dev_suspend(struct pci_dev *pdev, pm_message_t mesg)
{
@@ -139,6 +142,7 @@ ahd_linux_pci_dev_resume(struct pci_dev *pdev)
return rc;
}
+#endif
static void
ahd_linux_pci_dev_remove(struct pci_dev *pdev)
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
index 4488946..212c2c8 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
@@ -49,8 +49,10 @@ static int ahc_linux_pci_reserve_io_region(struct ahc_softc *ahc,
static int ahc_linux_pci_reserve_mem_region(struct ahc_softc *ahc,
u_long *bus_addr,
uint8_t __iomem **maddr);
+#ifdef CONFIG_PM
static int ahc_linux_pci_dev_suspend(struct pci_dev *pdev, pm_message_t mesg);
static int ahc_linux_pci_dev_resume(struct pci_dev *pdev);
+#endif
static void ahc_linux_pci_dev_remove(struct pci_dev *pdev);
/* Define the macro locally since it's different for different class of chips.
@@ -143,6 +145,7 @@ static struct pci_driver aic7xxx_pci_driver = {
.id_table = ahc_linux_pci_id_table
};
+#ifdef CONFIG_PM
static int
ahc_linux_pci_dev_suspend(struct pci_dev *pdev, pm_message_t mesg)
{
@@ -182,6 +185,7 @@ ahc_linux_pci_dev_resume(struct pci_dev *pdev)
return (ahc_resume(ahc));
}
+#endif
static void
ahc_linux_pci_dev_remove(struct pci_dev *pdev)
--
1.5.3.4
-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] [SCSI] aic7xxx: Fix warnings with CONFIG_PM=n
2007-11-08 23:03 [PATCH] [SCSI] aic7xxx: Fix warnings with CONFIG_PM=n Frank Lichtenheld
@ 2007-11-08 23:58 ` Randy Dunlap
2007-11-09 0:12 ` Frank Lichtenheld
0 siblings, 1 reply; 7+ messages in thread
From: Randy Dunlap @ 2007-11-08 23:58 UTC (permalink / raw)
To: Frank Lichtenheld; +Cc: Hannes Reinecke, linux-scsi, trivial
On Fri, 9 Nov 2007 00:03:48 +0100 Frank Lichtenheld wrote:
> Fixes the following warnings:
> CC [M] drivers/scsi/aic7xxx/aic79xx_osm_pci.o
> drivers/scsi/aic7xxx/aic79xx_osm_pci.c:101: warning: ‘ahd_linux_pci_dev_suspend’ defined but not used
> drivers/scsi/aic7xxx/aic79xx_osm_pci.c:121: warning: ‘ahd_linux_pci_dev_resume’ defined but not used
>
> CC [M] drivers/scsi/aic7xxx/aic7xxx_osm_pci.o
> drivers/scsi/aic7xxx/aic7xxx_osm_pci.c:148: warning: ‘ahc_linux_pci_dev_suspend’ defined but not used
> drivers/scsi/aic7xxx/aic7xxx_osm_pci.c:166: warning: ‘ahc_linux_pci_dev_resume’ defined but not used
>
> Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
> ---
> drivers/scsi/aic7xxx/aic79xx_osm_pci.c | 4 ++++
> drivers/scsi/aic7xxx/aic7xxx_osm_pci.c | 4 ++++
> 2 files changed, 8 insertions(+), 0 deletions(-)
Hi,
The preferred method of fixing this type of warning is to
(warning, not a full patch here):
a. change the struct pci_driver not to use #ifdef CONFIG_PM/#endif;
instead, it always says:
.suspend = ahd_linux_pci_dev_suspend,
.resume = ahd_linux_pci_dev_resume,
and those pointers are built depending on CONFIG_PM like so:
#ifdef CONFIG_PM
... functions as they are now ...
#else
#define ahd_linux_pci_dev_suspend NULL
#define ahd_linux_pci_dev_resume NULL
#endif
so the ifdef/endif blocks are localized to one place in each driver.
> diff --git a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
> index 66f0259..36d7618 100644
> --- a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
> +++ b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
> @@ -50,8 +50,10 @@ static int ahd_linux_pci_reserve_io_regions(struct ahd_softc *ahd,
> static int ahd_linux_pci_reserve_mem_region(struct ahd_softc *ahd,
> u_long *bus_addr,
> uint8_t __iomem **maddr);
> +#ifdef CONFIG_PM
> static int ahd_linux_pci_dev_suspend(struct pci_dev *pdev, pm_message_t mesg);
> static int ahd_linux_pci_dev_resume(struct pci_dev *pdev);
> +#endif
> static void ahd_linux_pci_dev_remove(struct pci_dev *pdev);
>
> /* Define the macro locally since it's different for different class of chips.
> @@ -96,6 +98,7 @@ static struct pci_driver aic79xx_pci_driver = {
> .id_table = ahd_linux_pci_id_table
> };
>
> +#ifdef CONFIG_PM
> static int
> ahd_linux_pci_dev_suspend(struct pci_dev *pdev, pm_message_t mesg)
> {
> @@ -139,6 +142,7 @@ ahd_linux_pci_dev_resume(struct pci_dev *pdev)
>
> return rc;
> }
> +#endif
>
> static void
> ahd_linux_pci_dev_remove(struct pci_dev *pdev)
> diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
> index 4488946..212c2c8 100644
> --- a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
> +++ b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
> @@ -49,8 +49,10 @@ static int ahc_linux_pci_reserve_io_region(struct ahc_softc *ahc,
> static int ahc_linux_pci_reserve_mem_region(struct ahc_softc *ahc,
> u_long *bus_addr,
> uint8_t __iomem **maddr);
> +#ifdef CONFIG_PM
> static int ahc_linux_pci_dev_suspend(struct pci_dev *pdev, pm_message_t mesg);
> static int ahc_linux_pci_dev_resume(struct pci_dev *pdev);
> +#endif
> static void ahc_linux_pci_dev_remove(struct pci_dev *pdev);
>
> /* Define the macro locally since it's different for different class of chips.
> @@ -143,6 +145,7 @@ static struct pci_driver aic7xxx_pci_driver = {
> .id_table = ahc_linux_pci_id_table
> };
>
> +#ifdef CONFIG_PM
> static int
> ahc_linux_pci_dev_suspend(struct pci_dev *pdev, pm_message_t mesg)
> {
> @@ -182,6 +185,7 @@ ahc_linux_pci_dev_resume(struct pci_dev *pdev)
>
> return (ahc_resume(ahc));
> }
> +#endif
>
> static void
> ahc_linux_pci_dev_remove(struct pci_dev *pdev)
> --
---
~Randy
-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] [SCSI] aic7xxx: Fix warnings with CONFIG_PM=n
2007-11-08 23:58 ` Randy Dunlap
@ 2007-11-09 0:12 ` Frank Lichtenheld
2007-11-09 0:17 ` Randy Dunlap
0 siblings, 1 reply; 7+ messages in thread
From: Frank Lichtenheld @ 2007-11-09 0:12 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Hannes Reinecke, linux-scsi
On Thu, Nov 08, 2007 at 03:58:34PM -0800, Randy Dunlap wrote:
> Hi,
> The preferred method of fixing this type of warning is to
> (warning, not a full patch here):
>
> a. change the struct pci_driver not to use #ifdef CONFIG_PM/#endif;
> instead, it always says:
>
> .suspend = ahd_linux_pci_dev_suspend,
> .resume = ahd_linux_pci_dev_resume,
>
> and those pointers are built depending on CONFIG_PM like so:
>
> #ifdef CONFIG_PM
> ... functions as they are now ...
> #else
> #define ahd_linux_pci_dev_suspend NULL
> #define ahd_linux_pci_dev_resume NULL
> #endif
>
> so the ifdef/endif blocks are localized to one place in each driver.
Hmm, technically _two_ places since you still need them around both
declaration and definition of the functions, right?
Gruesse,
--
Frank Lichtenheld <frank@lichtenheld.de>
www: http://www.djpig.de/
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] [SCSI] aic7xxx: Fix warnings with CONFIG_PM=n
2007-11-09 0:12 ` Frank Lichtenheld
@ 2007-11-09 0:17 ` Randy Dunlap
2007-11-09 7:55 ` [PATCH alternative] " Frank Lichtenheld
0 siblings, 1 reply; 7+ messages in thread
From: Randy Dunlap @ 2007-11-09 0:17 UTC (permalink / raw)
To: Frank Lichtenheld; +Cc: Hannes Reinecke, linux-scsi
Frank Lichtenheld wrote:
> On Thu, Nov 08, 2007 at 03:58:34PM -0800, Randy Dunlap wrote:
>> Hi,
>> The preferred method of fixing this type of warning is to
>> (warning, not a full patch here):
>>
>> a. change the struct pci_driver not to use #ifdef CONFIG_PM/#endif;
>> instead, it always says:
>>
>> .suspend = ahd_linux_pci_dev_suspend,
>> .resume = ahd_linux_pci_dev_resume,
>>
>> and those pointers are built depending on CONFIG_PM like so:
>>
>> #ifdef CONFIG_PM
>> ... functions as they are now ...
>> #else
>> #define ahd_linux_pci_dev_suspend NULL
>> #define ahd_linux_pci_dev_resume NULL
>> #endif
>>
>> so the ifdef/endif blocks are localized to one place in each driver.
>
> Hmm, technically _two_ places since you still need them around both
> declaration and definition of the functions, right?
OK, that's the case without any code movement.
But "ideally" the functions would be defined before the
struct pci_driver data, so the prototypes for them could be removed.
--
~Randy
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH alternative] [SCSI] aic7xxx: Fix warnings with CONFIG_PM=n
2007-11-09 0:17 ` Randy Dunlap
@ 2007-11-09 7:55 ` Frank Lichtenheld
2007-11-09 16:17 ` Randy Dunlap
0 siblings, 1 reply; 7+ messages in thread
From: Frank Lichtenheld @ 2007-11-09 7:55 UTC (permalink / raw)
To: Hannes Reinecke; +Cc: linux-scsi, Randy Dunlap, Frank Lichtenheld
Fixes the following warnings:
CC [M] drivers/scsi/aic7xxx/aic79xx_osm_pci.o
drivers/scsi/aic7xxx/aic79xx_osm_pci.c:101: warning: ‘ahd_linux_pci_dev_suspend’ defined but not used
drivers/scsi/aic7xxx/aic79xx_osm_pci.c:121: warning: ‘ahd_linux_pci_dev_resume’ defined but not used
CC [M] drivers/scsi/aic7xxx/aic7xxx_osm_pci.o
drivers/scsi/aic7xxx/aic7xxx_osm_pci.c:148: warning: ‘ahc_linux_pci_dev_suspend’ defined but not used
drivers/scsi/aic7xxx/aic7xxx_osm_pci.c:166: warning: ‘ahc_linux_pci_dev_resume’ defined but not used
Reorder code as suggested by Randy Dunlap to minimize
needed #ifdefs
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
---
drivers/scsi/aic7xxx/aic79xx_osm_pci.c | 25 +++++++++++++------------
drivers/scsi/aic7xxx/aic7xxx_osm_pci.c | 25 +++++++++++++------------
2 files changed, 26 insertions(+), 24 deletions(-)
> But "ideally" the functions would be defined before the
> struct pci_driver data, so the prototypes for them could be removed.
Hmm, I'm a bit sceptical about the reordering, but here you go.
Choose whatever you like.
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
index 66f0259..f6dbd3e 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
@@ -50,8 +50,6 @@ static int ahd_linux_pci_reserve_io_regions(struct ahd_softc *ahd,
static int ahd_linux_pci_reserve_mem_region(struct ahd_softc *ahd,
u_long *bus_addr,
uint8_t __iomem **maddr);
-static int ahd_linux_pci_dev_suspend(struct pci_dev *pdev, pm_message_t mesg);
-static int ahd_linux_pci_dev_resume(struct pci_dev *pdev);
static void ahd_linux_pci_dev_remove(struct pci_dev *pdev);
/* Define the macro locally since it's different for different class of chips.
@@ -85,17 +83,7 @@ static struct pci_device_id ahd_linux_pci_id_table[] = {
MODULE_DEVICE_TABLE(pci, ahd_linux_pci_id_table);
-static struct pci_driver aic79xx_pci_driver = {
- .name = "aic79xx",
- .probe = ahd_linux_pci_dev_probe,
#ifdef CONFIG_PM
- .suspend = ahd_linux_pci_dev_suspend,
- .resume = ahd_linux_pci_dev_resume,
-#endif
- .remove = ahd_linux_pci_dev_remove,
- .id_table = ahd_linux_pci_id_table
-};
-
static int
ahd_linux_pci_dev_suspend(struct pci_dev *pdev, pm_message_t mesg)
{
@@ -139,6 +127,19 @@ ahd_linux_pci_dev_resume(struct pci_dev *pdev)
return rc;
}
+#else
+#define ahd_linux_pci_dev_suspend NULL
+#define ahd_linux_pci_dev_resume NULL
+#endif
+
+static struct pci_driver aic79xx_pci_driver = {
+ .name = "aic79xx",
+ .probe = ahd_linux_pci_dev_probe,
+ .suspend = ahd_linux_pci_dev_suspend,
+ .resume = ahd_linux_pci_dev_resume,
+ .remove = ahd_linux_pci_dev_remove,
+ .id_table = ahd_linux_pci_id_table
+};
static void
ahd_linux_pci_dev_remove(struct pci_dev *pdev)
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
index 4488946..ab53189 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
@@ -49,8 +49,6 @@ static int ahc_linux_pci_reserve_io_region(struct ahc_softc *ahc,
static int ahc_linux_pci_reserve_mem_region(struct ahc_softc *ahc,
u_long *bus_addr,
uint8_t __iomem **maddr);
-static int ahc_linux_pci_dev_suspend(struct pci_dev *pdev, pm_message_t mesg);
-static int ahc_linux_pci_dev_resume(struct pci_dev *pdev);
static void ahc_linux_pci_dev_remove(struct pci_dev *pdev);
/* Define the macro locally since it's different for different class of chips.
@@ -132,17 +130,7 @@ static struct pci_device_id ahc_linux_pci_id_table[] = {
MODULE_DEVICE_TABLE(pci, ahc_linux_pci_id_table);
-static struct pci_driver aic7xxx_pci_driver = {
- .name = "aic7xxx",
- .probe = ahc_linux_pci_dev_probe,
#ifdef CONFIG_PM
- .suspend = ahc_linux_pci_dev_suspend,
- .resume = ahc_linux_pci_dev_resume,
-#endif
- .remove = ahc_linux_pci_dev_remove,
- .id_table = ahc_linux_pci_id_table
-};
-
static int
ahc_linux_pci_dev_suspend(struct pci_dev *pdev, pm_message_t mesg)
{
@@ -182,6 +170,19 @@ ahc_linux_pci_dev_resume(struct pci_dev *pdev)
return (ahc_resume(ahc));
}
+#else
+#define ahc_linux_pci_dev_suspend NULL
+#define ahc_linux_pci_dev_resume NULL
+#endif
+
+static struct pci_driver aic7xxx_pci_driver = {
+ .name = "aic7xxx",
+ .probe = ahc_linux_pci_dev_probe,
+ .suspend = ahc_linux_pci_dev_suspend,
+ .resume = ahc_linux_pci_dev_resume,
+ .remove = ahc_linux_pci_dev_remove,
+ .id_table = ahc_linux_pci_id_table
+};
static void
ahc_linux_pci_dev_remove(struct pci_dev *pdev)
--
1.5.3.4
-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH alternative] [SCSI] aic7xxx: Fix warnings with CONFIG_PM=n
2007-11-09 7:55 ` [PATCH alternative] " Frank Lichtenheld
@ 2007-11-09 16:17 ` Randy Dunlap
2007-11-12 10:23 ` [PATCH] " Frank Lichtenheld
0 siblings, 1 reply; 7+ messages in thread
From: Randy Dunlap @ 2007-11-09 16:17 UTC (permalink / raw)
To: Frank Lichtenheld; +Cc: Hannes Reinecke, linux-scsi
On Fri, 9 Nov 2007 08:55:44 +0100 Frank Lichtenheld wrote:
> Fixes the following warnings:
> CC [M] drivers/scsi/aic7xxx/aic79xx_osm_pci.o
> drivers/scsi/aic7xxx/aic79xx_osm_pci.c:101: warning: ‘ahd_linux_pci_dev_suspend’ defined but not used
> drivers/scsi/aic7xxx/aic79xx_osm_pci.c:121: warning: ‘ahd_linux_pci_dev_resume’ defined but not used
>
> CC [M] drivers/scsi/aic7xxx/aic7xxx_osm_pci.o
> drivers/scsi/aic7xxx/aic7xxx_osm_pci.c:148: warning: ‘ahc_linux_pci_dev_suspend’ defined but not used
> drivers/scsi/aic7xxx/aic7xxx_osm_pci.c:166: warning: ‘ahc_linux_pci_dev_resume’ defined but not used
>
> Reorder code as suggested by Randy Dunlap to minimize
> needed #ifdefs
>
> Cc: Randy Dunlap <randy.dunlap@oracle.com>
> Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
Thanks.
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
with one nit:
Warning: trailing whitespace in line 174 of drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
Warning: trailing whitespace in lines 131,132 of drivers/scsi/aic7xxx/aic79xx_osm_pci.c
> ---
> drivers/scsi/aic7xxx/aic79xx_osm_pci.c | 25 +++++++++++++------------
> drivers/scsi/aic7xxx/aic7xxx_osm_pci.c | 25 +++++++++++++------------
> 2 files changed, 26 insertions(+), 24 deletions(-)
>
> > But "ideally" the functions would be defined before the
> > struct pci_driver data, so the prototypes for them could be removed.
>
> Hmm, I'm a bit sceptical about the reordering, but here you go.
> Choose whatever you like.
>
> diff --git a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
> index 66f0259..f6dbd3e 100644
> --- a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
> +++ b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
> @@ -50,8 +50,6 @@ static int ahd_linux_pci_reserve_io_regions(struct ahd_softc *ahd,
> static int ahd_linux_pci_reserve_mem_region(struct ahd_softc *ahd,
> u_long *bus_addr,
> uint8_t __iomem **maddr);
> -static int ahd_linux_pci_dev_suspend(struct pci_dev *pdev, pm_message_t mesg);
> -static int ahd_linux_pci_dev_resume(struct pci_dev *pdev);
> static void ahd_linux_pci_dev_remove(struct pci_dev *pdev);
>
> /* Define the macro locally since it's different for different class of chips.
> @@ -85,17 +83,7 @@ static struct pci_device_id ahd_linux_pci_id_table[] = {
>
> MODULE_DEVICE_TABLE(pci, ahd_linux_pci_id_table);
>
> -static struct pci_driver aic79xx_pci_driver = {
> - .name = "aic79xx",
> - .probe = ahd_linux_pci_dev_probe,
> #ifdef CONFIG_PM
> - .suspend = ahd_linux_pci_dev_suspend,
> - .resume = ahd_linux_pci_dev_resume,
> -#endif
> - .remove = ahd_linux_pci_dev_remove,
> - .id_table = ahd_linux_pci_id_table
> -};
> -
> static int
> ahd_linux_pci_dev_suspend(struct pci_dev *pdev, pm_message_t mesg)
> {
> @@ -139,6 +127,19 @@ ahd_linux_pci_dev_resume(struct pci_dev *pdev)
>
> return rc;
> }
> +#else
> +#define ahd_linux_pci_dev_suspend NULL
> +#define ahd_linux_pci_dev_resume NULL
> +#endif
> +
> +static struct pci_driver aic79xx_pci_driver = {
> + .name = "aic79xx",
> + .probe = ahd_linux_pci_dev_probe,
> + .suspend = ahd_linux_pci_dev_suspend,
> + .resume = ahd_linux_pci_dev_resume,
> + .remove = ahd_linux_pci_dev_remove,
> + .id_table = ahd_linux_pci_id_table
> +};
>
> static void
> ahd_linux_pci_dev_remove(struct pci_dev *pdev)
> diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
> index 4488946..ab53189 100644
> --- a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
> +++ b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
> @@ -49,8 +49,6 @@ static int ahc_linux_pci_reserve_io_region(struct ahc_softc *ahc,
> static int ahc_linux_pci_reserve_mem_region(struct ahc_softc *ahc,
> u_long *bus_addr,
> uint8_t __iomem **maddr);
> -static int ahc_linux_pci_dev_suspend(struct pci_dev *pdev, pm_message_t mesg);
> -static int ahc_linux_pci_dev_resume(struct pci_dev *pdev);
> static void ahc_linux_pci_dev_remove(struct pci_dev *pdev);
>
> /* Define the macro locally since it's different for different class of chips.
> @@ -132,17 +130,7 @@ static struct pci_device_id ahc_linux_pci_id_table[] = {
>
> MODULE_DEVICE_TABLE(pci, ahc_linux_pci_id_table);
>
> -static struct pci_driver aic7xxx_pci_driver = {
> - .name = "aic7xxx",
> - .probe = ahc_linux_pci_dev_probe,
> #ifdef CONFIG_PM
> - .suspend = ahc_linux_pci_dev_suspend,
> - .resume = ahc_linux_pci_dev_resume,
> -#endif
> - .remove = ahc_linux_pci_dev_remove,
> - .id_table = ahc_linux_pci_id_table
> -};
> -
> static int
> ahc_linux_pci_dev_suspend(struct pci_dev *pdev, pm_message_t mesg)
> {
> @@ -182,6 +170,19 @@ ahc_linux_pci_dev_resume(struct pci_dev *pdev)
>
> return (ahc_resume(ahc));
> }
> +#else
> +#define ahc_linux_pci_dev_suspend NULL
> +#define ahc_linux_pci_dev_resume NULL
> +#endif
> +
> +static struct pci_driver aic7xxx_pci_driver = {
> + .name = "aic7xxx",
> + .probe = ahc_linux_pci_dev_probe,
> + .suspend = ahc_linux_pci_dev_suspend,
> + .resume = ahc_linux_pci_dev_resume,
> + .remove = ahc_linux_pci_dev_remove,
> + .id_table = ahc_linux_pci_id_table
> +};
>
> static void
> ahc_linux_pci_dev_remove(struct pci_dev *pdev)
> --
---
~Randy
-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] [SCSI] aic7xxx: Fix warnings with CONFIG_PM=n
2007-11-09 16:17 ` Randy Dunlap
@ 2007-11-12 10:23 ` Frank Lichtenheld
0 siblings, 0 replies; 7+ messages in thread
From: Frank Lichtenheld @ 2007-11-12 10:23 UTC (permalink / raw)
To: Hannes Reinecke; +Cc: Randy Dunlap, linux-scsi, Frank Lichtenheld
Fixes the following warnings:
CC [M] drivers/scsi/aic7xxx/aic79xx_osm_pci.o
drivers/scsi/aic7xxx/aic79xx_osm_pci.c:101: warning: ‘ahd_linux_pci_dev_suspend’ defined but not used
drivers/scsi/aic7xxx/aic79xx_osm_pci.c:121: warning: ‘ahd_linux_pci_dev_resume’ defined but not used
CC [M] drivers/scsi/aic7xxx/aic7xxx_osm_pci.o
drivers/scsi/aic7xxx/aic7xxx_osm_pci.c:148: warning: ‘ahc_linux_pci_dev_suspend’ defined but not used
drivers/scsi/aic7xxx/aic7xxx_osm_pci.c:166: warning: ‘ahc_linux_pci_dev_resume’ defined but not used
Reorder code as suggested by Randy Dunlap to minimize
needed #ifdefs
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
---
drivers/scsi/aic7xxx/aic79xx_osm_pci.c | 25 +++++++++++++------------
drivers/scsi/aic7xxx/aic7xxx_osm_pci.c | 25 +++++++++++++------------
2 files changed, 26 insertions(+), 24 deletions(-)
> with one nit:
> Warning: trailing whitespace in line 174 of drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
> Warning: trailing whitespace in lines 131,132 of drivers/scsi/aic7xxx/aic79xx_osm_pci.c
fixed
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
index 66f0259..2b7c9a9 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
@@ -50,8 +50,6 @@ static int ahd_linux_pci_reserve_io_regions(struct ahd_softc *ahd,
static int ahd_linux_pci_reserve_mem_region(struct ahd_softc *ahd,
u_long *bus_addr,
uint8_t __iomem **maddr);
-static int ahd_linux_pci_dev_suspend(struct pci_dev *pdev, pm_message_t mesg);
-static int ahd_linux_pci_dev_resume(struct pci_dev *pdev);
static void ahd_linux_pci_dev_remove(struct pci_dev *pdev);
/* Define the macro locally since it's different for different class of chips.
@@ -85,17 +83,7 @@ static struct pci_device_id ahd_linux_pci_id_table[] = {
MODULE_DEVICE_TABLE(pci, ahd_linux_pci_id_table);
-static struct pci_driver aic79xx_pci_driver = {
- .name = "aic79xx",
- .probe = ahd_linux_pci_dev_probe,
#ifdef CONFIG_PM
- .suspend = ahd_linux_pci_dev_suspend,
- .resume = ahd_linux_pci_dev_resume,
-#endif
- .remove = ahd_linux_pci_dev_remove,
- .id_table = ahd_linux_pci_id_table
-};
-
static int
ahd_linux_pci_dev_suspend(struct pci_dev *pdev, pm_message_t mesg)
{
@@ -139,6 +127,19 @@ ahd_linux_pci_dev_resume(struct pci_dev *pdev)
return rc;
}
+#else
+#define ahd_linux_pci_dev_suspend NULL
+#define ahd_linux_pci_dev_resume NULL
+#endif
+
+static struct pci_driver aic79xx_pci_driver = {
+ .name = "aic79xx",
+ .probe = ahd_linux_pci_dev_probe,
+ .suspend = ahd_linux_pci_dev_suspend,
+ .resume = ahd_linux_pci_dev_resume,
+ .remove = ahd_linux_pci_dev_remove,
+ .id_table = ahd_linux_pci_id_table
+};
static void
ahd_linux_pci_dev_remove(struct pci_dev *pdev)
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
index 4488946..d10553e 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
@@ -49,8 +49,6 @@ static int ahc_linux_pci_reserve_io_region(struct ahc_softc *ahc,
static int ahc_linux_pci_reserve_mem_region(struct ahc_softc *ahc,
u_long *bus_addr,
uint8_t __iomem **maddr);
-static int ahc_linux_pci_dev_suspend(struct pci_dev *pdev, pm_message_t mesg);
-static int ahc_linux_pci_dev_resume(struct pci_dev *pdev);
static void ahc_linux_pci_dev_remove(struct pci_dev *pdev);
/* Define the macro locally since it's different for different class of chips.
@@ -132,17 +130,7 @@ static struct pci_device_id ahc_linux_pci_id_table[] = {
MODULE_DEVICE_TABLE(pci, ahc_linux_pci_id_table);
-static struct pci_driver aic7xxx_pci_driver = {
- .name = "aic7xxx",
- .probe = ahc_linux_pci_dev_probe,
#ifdef CONFIG_PM
- .suspend = ahc_linux_pci_dev_suspend,
- .resume = ahc_linux_pci_dev_resume,
-#endif
- .remove = ahc_linux_pci_dev_remove,
- .id_table = ahc_linux_pci_id_table
-};
-
static int
ahc_linux_pci_dev_suspend(struct pci_dev *pdev, pm_message_t mesg)
{
@@ -182,6 +170,19 @@ ahc_linux_pci_dev_resume(struct pci_dev *pdev)
return (ahc_resume(ahc));
}
+#else
+#define ahc_linux_pci_dev_suspend NULL
+#define ahc_linux_pci_dev_resume NULL
+#endif
+
+static struct pci_driver aic7xxx_pci_driver = {
+ .name = "aic7xxx",
+ .probe = ahc_linux_pci_dev_probe,
+ .suspend = ahc_linux_pci_dev_suspend,
+ .resume = ahc_linux_pci_dev_resume,
+ .remove = ahc_linux_pci_dev_remove,
+ .id_table = ahc_linux_pci_id_table
+};
static void
ahc_linux_pci_dev_remove(struct pci_dev *pdev)
--
1.5.3.4
-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2007-11-12 10:26 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-11-08 23:03 [PATCH] [SCSI] aic7xxx: Fix warnings with CONFIG_PM=n Frank Lichtenheld
2007-11-08 23:58 ` Randy Dunlap
2007-11-09 0:12 ` Frank Lichtenheld
2007-11-09 0:17 ` Randy Dunlap
2007-11-09 7:55 ` [PATCH alternative] " Frank Lichtenheld
2007-11-09 16:17 ` Randy Dunlap
2007-11-12 10:23 ` [PATCH] " Frank Lichtenheld
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox