OSDN Git Service

usb: dwc3: pci: avoid build warning
authorFelipe Balbi <felipe.balbi@linux.intel.com>
Wed, 16 Nov 2016 11:16:22 +0000 (13:16 +0200)
committerFelipe Balbi <felipe.balbi@linux.intel.com>
Fri, 18 Nov 2016 11:54:52 +0000 (13:54 +0200)
dwc3_pci_dsm() is only needed if (PM || PM_SLEEP),
we should make sure it's not defined if neither of
those is defined.

This fixes a randconfig build warning.

Acked-by: Arnd Bergmann <arnd@arndb.de>
Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
drivers/usb/dwc3/dwc3-pci.c

index 8c39ec6..2b0e34d 100644 (file)
@@ -166,30 +166,6 @@ static int dwc3_pci_quirks(struct dwc3_pci *dwc)
        return 0;
 }
 
-static int dwc3_pci_dsm(struct dwc3_pci *dwc, int param)
-{
-       union acpi_object *obj;
-       union acpi_object tmp;
-       union acpi_object argv4 = ACPI_INIT_DSM_ARGV4(1, &tmp);
-
-       if (!dwc->has_dsm_for_pm)
-               return 0;
-
-       tmp.type = ACPI_TYPE_INTEGER;
-       tmp.integer.value = param;
-
-       obj = acpi_evaluate_dsm(ACPI_HANDLE(&dwc->pci->dev), dwc->uuid,
-                       1, PCI_INTEL_BXT_FUNC_PMU_PWR, &argv4);
-       if (!obj) {
-               dev_err(&dwc->pci->dev, "failed to evaluate _DSM\n");
-               return -EIO;
-       }
-
-       ACPI_FREE(obj);
-
-       return 0;
-}
-
 static int dwc3_pci_probe(struct pci_dev *pci,
                const struct pci_device_id *id)
 {
@@ -293,6 +269,32 @@ static const struct pci_device_id dwc3_pci_id_table[] = {
 };
 MODULE_DEVICE_TABLE(pci, dwc3_pci_id_table);
 
+#if defined(CONFIG_PM) || defined(CONFIG_PM_SLEEP)
+static int dwc3_pci_dsm(struct dwc3_pci *dwc, int param)
+{
+       union acpi_object *obj;
+       union acpi_object tmp;
+       union acpi_object argv4 = ACPI_INIT_DSM_ARGV4(1, &tmp);
+
+       if (!dwc->has_dsm_for_pm)
+               return 0;
+
+       tmp.type = ACPI_TYPE_INTEGER;
+       tmp.integer.value = param;
+
+       obj = acpi_evaluate_dsm(ACPI_HANDLE(&dwc->pci->dev), dwc->uuid,
+                       1, PCI_INTEL_BXT_FUNC_PMU_PWR, &argv4);
+       if (!obj) {
+               dev_err(&dwc->pci->dev, "failed to evaluate _DSM\n");
+               return -EIO;
+       }
+
+       ACPI_FREE(obj);
+
+       return 0;
+}
+#endif /* CONFIG_PM || CONFIG_PM_SLEEP */
+
 #ifdef CONFIG_PM
 static int dwc3_pci_runtime_suspend(struct device *dev)
 {