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: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/20200914154601.32245-5-brgl@bgdev.pl

diff --git a/drivers/rtc/rtc-rx8010.c b/drivers/rtc/rtc-rx8010.c
index 79a3d90d2c43686d79daa624d6cc8a2c42c54e8c..153fa58f03653584963d99070c8dec841b58b88e 100644 (file)
--- a/drivers/rtc/rtc-rx8010.c
+++ b/drivers/rtc/rtc-rx8010.c
@@ -109,8 +109,7 @@ static int rx8010_get_time(struct device *dev, struct rtc_time *dt)
 {
        struct rx8010_data *rx8010 = dev_get_drvdata(dev);
        u8 date[7];
-       int flagreg;
-       int err;
+       int flagreg, err;
 
        flagreg = i2c_smbus_read_byte_data(rx8010->client, RX8010_FLAG);
        if (flagreg < 0)
@@ -141,8 +140,7 @@ static int rx8010_set_time(struct device *dev, struct rtc_time *dt)
 {
        struct rx8010_data *rx8010 = dev_get_drvdata(dev);
        u8 date[7];
-       int ctrl, flagreg;
-       int ret;
+       int ctrl, flagreg, ret;
 
        if ((dt->tm_year < 100) || (dt->tm_year > 199))
                return -EINVAL;
@@ -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 i2c_client *client = rx8010->client;
        u8 alarmvals[3];
-       int flagreg;
-       int err;
+       int flagreg, err;
 
        err = i2c_smbus_read_i2c_block_data(client, RX8010_ALMIN, 3, alarmvals);
        if (err != 3)
@@ -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 rx8010_data *rx8010 = dev_get_drvdata(dev);
        u8 alarmvals[3];
-       int extreg, flagreg;
-       int err;
+       int extreg, flagreg, err;
 
        flagreg = i2c_smbus_read_byte_data(client, RX8010_FLAG);
        if (flagreg < 0)
@@ -346,9 +342,8 @@ static int rx8010_alarm_irq_enable(struct device *dev,
 {
        struct i2c_client *client = to_i2c_client(dev);
        struct rx8010_data *rx8010 = dev_get_drvdata(dev);
-       int flagreg;
+       int flagreg, err;
        u8 ctrl;
-       int err;
 
        ctrl = rx8010->ctrlreg;
 
@@ -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)
 {
        struct rx8010_data *rx8010 = dev_get_drvdata(dev);
-       int tmp;
-       int flagreg;
+       int tmp, flagreg;
 
        switch (cmd) {
        case RTC_VL_READ: