Commit 75677971 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Alexandre Belloni

rtc: rx8010: consolidate local variables of the same type

Move local variables of the same type into a single line for better
readability.
Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/20200914154601.32245-5-brgl@bgdev.pl
parent 28c86f30
...@@ -109,8 +109,7 @@ static int rx8010_get_time(struct device *dev, struct rtc_time *dt) ...@@ -109,8 +109,7 @@ static int rx8010_get_time(struct device *dev, struct rtc_time *dt)
{ {
struct rx8010_data *rx8010 = dev_get_drvdata(dev); struct rx8010_data *rx8010 = dev_get_drvdata(dev);
u8 date[7]; u8 date[7];
int flagreg; int flagreg, err;
int err;
flagreg = i2c_smbus_read_byte_data(rx8010->client, RX8010_FLAG); flagreg = i2c_smbus_read_byte_data(rx8010->client, RX8010_FLAG);
if (flagreg < 0) if (flagreg < 0)
...@@ -141,8 +140,7 @@ static int rx8010_set_time(struct device *dev, struct rtc_time *dt) ...@@ -141,8 +140,7 @@ static int rx8010_set_time(struct device *dev, struct rtc_time *dt)
{ {
struct rx8010_data *rx8010 = dev_get_drvdata(dev); struct rx8010_data *rx8010 = dev_get_drvdata(dev);
u8 date[7]; u8 date[7];
int ctrl, flagreg; int ctrl, flagreg, ret;
int ret;
if ((dt->tm_year < 100) || (dt->tm_year > 199)) if ((dt->tm_year < 100) || (dt->tm_year > 199))
return -EINVAL; return -EINVAL;
...@@ -250,8 +248,7 @@ static int rx8010_read_alarm(struct device *dev, struct rtc_wkalrm *t) ...@@ -250,8 +248,7 @@ static int rx8010_read_alarm(struct device *dev, struct rtc_wkalrm *t)
struct rx8010_data *rx8010 = dev_get_drvdata(dev); struct rx8010_data *rx8010 = dev_get_drvdata(dev);
struct i2c_client *client = rx8010->client; struct i2c_client *client = rx8010->client;
u8 alarmvals[3]; u8 alarmvals[3];
int flagreg; int flagreg, err;
int err;
err = i2c_smbus_read_i2c_block_data(client, RX8010_ALMIN, 3, alarmvals); err = i2c_smbus_read_i2c_block_data(client, RX8010_ALMIN, 3, alarmvals);
if (err != 3) if (err != 3)
...@@ -279,8 +276,7 @@ static int rx8010_set_alarm(struct device *dev, struct rtc_wkalrm *t) ...@@ -279,8 +276,7 @@ static int rx8010_set_alarm(struct device *dev, struct rtc_wkalrm *t)
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct rx8010_data *rx8010 = dev_get_drvdata(dev); struct rx8010_data *rx8010 = dev_get_drvdata(dev);
u8 alarmvals[3]; u8 alarmvals[3];
int extreg, flagreg; int extreg, flagreg, err;
int err;
flagreg = i2c_smbus_read_byte_data(client, RX8010_FLAG); flagreg = i2c_smbus_read_byte_data(client, RX8010_FLAG);
if (flagreg < 0) if (flagreg < 0)
...@@ -346,9 +342,8 @@ static int rx8010_alarm_irq_enable(struct device *dev, ...@@ -346,9 +342,8 @@ static int rx8010_alarm_irq_enable(struct device *dev,
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct rx8010_data *rx8010 = dev_get_drvdata(dev); struct rx8010_data *rx8010 = dev_get_drvdata(dev);
int flagreg; int flagreg, err;
u8 ctrl; u8 ctrl;
int err;
ctrl = rx8010->ctrlreg; ctrl = rx8010->ctrlreg;
...@@ -387,8 +382,7 @@ static int rx8010_alarm_irq_enable(struct device *dev, ...@@ -387,8 +382,7 @@ static int rx8010_alarm_irq_enable(struct device *dev,
static int rx8010_ioctl(struct device *dev, unsigned int cmd, unsigned long arg) static int rx8010_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
{ {
struct rx8010_data *rx8010 = dev_get_drvdata(dev); struct rx8010_data *rx8010 = dev_get_drvdata(dev);
int tmp; int tmp, flagreg;
int flagreg;
switch (cmd) { switch (cmd) {
case RTC_VL_READ: case RTC_VL_READ:
......
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