diff options
author | Joe Perches <joe@perches.com> | 2009-12-03 02:58:21 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-12-03 16:18:01 -0500 |
commit | 8e95a2026f3b43f7c3d676adaccd2de9532e8dcc (patch) | |
tree | 3733318168cd512480b6db58c5c16d1c8847f0b7 /drivers/net/smsc911x.c | |
parent | 3454f835837609d60b29a266e3bd9d701073b060 (diff) |
drivers/net: Move && and || to end of previous line
Only files where David Miller is the primary git-signer.
wireless, wimax, ixgbe, etc are not modified.
Compile tested x86 allyesconfig only
Not all files compiled (not x86 compatible)
Added a few > 80 column lines, which I ignored.
Existing checkpatch complaints ignored.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/smsc911x.c')
-rw-r--r-- | drivers/net/smsc911x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c index 7f01e60d5172..4d0d5c56bed8 100644 --- a/drivers/net/smsc911x.c +++ b/drivers/net/smsc911x.c | |||
@@ -748,8 +748,8 @@ static void smsc911x_phy_adjust_link(struct net_device *dev) | |||
748 | * usage is 10/100 indicator */ | 748 | * usage is 10/100 indicator */ |
749 | pdata->gpio_setting = smsc911x_reg_read(pdata, | 749 | pdata->gpio_setting = smsc911x_reg_read(pdata, |
750 | GPIO_CFG); | 750 | GPIO_CFG); |
751 | if ((pdata->gpio_setting & GPIO_CFG_LED1_EN_) | 751 | if ((pdata->gpio_setting & GPIO_CFG_LED1_EN_) && |
752 | && (!pdata->using_extphy)) { | 752 | (!pdata->using_extphy)) { |
753 | /* Force 10/100 LED off, after saving | 753 | /* Force 10/100 LED off, after saving |
754 | * orginal GPIO configuration */ | 754 | * orginal GPIO configuration */ |
755 | pdata->gpio_orig_setting = pdata->gpio_setting; | 755 | pdata->gpio_orig_setting = pdata->gpio_setting; |