summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2022-08-01 14:42:09 +0300
committerLee Jones <lee@kernel.org>2022-09-28 16:09:49 +0100
commit0c602c7f6d79b2904f0a74243f55addf4db4bd2a (patch)
treee35b5ba75e833ee2658ba81ae6a64614a9450596
parent09c4e702bc9dbd3e8a1d93144571c31f977eb866 (diff)
mfd: intel_soc_pmic_crc: Convert driver to use ->probe_new()
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> Signed-off-by: Lee Jones <lee@kernel.org> Link: https://lore.kernel.org/r/20220801114211.36267-8-andriy.shevchenko@linux.intel.com
-rw-r--r--drivers/mfd/intel_soc_pmic_crc.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/mfd/intel_soc_pmic_crc.c b/drivers/mfd/intel_soc_pmic_crc.c
index 17fcb10930f6..d4780390fbea 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;
@@ -254,11 +253,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" },
{ },
@@ -271,9 +265,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,
};