Skip to content

Commit

Permalink
mfd: intel_soc_pmic_crc: Convert driver to use ->probe_new()
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Andy Shevchenko authored and Lee Jones committed Aug 15, 2022
1 parent a5ce966 commit 5fccf5b
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions drivers/mfd/intel_soc_pmic_crc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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" },
{ },
Expand All @@ -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,
};

Expand Down

0 comments on commit 5fccf5b

Please sign in to comment.