mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtc: isl12022: Get rid of unneeded private struct isl12022

Browse source 
First of all, the struct rtc_device pointer is kept in the managed
resources, no need to keep it outside (no users in the driver).

Second, replace private struct isl12022 with a regmap.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Link: https://lore.kernel.org/r/20230110140806.87432-2-andriy.shevchenko@linux.intel.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
This commit is contained in:
Andy Shevchenko 2023-01-10 16:08:02 +02:00 committed by Alexandre Belloni
parent fd9a6a1394
commit f525b210e9
1 changed files with 21 additions and 35 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

56
drivers/rtc/rtc-isl12022.c
View file

@ -46,11 +46,6 @@
static struct i2c_driver isl12022_driver; static struct i2c_driver isl12022_driver;
struct isl12022 {
struct rtc_device *rtc;
struct regmap *regmap;
};
static umode_t isl12022_hwmon_is_visible(const void *data, static umode_t isl12022_hwmon_is_visible(const void *data,
enum hwmon_sensor_types type, enum hwmon_sensor_types type,
u32 attr, int channel) u32 attr, int channel)
@ -67,8 +62,7 @@ static umode_t isl12022_hwmon_is_visible(const void *data,
*/ */
static int isl12022_hwmon_read_temp(struct device *dev, long *mC) static int isl12022_hwmon_read_temp(struct device *dev, long *mC)
{ {
struct isl12022 *isl12022 = dev_get_drvdata(dev); struct regmap *regmap = dev_get_drvdata(dev);
struct regmap *regmap = isl12022->regmap;
u8 temp_buf[2]; u8 temp_buf[2];
int temp, ret; int temp, ret;
@ -115,23 +109,21 @@ static const struct hwmon_chip_info isl12022_hwmon_chip_info = {
static void isl12022_hwmon_register(struct device *dev) static void isl12022_hwmon_register(struct device *dev)
{ {
struct isl12022 *isl12022; struct regmap *regmap = dev_get_drvdata(dev);
struct device *hwmon; struct device *hwmon;
int ret; int ret;
if (!IS_REACHABLE(CONFIG_HWMON)) if (!IS_REACHABLE(CONFIG_HWMON))
return; return;
isl12022 = dev_get_drvdata(dev); ret = regmap_update_bits(regmap, ISL12022_REG_BETA,
ret = regmap_update_bits(isl12022->regmap, ISL12022_REG_BETA,
ISL12022_BETA_TSE, ISL12022_BETA_TSE); ISL12022_BETA_TSE, ISL12022_BETA_TSE);
if (ret) { if (ret) {
dev_warn(dev, "unable to enable temperature sensor\n"); dev_warn(dev, "unable to enable temperature sensor\n");
return; return;
} }
hwmon = devm_hwmon_device_register_with_info(dev, "isl12022", isl12022, hwmon = devm_hwmon_device_register_with_info(dev, "isl12022", regmap,
&isl12022_hwmon_chip_info, &isl12022_hwmon_chip_info,
NULL); NULL);
if (IS_ERR(hwmon)) if (IS_ERR(hwmon))
@ -144,8 +136,7 @@ static void isl12022_hwmon_register(struct device *dev)
*/ */
static int isl12022_rtc_read_time(struct device *dev, struct rtc_time *tm) static int isl12022_rtc_read_time(struct device *dev, struct rtc_time *tm)
{ {
struct isl12022 *isl12022 = dev_get_drvdata(dev); struct regmap *regmap = dev_get_drvdata(dev);
struct regmap *regmap = isl12022->regmap;
uint8_t buf[ISL12022_REG_INT + 1]; uint8_t buf[ISL12022_REG_INT + 1];
int ret; int ret;
@ -190,8 +181,7 @@ static int isl12022_rtc_read_time(struct device *dev, struct rtc_time *tm)
static int isl12022_rtc_set_time(struct device *dev, struct rtc_time *tm) static int isl12022_rtc_set_time(struct device *dev, struct rtc_time *tm)
{ {
struct isl12022 *isl12022 = dev_get_drvdata(dev); struct regmap *regmap = dev_get_drvdata(dev);
struct regmap *regmap = isl12022->regmap;
int ret; int ret;
uint8_t buf[ISL12022_REG_DW + 1]; uint8_t buf[ISL12022_REG_DW + 1];
@ -218,8 +208,7 @@ static int isl12022_rtc_set_time(struct device *dev, struct rtc_time *tm)
buf[ISL12022_REG_DW] = tm->tm_wday & 0x07; buf[ISL12022_REG_DW] = tm->tm_wday & 0x07;
return regmap_bulk_write(isl12022->regmap, ISL12022_REG_SC, return regmap_bulk_write(regmap, ISL12022_REG_SC, buf, sizeof(buf));
buf, sizeof(buf));
} }
static const struct rtc_class_ops isl12022_rtc_ops = { static const struct rtc_class_ops isl12022_rtc_ops = {
@ -235,34 +224,31 @@ static const struct regmap_config regmap_config = {
static int isl12022_probe(struct i2c_client *client) static int isl12022_probe(struct i2c_client *client)
{ {
struct isl12022 *isl12022; struct rtc_device *rtc;
struct regmap *regmap;
if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C))
return -ENODEV; return -ENODEV;
isl12022 = devm_kzalloc(&client->dev, sizeof(struct isl12022), regmap = devm_regmap_init_i2c(client, &regmap_config);
GFP_KERNEL); if (IS_ERR(regmap)) {
if (!isl12022)
return -ENOMEM;
dev_set_drvdata(&client->dev, isl12022);
isl12022->regmap = devm_regmap_init_i2c(client, &regmap_config);
if (IS_ERR(isl12022->regmap)) {
dev_err(&client->dev, "regmap allocation failed\n"); dev_err(&client->dev, "regmap allocation failed\n");
return PTR_ERR(isl12022->regmap); return PTR_ERR(regmap);
} }
dev_set_drvdata(&client->dev, regmap);
isl12022_hwmon_register(&client->dev); isl12022_hwmon_register(&client->dev);
isl12022->rtc = devm_rtc_allocate_device(&client->dev); rtc = devm_rtc_allocate_device(&client->dev);
if (IS_ERR(isl12022->rtc)) if (IS_ERR(rtc))
return PTR_ERR(isl12022->rtc); return PTR_ERR(rtc);
isl12022->rtc->ops = &isl12022_rtc_ops; rtc->ops = &isl12022_rtc_ops;
isl12022->rtc->range_min = RTC_TIMESTAMP_BEGIN_2000; rtc->range_min = RTC_TIMESTAMP_BEGIN_2000;
isl12022->rtc->range_max = RTC_TIMESTAMP_END_2099; rtc->range_max = RTC_TIMESTAMP_END_2099;
return devm_rtc_register_device(isl12022->rtc); return devm_rtc_register_device(rtc);
} }
#ifdef CONFIG_OF #ifdef CONFIG_OF