lkml.org 
[lkml]   [2022]   [Jun]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v1 6/9] mfd: intel_soc_pmic_crc: Drop redundant ACPI_PTR() and ifdeffery
    Date
    The driver depends on ACPI, ACPI_PTR() resolution is always the same.
    Otherwise a compiler may produce a warning.

    That said, the rule of thumb either ugly ifdeffery with ACPI_PTR or
    none should be used in a driver.

    Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    ---
    drivers/mfd/Kconfig | 4 ++--
    drivers/mfd/intel_soc_pmic_crc.c | 6 ++----
    2 files changed, 4 insertions(+), 6 deletions(-)

    diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
    index 3b59456f5545..2bbfeeac6f8e 100644
    --- a/drivers/mfd/Kconfig
    +++ b/drivers/mfd/Kconfig
    @@ -588,8 +588,8 @@ config LPC_SCH

    config INTEL_SOC_PMIC
    bool "Support for Crystal Cove PMIC"
    - depends on ACPI && HAS_IOMEM && I2C=y && GPIOLIB && COMMON_CLK
    - depends on X86 || COMPILE_TEST
    + depends on HAS_IOMEM && I2C=y && GPIOLIB && COMMON_CLK
    + depends on (X86 && ACPI) || COMPILE_TEST
    depends on I2C_DESIGNWARE_PLATFORM=y
    select MFD_CORE
    select REGMAP_I2C
    diff --git a/drivers/mfd/intel_soc_pmic_crc.c b/drivers/mfd/intel_soc_pmic_crc.c
    index c034e226a0bb..f1e5fdd846b3 100644
    --- a/drivers/mfd/intel_soc_pmic_crc.c
    +++ b/drivers/mfd/intel_soc_pmic_crc.c
    @@ -8,9 +8,9 @@
    * Author: Zhu, Lejun <lejun.zhu@linux.intel.com>
    */

    -#include <linux/acpi.h>
    #include <linux/i2c.h>
    #include <linux/interrupt.h>
    +#include <linux/mod_devicetable.h>
    #include <linux/module.h>
    #include <linux/mfd/core.h>
    #include <linux/mfd/intel_soc_pmic.h>
    @@ -254,19 +254,17 @@ static const struct i2c_device_id intel_soc_pmic_i2c_id[] = {
    };
    MODULE_DEVICE_TABLE(i2c, intel_soc_pmic_i2c_id);

    -#if defined(CONFIG_ACPI)
    static const struct acpi_device_id intel_soc_pmic_acpi_match[] = {
    { "INT33FD" },
    { },
    };
    MODULE_DEVICE_TABLE(acpi, intel_soc_pmic_acpi_match);
    -#endif

    static struct i2c_driver intel_soc_pmic_i2c_driver = {
    .driver = {
    .name = "intel_soc_pmic_i2c",
    .pm = pm_sleep_ptr(&crystal_cove_pm_ops),
    - .acpi_match_table = ACPI_PTR(intel_soc_pmic_acpi_match),
    + .acpi_match_table = intel_soc_pmic_acpi_match,
    },
    .probe = intel_soc_pmic_i2c_probe,
    .remove = intel_soc_pmic_i2c_remove,
    --
    2.35.1
    \
     
     \ /
      Last update: 2022-06-16 20:28    [W:4.172 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site