redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

iio: magnetometer: ak8975: Convert to use device_get_match_data()

Browse source 
Convert to use device_get_match_data() instead of open coded variant.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Andy Shevchenko 2020-01-15 19:44:25 +02:00 committed by Jonathan Cameron
parent 6081847885
commit 71f221f8a0
1 changed files with 16 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
drivers/iio/magnetometer/ak8975.c
View file

@ -203,11 +203,11 @@ static long ak09912_raw_to_gauss(u16 data)
/* Compatible Asahi Kasei Compass parts */ /* Compatible Asahi Kasei Compass parts */
enum asahi_compass_chipset { enum asahi_compass_chipset {
AKXXXX = 0,
AK8975, AK8975,
AK8963, AK8963,
AK09911, AK09911,
AK09912, AK09912,
AK_MAX_TYPE
}; };
enum ak_ctrl_reg_addr { enum ak_ctrl_reg_addr {
@ -245,7 +245,7 @@ struct ak_def {
u8 data_regs[3]; u8 data_regs[3];
}; };
static const struct ak_def ak_def_array[AK_MAX_TYPE] = { static const struct ak_def ak_def_array[] = {
{ {
.type = AK8975, .type = AK8975,
.raw_to_gauss = ak8975_raw_to_gauss, .raw_to_gauss = ak8975_raw_to_gauss,
@ -781,19 +781,6 @@ static const struct acpi_device_id ak_acpi_match[] = {
MODULE_DEVICE_TABLE(acpi, ak_acpi_match); MODULE_DEVICE_TABLE(acpi, ak_acpi_match);
#endif #endif
static const char *ak8975_match_acpi_device(struct device *dev,
enum asahi_compass_chipset *chipset)
{
const struct acpi_device_id *id;
id = acpi_match_device(dev->driver->acpi_match_table, dev);
if (!id)
return NULL;
*chipset = (int)id->driver_data;
return dev_name(dev);
}
static void ak8975_fill_buffer(struct iio_dev *indio_dev) static void ak8975_fill_buffer(struct iio_dev *indio_dev)
{ {
struct ak8975_data *data = iio_priv(indio_dev); struct ak8975_data *data = iio_priv(indio_dev);
@ -852,9 +839,11 @@ static int ak8975_probe(struct i2c_client *client,
struct ak8975_data *data; struct ak8975_data *data;
struct iio_dev *indio_dev; struct iio_dev *indio_dev;
struct gpio_desc *eoc_gpiod; struct gpio_desc *eoc_gpiod;
const void *match;
unsigned int i;
int err; int err;
enum asahi_compass_chipset chipset;
const char *name = NULL; const char *name = NULL;
enum asahi_compass_chipset chipset = AK_MAX_TYPE;
/* /*
* Grab and set up the supplied GPIO. * Grab and set up the supplied GPIO.
@ -884,23 +873,27 @@ static int ak8975_probe(struct i2c_client *client,
return err; return err;
/* id will be NULL when enumerated via ACPI */ /* id will be NULL when enumerated via ACPI */
if (id) { match = device_get_match_data(&client->dev);
if (match) {
chipset = (enum asahi_compass_chipset)(match);
name = dev_name(&client->dev);
} else if (id) {
chipset = (enum asahi_compass_chipset)(id->driver_data); chipset = (enum asahi_compass_chipset)(id->driver_data);
name = id->name; name = id->name;
} else if (ACPI_HANDLE(&client->dev)) {
name = ak8975_match_acpi_device(&client->dev, &chipset);
if (!name)
return -ENODEV;
} else } else
return -ENOSYS; return -ENOSYS;
if (chipset >= AK_MAX_TYPE) { for (i = 0; i < ARRAY_SIZE(ak_def_array); i++)
if (ak_def_array[i].type == chipset)
break;
if (i == ARRAY_SIZE(ak_def_array)) {
dev_err(&client->dev, "AKM device type unsupported: %d\n", dev_err(&client->dev, "AKM device type unsupported: %d\n",
chipset); chipset);
return -ENODEV; return -ENODEV;
} }
data->def = &ak_def_array[chipset]; data->def = &ak_def_array[i];
/* Fetch the regulators */ /* Fetch the regulators */
data->vdd = devm_regulator_get(&client->dev, "vdd"); data->vdd = devm_regulator_get(&client->dev, "vdd");