leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rtc: pcf2123: clean up reads from the chip

Browse Source 
Put read operations into a function.
This improves modularity and readability.

Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
This commit is contained in:
Joshua Clayton 2016-01-04 10:31:20 -08:00 committed by Alexandre Belloni
parent 245cb74be6
commit 66c056d6a1
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/rtc/rtc-pcf2123.c
View File

@ -128,12 +128,23 @@ static inline void pcf2123_delay_trec(void)
ndelay(30); ndelay(30);
} }
static int pcf2123_read(struct device *dev, u8 reg, u8 *rxbuf, size_t size)
{
struct spi_device *spi = to_spi_device(dev);
int ret;
reg |= PCF2123_READ;
ret = spi_write_then_read(spi, &reg, 1, rxbuf, size);
pcf2123_delay_trec();
return ret;
}
static ssize_t pcf2123_show(struct device *dev, struct device_attribute *attr, static ssize_t pcf2123_show(struct device *dev, struct device_attribute *attr,
char *buffer) char *buffer)
{ {
struct spi_device *spi = to_spi_device(dev);
struct pcf2123_sysfs_reg *r; struct pcf2123_sysfs_reg *r;
u8 txbuf[1], rxbuf[1]; u8 rxbuf[1];
unsigned long reg; unsigned long reg;
int ret; int ret;
@ -143,11 +154,10 @@ static ssize_t pcf2123_show(struct device *dev, struct device_attribute *attr,
if (ret) if (ret)
return ret; return ret;
txbuf[0] = PCF2123_READ | reg; ret = pcf2123_read(dev, reg, rxbuf, 1);
ret = spi_write_then_read(spi, txbuf, 1, rxbuf, 1);
if (ret < 0) if (ret < 0)
return -EIO; return -EIO;
pcf2123_delay_trec();
return sprintf(buffer, "0x%x\n", rxbuf[0]); return sprintf(buffer, "0x%x\n", rxbuf[0]);
} }
@ -182,16 +192,12 @@ static ssize_t pcf2123_store(struct device *dev, struct device_attribute *attr,
static int pcf2123_rtc_read_time(struct device *dev, struct rtc_time *tm) static int pcf2123_rtc_read_time(struct device *dev, struct rtc_time *tm)
{ {
struct spi_device *spi = to_spi_device(dev); u8 rxbuf[7];
u8 txbuf[1], rxbuf[7];
int ret; int ret;
txbuf[0] = PCF2123_READ | PCF2123_REG_SC; ret = pcf2123_read(dev, PCF2123_REG_SC, rxbuf, sizeof(rxbuf));
ret = spi_write_then_read(spi, txbuf, sizeof(txbuf),
rxbuf, sizeof(rxbuf));
if (ret < 0) if (ret < 0)
return ret; return ret;
pcf2123_delay_trec();
tm->tm_sec = bcd2bin(rxbuf[0] & 0x7F); tm->tm_sec = bcd2bin(rxbuf[0] & 0x7F);
tm->tm_min = bcd2bin(rxbuf[1] & 0x7F); tm->tm_min = bcd2bin(rxbuf[1] & 0x7F);
@ -297,16 +303,12 @@ static int pcf2123_probe(struct spi_device *spi)
pcf2123_delay_trec(); pcf2123_delay_trec();
/* See if the counter was actually stopped */ /* See if the counter was actually stopped */
txbuf[0] = PCF2123_READ | PCF2123_REG_CTRL1; dev_dbg(&spi->dev, "checking for presence of RTC\n");
dev_dbg(&spi->dev, "checking for presence of RTC (0x%02X)\n", ret = pcf2123_read(&spi->dev, PCF2123_REG_CTRL1, rxbuf, sizeof(rxbuf));
txbuf[0]);
ret = spi_write_then_read(spi, txbuf, 1 * sizeof(u8),
rxbuf, 2 * sizeof(u8));
dev_dbg(&spi->dev, "received data from RTC (0x%02X 0x%02X)\n", dev_dbg(&spi->dev, "received data from RTC (0x%02X 0x%02X)\n",
rxbuf[0], rxbuf[1]); rxbuf[0], rxbuf[1]);
if (ret < 0) if (ret < 0)
goto kfree_exit; goto kfree_exit;
pcf2123_delay_trec();
if (!(rxbuf[0] & 0x20)) { if (!(rxbuf[0] & 0x20)) {
dev_err(&spi->dev, "chip not found\n"); dev_err(&spi->dev, "chip not found\n");