Commit 860c45b5 authored by Alexandre Belloni's avatar Alexandre Belloni

rtc: ds1347: use regmap_update_bits

Use regmap_update_bits instead of open coding. Also add proper error
handling.

Link: https://lore.kernel.org/r/20191007134724.15505-9-alexandre.belloni@bootlin.comSigned-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent d9dcfa5f
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
#define DS1347_STATUS_REG 0x17 #define DS1347_STATUS_REG 0x17
#define DS1347_CLOCK_BURST 0x3F #define DS1347_CLOCK_BURST 0x3F
#define DS1347_WP_BIT BIT(7)
#define DS1347_NEOSC_BIT BIT(7) #define DS1347_NEOSC_BIT BIT(7)
#define DS1347_OSF_BIT BIT(2) #define DS1347_OSF_BIT BIT(2)
...@@ -117,7 +119,7 @@ static int ds1347_probe(struct spi_device *spi) ...@@ -117,7 +119,7 @@ static int ds1347_probe(struct spi_device *spi)
struct rtc_device *rtc; struct rtc_device *rtc;
struct regmap_config config; struct regmap_config config;
struct regmap *map; struct regmap *map;
unsigned int data; int err;
memset(&config, 0, sizeof(config)); memset(&config, 0, sizeof(config));
config.reg_bits = 8; config.reg_bits = 8;
...@@ -141,9 +143,9 @@ static int ds1347_probe(struct spi_device *spi) ...@@ -141,9 +143,9 @@ static int ds1347_probe(struct spi_device *spi)
spi_set_drvdata(spi, map); spi_set_drvdata(spi, map);
/* Disable the write protect of rtc */ /* Disable the write protect of rtc */
regmap_read(map, DS1347_CONTROL_REG, &data); err = regmap_update_bits(map, DS1347_CONTROL_REG, DS1347_WP_BIT, 0);
data = data & ~(1<<7); if (err)
regmap_write(map, DS1347_CONTROL_REG, data); return err;
rtc = devm_rtc_allocate_device(&spi->dev); rtc = devm_rtc_allocate_device(&spi->dev);
if (IS_ERR(rtc)) if (IS_ERR(rtc))
......
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