Skip to content

L
linux
Commit 9126a2b1 authored by Alexandre Belloni's avatar Alexandre Belloni
Browse files
Options

rtc: pcf2123: rename struct and variables 

Rename struct pcf2123_plat_data to struct pcf2123_data and pdata to
pcf2123 to make the driver use a more common subsystem style.
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/20190819182656.29744-5-alexandre.belloni@bootlin.comSigned-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent d3bad602
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 38 deletions
drivers/rtc/rtc-pcf2123.c
View file @ 9126a2b1
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
static struct spi_driver pcf2123_driver; static struct spi_driver pcf2123_driver;
struct pcf2123_plat_data { struct pcf2123_data {
struct rtc_device *rtc; struct rtc_device *rtc;
struct regmap *map; struct regmap *map;
}; };
...@@ -119,11 +119,11 @@ static const struct regmap_config pcf2123_regmap_config = { ...@@ -119,11 +119,11 @@ static const struct regmap_config pcf2123_regmap_config = {
static int pcf2123_read_offset(struct device *dev, long *offset) static int pcf2123_read_offset(struct device *dev, long *offset)
{ {
struct pcf2123_plat_data *pdata = dev_get_drvdata(dev); struct pcf2123_data *pcf2123 = dev_get_drvdata(dev);
int ret, val; int ret, val;
unsigned int reg; unsigned int reg;
ret = regmap_read(pdata->map, PCF2123_REG_OFFSET, &reg); ret = regmap_read(pcf2123->map, PCF2123_REG_OFFSET, &reg);
if (ret) if (ret)
return ret; return ret;
...@@ -149,7 +149,7 @@ static int pcf2123_read_offset(struct device *dev, long *offset) ...@@ -149,7 +149,7 @@ static int pcf2123_read_offset(struct device *dev, long *offset)
*/ */
static int pcf2123_set_offset(struct device *dev, long offset) static int pcf2123_set_offset(struct device *dev, long offset)
{ {
struct pcf2123_plat_data *pdata = dev_get_drvdata(dev); struct pcf2123_data *pcf2123 = dev_get_drvdata(dev);
s8 reg; s8 reg;
if (offset > OFFSET_STEP * 127) if (offset > OFFSET_STEP * 127)
...@@ -169,16 +169,16 @@ static int pcf2123_set_offset(struct device *dev, long offset) ...@@ -169,16 +169,16 @@ static int pcf2123_set_offset(struct device *dev, long offset)
reg |= OFFSET_COARSE; reg |= OFFSET_COARSE;
} }
return regmap_write(pdata->map, PCF2123_REG_OFFSET, (unsigned int)reg); return regmap_write(pcf2123->map, PCF2123_REG_OFFSET, (unsigned int)reg);
} }
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 pcf2123_plat_data *pdata = dev_get_drvdata(dev); struct pcf2123_data *pcf2123 = dev_get_drvdata(dev);
u8 rxbuf[7]; u8 rxbuf[7];
int ret; int ret;
ret = regmap_bulk_read(pdata->map, PCF2123_REG_SC, rxbuf, ret = regmap_bulk_read(pcf2123->map, PCF2123_REG_SC, rxbuf,
sizeof(rxbuf)); sizeof(rxbuf));
if (ret) if (ret)
return ret; return ret;
...@@ -205,14 +205,14 @@ static int pcf2123_rtc_read_time(struct device *dev, struct rtc_time *tm) ...@@ -205,14 +205,14 @@ static int pcf2123_rtc_read_time(struct device *dev, struct rtc_time *tm)
static int pcf2123_rtc_set_time(struct device *dev, struct rtc_time *tm) static int pcf2123_rtc_set_time(struct device *dev, struct rtc_time *tm)
{ {
struct pcf2123_plat_data *pdata = dev_get_drvdata(dev); struct pcf2123_data *pcf2123 = dev_get_drvdata(dev);
u8 txbuf[7]; u8 txbuf[7];
int ret; int ret;
dev_dbg(dev, "%s: tm is %ptR\n", __func__, tm); dev_dbg(dev, "%s: tm is %ptR\n", __func__, tm);
/* Stop the counter first */ /* Stop the counter first */
ret = regmap_write(pdata->map, PCF2123_REG_CTRL1, CTRL1_STOP); ret = regmap_write(pcf2123->map, PCF2123_REG_CTRL1, CTRL1_STOP);
if (ret) if (ret)
return ret; return ret;
...@@ -225,13 +225,13 @@ static int pcf2123_rtc_set_time(struct device *dev, struct rtc_time *tm) ...@@ -225,13 +225,13 @@ static int pcf2123_rtc_set_time(struct device *dev, struct rtc_time *tm)
txbuf[5] = bin2bcd((tm->tm_mon + 1) & 0x1F); /* rtc mn 1-12 */ txbuf[5] = bin2bcd((tm->tm_mon + 1) & 0x1F); /* rtc mn 1-12 */
txbuf[6] = bin2bcd(tm->tm_year < 100 ? tm->tm_year : tm->tm_year - 100); txbuf[6] = bin2bcd(tm->tm_year < 100 ? tm->tm_year : tm->tm_year - 100);
ret = regmap_bulk_write(pdata->map, PCF2123_REG_SC, txbuf, ret = regmap_bulk_write(pcf2123->map, PCF2123_REG_SC, txbuf,
sizeof(txbuf)); sizeof(txbuf));
if (ret) if (ret)
return ret; return ret;
/* Start the counter */ /* Start the counter */
ret = regmap_write(pdata->map, PCF2123_REG_CTRL1, CTRL1_CLEAR); ret = regmap_write(pcf2123->map, PCF2123_REG_CTRL1, CTRL1_CLEAR);
if (ret) if (ret)
return ret; return ret;
...@@ -240,20 +240,20 @@ static int pcf2123_rtc_set_time(struct device *dev, struct rtc_time *tm) ...@@ -240,20 +240,20 @@ static int pcf2123_rtc_set_time(struct device *dev, struct rtc_time *tm)
static int pcf2123_rtc_alarm_irq_enable(struct device *dev, unsigned int en) static int pcf2123_rtc_alarm_irq_enable(struct device *dev, unsigned int en)
{ {
struct pcf2123_plat_data *pdata = dev_get_platdata(dev); struct pcf2123_data *pcf2123 = dev_get_drvdata(dev);
return regmap_update_bits(pdata->map, PCF2123_REG_CTRL2, CTRL2_AIE, return regmap_update_bits(pcf2123->map, PCF2123_REG_CTRL2, CTRL2_AIE,
en ? CTRL2_AIE : 0); en ? CTRL2_AIE : 0);
} }
static int pcf2123_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm) static int pcf2123_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm)
{ {
struct pcf2123_plat_data *pdata = dev_get_drvdata(dev); struct pcf2123_data *pcf2123 = dev_get_drvdata(dev);
u8 rxbuf[4]; u8 rxbuf[4];
int ret; int ret;
unsigned int val = 0; unsigned int val = 0;
ret = regmap_bulk_read(pdata->map, PCF2123_REG_ALRM_MN, rxbuf, ret = regmap_bulk_read(pcf2123->map, PCF2123_REG_ALRM_MN, rxbuf,
sizeof(rxbuf)); sizeof(rxbuf));
if (ret) if (ret)
return ret; return ret;
...@@ -265,7 +265,7 @@ static int pcf2123_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm) ...@@ -265,7 +265,7 @@ static int pcf2123_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm)
dev_dbg(dev, "%s: alm is %ptR\n", __func__, &alm->time); dev_dbg(dev, "%s: alm is %ptR\n", __func__, &alm->time);
ret = regmap_read(pdata->map, PCF2123_REG_CTRL2, &val); ret = regmap_read(pcf2123->map, PCF2123_REG_CTRL2, &val);
if (ret) if (ret)
return ret; return ret;
...@@ -276,19 +276,19 @@ static int pcf2123_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm) ...@@ -276,19 +276,19 @@ static int pcf2123_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm)
static int pcf2123_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm) static int pcf2123_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm)
{ {
struct pcf2123_plat_data *pdata = dev_get_drvdata(dev); struct pcf2123_data *pcf2123 = dev_get_drvdata(dev);
u8 txbuf[4]; u8 txbuf[4];
int ret; int ret;
dev_dbg(dev, "%s: alm is %ptR\n", __func__, &alm->time); dev_dbg(dev, "%s: alm is %ptR\n", __func__, &alm->time);
/* Disable alarm interrupt */ /* Disable alarm interrupt */
ret = regmap_update_bits(pdata->map, PCF2123_REG_CTRL2, CTRL2_AIE, 0); ret = regmap_update_bits(pcf2123->map, PCF2123_REG_CTRL2, CTRL2_AIE, 0);
if (ret) if (ret)
return ret; return ret;
/* Ensure alarm flag is clear */ /* Ensure alarm flag is clear */
ret = regmap_update_bits(pdata->map, PCF2123_REG_CTRL2, CTRL2_AF, 0); ret = regmap_update_bits(pcf2123->map, PCF2123_REG_CTRL2, CTRL2_AF, 0);
if (ret) if (ret)
return ret; return ret;
...@@ -298,7 +298,7 @@ static int pcf2123_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm) ...@@ -298,7 +298,7 @@ static int pcf2123_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm)
txbuf[2] = bin2bcd(alm->time.tm_mday & 0x3F); txbuf[2] = bin2bcd(alm->time.tm_mday & 0x3F);
txbuf[3] = ALRM_DISABLE; txbuf[3] = ALRM_DISABLE;
ret = regmap_bulk_write(pdata->map, PCF2123_REG_ALRM_MN, txbuf, ret = regmap_bulk_write(pcf2123->map, PCF2123_REG_ALRM_MN, txbuf,
sizeof(txbuf)); sizeof(txbuf));
if (ret) if (ret)
return ret; return ret;
...@@ -308,22 +308,22 @@ static int pcf2123_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm) ...@@ -308,22 +308,22 @@ static int pcf2123_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm)
static irqreturn_t pcf2123_rtc_irq(int irq, void *dev) static irqreturn_t pcf2123_rtc_irq(int irq, void *dev)
{ {
struct pcf2123_plat_data *pdata = dev_get_drvdata(dev); struct pcf2123_data *pcf2123 = dev_get_drvdata(dev);
struct mutex *lock = &pdata->rtc->ops_lock; struct mutex *lock = &pcf2123->rtc->ops_lock;
unsigned int val = 0; unsigned int val = 0;
int ret = IRQ_NONE; int ret = IRQ_NONE;
mutex_lock(lock); mutex_lock(lock);
regmap_read(pdata->map, PCF2123_REG_CTRL2, &val); regmap_read(pcf2123->map, PCF2123_REG_CTRL2, &val);
/* Alarm? */ /* Alarm? */
if (val & CTRL2_AF) { if (val & CTRL2_AF) {
ret = IRQ_HANDLED; ret = IRQ_HANDLED;
/* Clear alarm flag */ /* Clear alarm flag */
regmap_update_bits(pdata->map, PCF2123_REG_CTRL2, CTRL2_AF, 0); regmap_update_bits(pcf2123->map, PCF2123_REG_CTRL2, CTRL2_AF, 0);
rtc_update_irq(pdata->rtc, 1, RTC_IRQF | RTC_AF); rtc_update_irq(pcf2123->rtc, 1, RTC_IRQF | RTC_AF);
} }
mutex_unlock(lock); mutex_unlock(lock);
...@@ -333,23 +333,23 @@ static irqreturn_t pcf2123_rtc_irq(int irq, void *dev) ...@@ -333,23 +333,23 @@ static irqreturn_t pcf2123_rtc_irq(int irq, void *dev)
static int pcf2123_reset(struct device *dev) static int pcf2123_reset(struct device *dev)
{ {
struct pcf2123_plat_data *pdata = dev_get_drvdata(dev); struct pcf2123_data *pcf2123 = dev_get_drvdata(dev);
int ret; int ret;
unsigned int val = 0; unsigned int val = 0;
ret = regmap_write(pdata->map, PCF2123_REG_CTRL1, CTRL1_SW_RESET); ret = regmap_write(pcf2123->map, PCF2123_REG_CTRL1, CTRL1_SW_RESET);
if (ret) if (ret)
return ret; return ret;
/* Stop the counter */ /* Stop the counter */
dev_dbg(dev, "stopping RTC\n"); dev_dbg(dev, "stopping RTC\n");
ret = regmap_write(pdata->map, PCF2123_REG_CTRL1, CTRL1_STOP); ret = regmap_write(pcf2123->map, PCF2123_REG_CTRL1, CTRL1_STOP);
if (ret) if (ret)
return ret; return ret;
/* See if the counter was actually stopped */ /* See if the counter was actually stopped */
dev_dbg(dev, "checking for presence of RTC\n"); dev_dbg(dev, "checking for presence of RTC\n");
ret = regmap_read(pdata->map, PCF2123_REG_CTRL1, &val); ret = regmap_read(pcf2123->map, PCF2123_REG_CTRL1, &val);
if (ret) if (ret)
return ret; return ret;
...@@ -358,7 +358,7 @@ static int pcf2123_reset(struct device *dev) ...@@ -358,7 +358,7 @@ static int pcf2123_reset(struct device *dev)
return -ENODEV; return -ENODEV;
/* Start the counter */ /* Start the counter */
ret = regmap_write(pdata->map, PCF2123_REG_CTRL1, CTRL1_CLEAR); ret = regmap_write(pcf2123->map, PCF2123_REG_CTRL1, CTRL1_CLEAR);
if (ret) if (ret)
return ret; return ret;
...@@ -379,19 +379,19 @@ static int pcf2123_probe(struct spi_device *spi) ...@@ -379,19 +379,19 @@ static int pcf2123_probe(struct spi_device *spi)
{ {
struct rtc_device *rtc; struct rtc_device *rtc;
struct rtc_time tm; struct rtc_time tm;
struct pcf2123_plat_data *pdata; struct pcf2123_data *pcf2123;
int ret = 0; int ret = 0;
pdata = devm_kzalloc(&spi->dev, sizeof(struct pcf2123_plat_data), pcf2123 = devm_kzalloc(&spi->dev, sizeof(struct pcf2123_data),
GFP_KERNEL); GFP_KERNEL);
if (!pdata) if (!pcf2123)
return -ENOMEM; return -ENOMEM;
dev_set_drvdata(&spi->dev, pdata); dev_set_drvdata(&spi->dev, pcf2123);
pdata->map = devm_regmap_init_spi(spi, &pcf2123_regmap_config); pcf2123->map = devm_regmap_init_spi(spi, &pcf2123_regmap_config);
if (IS_ERR(pdata->map)) { if (IS_ERR(pcf2123->map)) {
dev_err(&spi->dev, "regmap init failed.\n"); dev_err(&spi->dev, "regmap init failed.\n");
goto kfree_exit; goto kfree_exit;
} }
...@@ -418,7 +418,7 @@ static int pcf2123_probe(struct spi_device *spi) ...@@ -418,7 +418,7 @@ static int pcf2123_probe(struct spi_device *spi)
goto kfree_exit; goto kfree_exit;
} }
pdata->rtc = rtc; pcf2123->rtc = rtc;
/* Register alarm irq */ /* Register alarm irq */
...@@ -437,7 +437,7 @@ static int pcf2123_probe(struct spi_device *spi) ...@@ -437,7 +437,7 @@ static int pcf2123_probe(struct spi_device *spi)
* support to this driver to generate interrupts more than once * support to this driver to generate interrupts more than once
* per minute. * per minute.
*/ */
pdata->rtc->uie_unsupported = 1; pcf2123->rtc->uie_unsupported = 1;
return 0; return 0;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7