lkml.org 
[lkml]   [2022]   [Jul]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RESEND][PATCH v1 5/9] mfd: intel_soc_pmic_crc: Convert driver to use ->probe_new()
    Date
    Use the ->probe_new() callback.

    The driver does not use const struct i2c_device_id * argument,
    so convert it to utilise the simplified I²C driver registration.

    Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    Tested-by: Hans de Goede <hdegoede@redhat.com>
    Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org>
    ---
    drivers/mfd/intel_soc_pmic_crc.c | 11 ++---------
    1 file changed, 2 insertions(+), 9 deletions(-)

    diff --git a/drivers/mfd/intel_soc_pmic_crc.c b/drivers/mfd/intel_soc_pmic_crc.c
    index f1e5fdd846b3..edadc07d473e 100644
    --- a/drivers/mfd/intel_soc_pmic_crc.c
    +++ b/drivers/mfd/intel_soc_pmic_crc.c
    @@ -164,8 +164,7 @@ static const struct intel_soc_pmic_config intel_soc_pmic_config_cht_crc = {
    .irq_chip = &crystal_cove_irq_chip,
    };

    -static int intel_soc_pmic_i2c_probe(struct i2c_client *i2c,
    - const struct i2c_device_id *i2c_id)
    +static int intel_soc_pmic_i2c_probe(struct i2c_client *i2c)
    {
    const struct intel_soc_pmic_config *config;
    struct device *dev = &i2c->dev;
    @@ -249,11 +248,6 @@ static int intel_soc_pmic_resume(struct device *dev)

    static DEFINE_SIMPLE_DEV_PM_OPS(crystal_cove_pm_ops, intel_soc_pmic_suspend, intel_soc_pmic_resume);

    -static const struct i2c_device_id intel_soc_pmic_i2c_id[] = {
    - { }
    -};
    -MODULE_DEVICE_TABLE(i2c, intel_soc_pmic_i2c_id);
    -
    static const struct acpi_device_id intel_soc_pmic_acpi_match[] = {
    { "INT33FD" },
    { },
    @@ -266,9 +260,8 @@ static struct i2c_driver intel_soc_pmic_i2c_driver = {
    .pm = pm_sleep_ptr(&crystal_cove_pm_ops),
    .acpi_match_table = intel_soc_pmic_acpi_match,
    },
    - .probe = intel_soc_pmic_i2c_probe,
    + .probe_new = intel_soc_pmic_i2c_probe,
    .remove = intel_soc_pmic_i2c_remove,
    - .id_table = intel_soc_pmic_i2c_id,
    .shutdown = intel_soc_pmic_shutdown,
    };

    --
    2.35.1
    \
     
     \ /
      Last update: 2022-07-18 14:24    [W:4.234 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site