Commit 039da225 authored by Hans de Goede's avatar Hans de Goede Committed by Lee Jones

mfd: arizona: Replace arizona_of_get_type() with device_get_match_data()

Replace the custom arizona_of_get_type() function with the generic
device_get_match_data() helper. Besides being a nice cleanup this
also makes it easier to add support for binding to ACPI enumerated
devices.

While at it also fix a possible NULL pointer deref of the id
argument to the probe functions (this could happen on e.g. manual
driver binding through sysfs).
Suggested-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 06e577b4
...@@ -797,17 +797,6 @@ const struct dev_pm_ops arizona_pm_ops = { ...@@ -797,17 +797,6 @@ const struct dev_pm_ops arizona_pm_ops = {
EXPORT_SYMBOL_GPL(arizona_pm_ops); EXPORT_SYMBOL_GPL(arizona_pm_ops);
#ifdef CONFIG_OF #ifdef CONFIG_OF
unsigned long arizona_of_get_type(struct device *dev)
{
const struct of_device_id *id = of_match_device(arizona_of_match, dev);
if (id)
return (unsigned long)id->data;
else
return 0;
}
EXPORT_SYMBOL_GPL(arizona_of_get_type);
static int arizona_of_get_core_pdata(struct arizona *arizona) static int arizona_of_get_core_pdata(struct arizona *arizona)
{ {
struct arizona_pdata *pdata = &arizona->pdata; struct arizona_pdata *pdata = &arizona->pdata;
......
...@@ -23,14 +23,16 @@ ...@@ -23,14 +23,16 @@
static int arizona_i2c_probe(struct i2c_client *i2c, static int arizona_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
const void *match_data;
struct arizona *arizona; struct arizona *arizona;
const struct regmap_config *regmap_config = NULL; const struct regmap_config *regmap_config = NULL;
unsigned long type; unsigned long type = 0;
int ret; int ret;
if (i2c->dev.of_node) match_data = device_get_match_data(&i2c->dev);
type = arizona_of_get_type(&i2c->dev); if (match_data)
else type = (unsigned long)match_data;
else if (id)
type = id->driver_data; type = id->driver_data;
switch (type) { switch (type) {
......
...@@ -23,14 +23,16 @@ ...@@ -23,14 +23,16 @@
static int arizona_spi_probe(struct spi_device *spi) static int arizona_spi_probe(struct spi_device *spi)
{ {
const struct spi_device_id *id = spi_get_device_id(spi); const struct spi_device_id *id = spi_get_device_id(spi);
const void *match_data;
struct arizona *arizona; struct arizona *arizona;
const struct regmap_config *regmap_config = NULL; const struct regmap_config *regmap_config = NULL;
unsigned long type; unsigned long type = 0;
int ret; int ret;
if (spi->dev.of_node) match_data = device_get_match_data(&spi->dev);
type = arizona_of_get_type(&spi->dev); if (match_data)
else type = (unsigned long)match_data;
else if (id)
type = id->driver_data; type = id->driver_data;
switch (type) { switch (type) {
......
...@@ -50,13 +50,4 @@ int arizona_dev_exit(struct arizona *arizona); ...@@ -50,13 +50,4 @@ int arizona_dev_exit(struct arizona *arizona);
int arizona_irq_init(struct arizona *arizona); int arizona_irq_init(struct arizona *arizona);
int arizona_irq_exit(struct arizona *arizona); int arizona_irq_exit(struct arizona *arizona);
#ifdef CONFIG_OF
unsigned long arizona_of_get_type(struct device *dev);
#else
static inline unsigned long arizona_of_get_type(struct device *dev)
{
return 0;
}
#endif
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment