usb: dwc3: dwc3-qcom: Do not define 'struct acpi_device_id' when !CONFIG_ACPI
Since ACPI_PTR() is used to NULLify the value when !CONFIG_ACPI, struct dwc3_qcom_acpi_match becomes defined by unused. Also need to place the platform data obtained via the matching process inside the #ifdef, else that becomes unused too. Fixes the following W=1 kernel build warning(s): drivers/usb/dwc3/dwc3-qcom.c:761:36: warning: ‘dwc3_qcom_acpi_match’ defined but not used [-Wunused-const-variable=] 761 | static const struct acpi_device_id dwc3_qcom_acpi_match[] = { | ^~~~~~~~~~~~~~~~~~~~ Cc: Andy Gross <agross@kernel.org> Cc: Bjorn Andersson <bjorn.andersson@linaro.org> Cc: Felipe Balbi <balbi@kernel.org> Cc: Philipp Zabel <p.zabel@pengutronix.de> Cc: linux-arm-msm@vger.kernel.org Signed-off-by: Lee Jones <lee.jones@linaro.org> Link: https://lore.kernel.org/r/20200706133341.476881-30-lee.jones@linaro.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
6dba06ceee
Коммит
b789710de5
|
@ -540,16 +540,6 @@ static int dwc3_qcom_of_register_core(struct platform_device *pdev)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct dwc3_acpi_pdata sdm845_acpi_pdata = {
|
|
||||||
.qscratch_base_offset = SDM845_QSCRATCH_BASE_OFFSET,
|
|
||||||
.qscratch_base_size = SDM845_QSCRATCH_SIZE,
|
|
||||||
.dwc3_core_base_size = SDM845_DWC3_CORE_SIZE,
|
|
||||||
.hs_phy_irq_index = 1,
|
|
||||||
.dp_hs_phy_irq_index = 4,
|
|
||||||
.dm_hs_phy_irq_index = 3,
|
|
||||||
.ss_phy_irq_index = 2
|
|
||||||
};
|
|
||||||
|
|
||||||
static int dwc3_qcom_probe(struct platform_device *pdev)
|
static int dwc3_qcom_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct device_node *np = pdev->dev.of_node;
|
struct device_node *np = pdev->dev.of_node;
|
||||||
|
@ -758,11 +748,23 @@ static const struct of_device_id dwc3_qcom_of_match[] = {
|
||||||
};
|
};
|
||||||
MODULE_DEVICE_TABLE(of, dwc3_qcom_of_match);
|
MODULE_DEVICE_TABLE(of, dwc3_qcom_of_match);
|
||||||
|
|
||||||
|
#ifdef CONFIG_ACPI
|
||||||
|
static const struct dwc3_acpi_pdata sdm845_acpi_pdata = {
|
||||||
|
.qscratch_base_offset = SDM845_QSCRATCH_BASE_OFFSET,
|
||||||
|
.qscratch_base_size = SDM845_QSCRATCH_SIZE,
|
||||||
|
.dwc3_core_base_size = SDM845_DWC3_CORE_SIZE,
|
||||||
|
.hs_phy_irq_index = 1,
|
||||||
|
.dp_hs_phy_irq_index = 4,
|
||||||
|
.dm_hs_phy_irq_index = 3,
|
||||||
|
.ss_phy_irq_index = 2
|
||||||
|
};
|
||||||
|
|
||||||
static const struct acpi_device_id dwc3_qcom_acpi_match[] = {
|
static const struct acpi_device_id dwc3_qcom_acpi_match[] = {
|
||||||
{ "QCOM2430", (unsigned long)&sdm845_acpi_pdata },
|
{ "QCOM2430", (unsigned long)&sdm845_acpi_pdata },
|
||||||
{ },
|
{ },
|
||||||
};
|
};
|
||||||
MODULE_DEVICE_TABLE(acpi, dwc3_qcom_acpi_match);
|
MODULE_DEVICE_TABLE(acpi, dwc3_qcom_acpi_match);
|
||||||
|
#endif
|
||||||
|
|
||||||
static struct platform_driver dwc3_qcom_driver = {
|
static struct platform_driver dwc3_qcom_driver = {
|
||||||
.probe = dwc3_qcom_probe,
|
.probe = dwc3_qcom_probe,
|
||||||
|
|
Загрузка…
Ссылка в новой задаче