On Tue, 26 Mar 2013 00:01:38 -0700 Jingoo Han <jg1.han@xxxxxxxxxxx> wrote:
> Add CONFIG_PM_SLEEP to suspend/resume functions to fix the following
> build warning when CONFIG_PM_SLEEP is not selected. This is because
> sleep PM callbacks defined by SIMPLE_DEV_PM_OPS are only used when
> the CONFIG_PM_SLEEP is enabled.
>
> drivers/scsi/isci/init.c:725:12: warning: 'isci_suspend' defined but not used [-
> Wunused-function]
> drivers/scsi/isci/init.c:743:12: warning: 'isci_resume' defined but not used [-
> Wunused-function]
>
> Signed-off-by: Jingoo Han <jg1.han@xxxxxxxxxxx>
Acked-by: Lukasz Dorau <lukasz.dorau@xxxxxxxxx>
> ---
> drivers/scsi/isci/init.c | 6 ++----
> 1 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c
> index 2839baa..d25d0d8 100644
> --- a/drivers/scsi/isci/init.c
> +++ b/drivers/scsi/isci/init.c
> @@ -721,7 +721,7 @@ static void isci_pci_remove(struct pci_dev *pdev)
> }
> }
>
> -#ifdef CONFIG_PM
> +#ifdef CONFIG_PM_SLEEP
> static int isci_suspend(struct device *dev)
> {
> struct pci_dev *pdev = to_pci_dev(dev);
> @@ -770,18 +770,16 @@ static int isci_resume(struct device *dev)
>
> return 0;
> }
> +#endif
>
> static SIMPLE_DEV_PM_OPS(isci_pm_ops, isci_suspend, isci_resume);
> -#endif
>
> static struct pci_driver isci_pci_driver = {
> .name = DRV_NAME,
> .id_table = isci_id_table,
> .probe = isci_pci_probe,
> .remove = isci_pci_remove,
> -#ifdef CONFIG_PM
> .driver.pm = &isci_pm_ops,
> -#endif
> };
>
> static __init int isci_init(void)
> --
> 1.7.2.5
--
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
