From: Jérémy Lefaure Date: Tue, 21 Mar 2017 02:48:26 +0000 (-0400) Subject: staging: media: atomisp: fix build errors when PM is disabled X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=447a7f934e82284bc0cd3270f6491412fcab3f6d;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git staging: media: atomisp: fix build errors when PM is disabled 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c index 20b409789de2..626d2f114d8d 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c @@ -264,7 +264,7 @@ static int atomisp_save_iunit_reg(struct atomisp_device *isp) 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; @@ -1526,7 +1526,7 @@ load_fw_fail: atomisp_ospm_dphy_down(isp); /* 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"); pci_dev_put(isp->pci_root); return err;