iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spi: hisi-sfc-v3xx: drop unnecessary ACPI_PTR and related ifendif protection

Browse Source 
We use ACPI_PTR() and related ifendif protection for the id table.
This is unnecessary as the struct acpi_device_id is defined in
mod_devicetable.h and doesn't rely on ACPI. The driver doesn't
use any ACPI apis, so it can be compiled in the ACPI=n case
with no warnings.

So remove the ACPI_PTR and related ifendif protection, also
replace the header acpi.h with mod_devicetable.h.

Acked-by: John Garry <john.garry@huawei.com>
Signed-off-by: Yicong Yang <yangyicong@hisilicon.com>
Link: https://lore.kernel.org/r/1618228708-37949-3-git-send-email-yangyicong@hisilicon.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Yicong Yang
2021-04-12 19:58:28 +08:00
committed by Mark Brown
parent 4c84e42d29
commit 4a46f88681
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/spi/spi-hisi-sfc-v3xx.c
View File

@@ -5,13 +5,13 @@
// Copyright (c) 2019 HiSilicon Technologies Co., Ltd. // Copyright (c) 2019 HiSilicon Technologies Co., Ltd.
// Author: John Garry <john.garry@huawei.com> // Author: John Garry <john.garry@huawei.com>
#include <linux/acpi.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/completion.h> #include <linux/completion.h>
#include <linux/dmi.h> #include <linux/dmi.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/iopoll.h> #include <linux/iopoll.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/mod_devicetable.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
@@ -508,18 +508,16 @@ err_put_master:
return ret; return ret;
} }
#if IS_ENABLED(CONFIG_ACPI)
static const struct acpi_device_id hisi_sfc_v3xx_acpi_ids[] = { static const struct acpi_device_id hisi_sfc_v3xx_acpi_ids[] = {
{"HISI0341", 0}, {"HISI0341", 0},
{} {}
}; };
MODULE_DEVICE_TABLE(acpi, hisi_sfc_v3xx_acpi_ids); MODULE_DEVICE_TABLE(acpi, hisi_sfc_v3xx_acpi_ids);
#endif
static struct platform_driver hisi_sfc_v3xx_spi_driver = { static struct platform_driver hisi_sfc_v3xx_spi_driver = {
.driver = { .driver = {
.name = "hisi-sfc-v3xx", .name = "hisi-sfc-v3xx",
.acpi_match_table = ACPI_PTR(hisi_sfc_v3xx_acpi_ids), .acpi_match_table = hisi_sfc_v3xx_acpi_ids,
}, },
.probe = hisi_sfc_v3xx_probe, .probe = hisi_sfc_v3xx_probe,
}; };