evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scsi: mvumi: use __maybe_unused to hide pm functions

Browse source 
commit fddbeb80a904aae41c84ed566e2b0d1de55907df upstream.

The mvumi scsi hides the references to its suspend/resume functions in
an #ifdef but does not hide the implementation the same way:

drivers/scsi/mvumi.c:2632:12: error: 'mvumi_suspend' defined but not used [-Werror=unused-function]
drivers/scsi/mvumi.c:2651:12: error: 'mvumi_resume' defined but not used [-Werror=unused-function]

This adds __maybe_unused annotations so the compiler knows it can
silently drop them instead of warning, while avoiding the addition of
another #ifdef.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Arnd Bergmann 2016-03-02 16:59:00 +01:00 • committed by Greg Kroah-Hartman
parent f83c36bd7b
commit fcb86b38ac
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/scsi/mvumi.c
View file

@ -2629,7 +2629,7 @@ static void mvumi_shutdown(struct pci_dev *pdev)
mvumi_flush_cache(mhba); mvumi_flush_cache(mhba);
} }
static int mvumi_suspend(struct pci_dev *pdev, pm_message_t state) static int __maybe_unused mvumi_suspend(struct pci_dev *pdev, pm_message_t state)
{ {
struct mvumi_hba *mhba = NULL; struct mvumi_hba *mhba = NULL;
@ -2648,7 +2648,7 @@ static int mvumi_suspend(struct pci_dev *pdev, pm_message_t state)
return 0; return 0;
} }
static int mvumi_resume(struct pci_dev *pdev) static int __maybe_unused mvumi_resume(struct pci_dev *pdev)
{ {
int ret; int ret;
struct mvumi_hba *mhba = NULL; struct mvumi_hba *mhba = NULL;