[PATCH 4/3] net/bonding: Adhere to coding style: break line after the if condition

From: =?utf-8?q?Ferenc_W=C3=A1gner?=
Date: Wed Nov 28 2007 - 19:17:18 EST


Signed-off-by: Ferenc WÃgner <wferi@xxxxxxx>
---
Randy Dunlap <randy.dunlap@xxxxxxxxxx> writes:

> Wagner Ferenc wrote:
>> Randy Dunlap <randy.dunlap@xxxxxxxxxx> writes:
>>
>>> Patches 1 & 3 use
>>>
>>> if (res) statement;
>>>
>>> but the preferred form is
>>>
>>> if (res)
>>> statement;
>>>
>>> Even if this style was already used in the source file, it should
>>> be cleaned up.
>>
>> No principal problem. So that I learn something useful: how should I
>> go about this? I created the patches with git-format-patch, and they
>> depend on each other, so I'd rather not git-reset, if possible...
>>
>> Can I just create a follow-up patch which fixes this stylistic issue?
>
> That's OK with me. I can't say how it might be done with git.

drivers/net/bonding/bond_sysfs.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index 5c31f5c..9de2c52 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -91,7 +91,8 @@ static ssize_t bonding_show_bonds(struct class *cls, char *buf)
}
res += sprintf(buf + res, "%s ", bond->dev->name);
}
- if (res) buf[res-1] = '\n'; /* eat the leftover space */
+ if (res)
+ buf[res-1] = '\n'; /* eat the leftover space */
up_read(&(bonding_rwsem));
return res;
}
@@ -239,7 +240,8 @@ static ssize_t bonding_show_slaves(struct device *d,
res += sprintf(buf + res, "%s ", slave->dev->name);
}
read_unlock(&bond->lock);
- if (res) buf[res-1] = '\n'; /* eat the leftover space */
+ if (res)
+ buf[res-1] = '\n'; /* eat the leftover space */
return res;
}

@@ -705,7 +707,8 @@ static ssize_t bonding_show_arp_targets(struct device *d,
res += sprintf(buf + res, "%u.%u.%u.%u ",
NIPQUAD(bond->params.arp_targets[i]));
}
- if (res) buf[res-1] = '\n'; /* eat the leftover space */
+ if (res)
+ buf[res-1] = '\n'; /* eat the leftover space */
return res;
}

--
1.4.4.4

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/