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 <jeremy.lefaure@lse.epita.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c
index 20b409789de2294767e138a738ae4c1088cd6cc9..626d2f114d8da219e7b2b4a43f26509898c21aca 100644 (file)
--- 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;