renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-29 07:34:06 +08:00
Code

staging: media: atomisp: fix build errors when PM is disabled

Browse Source 
The function atomisp_restore_iumit_reg is unused when PM is disabled.
Adding __maybe_unused to the function definition avoids a warning.

The function atomisp_mrfld_power_down is defined only when PM is
enabled. So in atomisp_pci_probe, it should be called only when PM is
enabled.

Signed-off-by: Jérémy Lefaure <jeremy.lefaure@lse.epita.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jérémy Lefaure 2017-03-20 22:48:26 -04:00 committed by Greg Kroah-Hartman
parent 435ec8afa5
commit 447a7f934e
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/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c
View File

@ -264,7 +264,7 @@ static int atomisp_save_iunit_reg(struct atomisp_device *isp)
return 0; return 0;
} }
static int atomisp_restore_iunit_reg(struct atomisp_device *isp) static int __maybe_unused atomisp_restore_iunit_reg(struct atomisp_device *isp)
{ {
struct pci_dev *dev = isp->pdev; struct pci_dev *dev = isp->pdev;
@ -1526,7 +1526,7 @@ load_fw_fail:
atomisp_ospm_dphy_down(isp); atomisp_ospm_dphy_down(isp);
/* Address later when we worry about the ...field chips */ /* Address later when we worry about the ...field chips */
if (atomisp_mrfld_power_down(isp)) if (IS_ENABLED(CONFIG_PM) && atomisp_mrfld_power_down(isp))
dev_err(&dev->dev, "Failed to switch off ISP\n"); dev_err(&dev->dev, "Failed to switch off ISP\n");
pci_dev_put(isp->pci_root); pci_dev_put(isp->pci_root);
return err; return err;