UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

iio: magnetometer: yamaha-yas530: Use pointers as driver data 

Unify ID tables to use pointers for driver data. It will allow
to simplify the driver later on.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20220831141530.80572-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Andy Shevchenko 2022-08-31 17:15:28 +03:00 committed by Jonathan Cameron
parent 3f8dd0a7dc
commit 741d1e3783
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/iio/magnetometer/yamaha-yas530.c
View File

@ -32,6 +32,7 @@
#include <linux/mod_devicetable.h> #include <linux/mod_devicetable.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/property.h>
#include <linux/regmap.h> #include <linux/regmap.h>
#include <linux/regulator/consumer.h> #include <linux/regulator/consumer.h>
#include <linux/random.h> #include <linux/random.h>
@ -1437,8 +1438,10 @@ static int yas5xx_probe(struct i2c_client *i2c,
goto assert_reset; goto assert_reset;
} }
yas5xx->chip_info = &yas5xx_chip_info_tbl[id->driver_data]; ci = device_get_match_data(dev);
ci = yas5xx->chip_info; if (!ci)
ci = (const struct yas5xx_chip_info *)id->driver_data;
yas5xx->chip_info = ci;
ret = regmap_read(yas5xx->map, YAS5XX_DEVICE_ID, &id_check); ret = regmap_read(yas5xx->map, YAS5XX_DEVICE_ID, &id_check);
if (ret) if (ret)
@ -1585,19 +1588,19 @@ static DEFINE_RUNTIME_DEV_PM_OPS(yas5xx_dev_pm_ops, yas5xx_runtime_suspend,
yas5xx_runtime_resume, NULL); yas5xx_runtime_resume, NULL);
static const struct i2c_device_id yas5xx_id[] = { static const struct i2c_device_id yas5xx_id[] = {
{"yas530", yas530 }, {"yas530", (kernel_ulong_t)&yas5xx_chip_info_tbl[yas530] },
{"yas532", yas532 }, {"yas532", (kernel_ulong_t)&yas5xx_chip_info_tbl[yas532] },
{"yas533", yas533 }, {"yas533", (kernel_ulong_t)&yas5xx_chip_info_tbl[yas533] },
{"yas537", yas537 }, {"yas537", (kernel_ulong_t)&yas5xx_chip_info_tbl[yas537] },
{} {}
}; };
MODULE_DEVICE_TABLE(i2c, yas5xx_id); MODULE_DEVICE_TABLE(i2c, yas5xx_id);
static const struct of_device_id yas5xx_of_match[] = { static const struct of_device_id yas5xx_of_match[] = {
{ .compatible = "yamaha,yas530", }, { .compatible = "yamaha,yas530", &yas5xx_chip_info_tbl[yas530] },
{ .compatible = "yamaha,yas532", }, { .compatible = "yamaha,yas532", &yas5xx_chip_info_tbl[yas532] },
{ .compatible = "yamaha,yas533", }, { .compatible = "yamaha,yas533", &yas5xx_chip_info_tbl[yas533] },
{ .compatible = "yamaha,yas537", }, { .compatible = "yamaha,yas537", &yas5xx_chip_info_tbl[yas537] },
{} {}
}; };
MODULE_DEVICE_TABLE(of, yas5xx_of_match); MODULE_DEVICE_TABLE(of, yas5xx_of_match);