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@xxxxxxxxxxxxxx>
> ---
> 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@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
