Skip to content

Commit 4057a66

Browse files
rtc: ds1307: fix alignments and blank lines
Alignment should always match open parenthesis. Also remove two unnecessary blank lines Signed-off-by: Alexandre Belloni <[email protected]>
1 parent eb4fd19 commit 4057a66

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

drivers/rtc/rtc-ds1307.c

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ enum ds_type {
5151
/* rs5c372 too? different address... */
5252
};
5353

54-
5554
/* RTC registers don't differ much, except for the century flag */
5655
#define DS1307_REG_SECS 0x00 /* 00-59 */
5756
# define DS1307_BIT_CH 0x80
@@ -114,7 +113,6 @@ enum ds_type {
114113
# define RX8025_BIT_VDET 0x40
115114
# define RX8025_BIT_XST 0x20
116115

117-
118116
struct ds1307 {
119117
struct nvmem_config nvmem_cfg;
120118
enum ds_type type;
@@ -1042,7 +1040,7 @@ static int ds3231_hwmon_read_temp(struct device *dev, s32 *mC)
10421040
}
10431041

10441042
static ssize_t ds3231_hwmon_show_temp(struct device *dev,
1045-
struct device_attribute *attr, char *buf)
1043+
struct device_attribute *attr, char *buf)
10461044
{
10471045
int ret;
10481046
s32 temp;
@@ -1054,7 +1052,7 @@ static ssize_t ds3231_hwmon_show_temp(struct device *dev,
10541052
return sprintf(buf, "%d\n", temp);
10551053
}
10561054
static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, ds3231_hwmon_show_temp,
1057-
NULL, 0);
1055+
NULL, 0);
10581056

10591057
static struct attribute *ds3231_hwmon_attrs[] = {
10601058
&sensor_dev_attr_temp1_input.dev_attr.attr,
@@ -1070,7 +1068,8 @@ static void ds1307_hwmon_register(struct ds1307 *ds1307)
10701068
return;
10711069

10721070
dev = devm_hwmon_device_register_with_groups(ds1307->dev, ds1307->name,
1073-
ds1307, ds3231_hwmon_groups);
1071+
ds1307,
1072+
ds3231_hwmon_groups);
10741073
if (IS_ERR(dev)) {
10751074
dev_warn(ds1307->dev, "unable to register hwmon device %ld\n",
10761075
PTR_ERR(dev));
@@ -1142,7 +1141,7 @@ static unsigned long ds3231_clk_sqw_recalc_rate(struct clk_hw *hw,
11421141
}
11431142

11441143
static long ds3231_clk_sqw_round_rate(struct clk_hw *hw, unsigned long rate,
1145-
unsigned long *prate)
1144+
unsigned long *prate)
11461145
{
11471146
int i;
11481147

@@ -1155,7 +1154,7 @@ static long ds3231_clk_sqw_round_rate(struct clk_hw *hw, unsigned long rate,
11551154
}
11561155

11571156
static int ds3231_clk_sqw_set_rate(struct clk_hw *hw, unsigned long rate,
1158-
unsigned long parent_rate)
1157+
unsigned long parent_rate)
11591158
{
11601159
struct ds1307 *ds1307 = clk_sqw_to_ds1307(hw);
11611160
int control = 0;
@@ -1215,7 +1214,7 @@ static const struct clk_ops ds3231_clk_sqw_ops = {
12151214
};
12161215

12171216
static unsigned long ds3231_clk_32khz_recalc_rate(struct clk_hw *hw,
1218-
unsigned long parent_rate)
1217+
unsigned long parent_rate)
12191218
{
12201219
return 32768;
12211220
}
@@ -1306,7 +1305,7 @@ static int ds3231_clks_register(struct ds1307 *ds1307)
13061305

13071306
/* optional override of the clockname */
13081307
of_property_read_string_index(node, "clock-output-names", i,
1309-
&init.name);
1308+
&init.name);
13101309
ds1307->clks[i].init = &init;
13111310

13121311
onecell->clks[i] = devm_clk_register(ds1307->dev,
@@ -1570,8 +1569,8 @@ static int ds1307_probe(struct i2c_client *client,
15701569
/* oscillator fault? clear flag, and warn */
15711570
if (regs[DS1307_REG_CONTROL] & DS1338_BIT_OSF) {
15721571
regmap_write(ds1307->regmap, DS1307_REG_CONTROL,
1573-
regs[DS1307_REG_CONTROL] &
1574-
~DS1338_BIT_OSF);
1572+
regs[DS1307_REG_CONTROL] &
1573+
~DS1338_BIT_OSF);
15751574
dev_warn(ds1307->dev, "SET TIME!\n");
15761575
goto read_rtc;
15771576
}

0 commit comments

Comments
 (0)