summaryrefslogtreecommitdiff
path: root/drivers/staging
diff options
context:
space:
mode:
authorAdnan Ali <adnan.ali@codethink.co.uk>2012-05-25 21:56:40 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-11 19:47:51 +0400
commit397d3e6029cb816d7a9a78531528a62d08c70d3f (patch)
tree0d9483ea3f15bf9f35314b4ea485e6c288215b60 /drivers/staging
parentef4459341a600703e99a08584350809a96b62371 (diff)
downloadlinux-397d3e6029cb816d7a9a78531528a62d08c70d3f.tar.xz
Staging: et131x: fix coding style issues
This commit fixes coding style issues including braces position and line wrapping. Signed-off-by: Adnan Ali <adnan.ali@codethink.co.uk> Reviewed-by: Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> Acked-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/et131x/et131x.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c
index 5b11c5e3622e..cf02336ffbdc 100644
--- a/drivers/staging/et131x/et131x.c
+++ b/drivers/staging/et131x/et131x.c
@@ -85,8 +85,7 @@
MODULE_AUTHOR("Victor Soriano <vjsoriano@agere.com>");
MODULE_AUTHOR("Mark Einon <mark.einon@gmail.com>");
MODULE_LICENSE("Dual BSD/GPL");
-MODULE_DESCRIPTION("10/100/1000 Base-T Ethernet Driver "
- "for the ET1310 by Agere Systems");
+MODULE_DESCRIPTION("10/100/1000 Base-T Ethernet Driver for the ET1310 by Agere Systems");
/* EEPROM defines */
#define MAX_NUM_REGISTER_POLLS 1000
@@ -2967,11 +2966,10 @@ static struct rfd *nic_rx_pkts(struct et131x_adapter *adapter)
(ring_index == 0 &&
buff_index > rx_local->fbr[1]->num_entries - 1) ||
(ring_index == 1 &&
- buff_index > rx_local->fbr[0]->num_entries - 1))
+ buff_index > rx_local->fbr[0]->num_entries - 1)) {
#else
- if (ring_index != 1 || buff_index > rx_local->fbr[0]->num_entries - 1)
+ if (ring_index != 1 || buff_index > rx_local->fbr[0]->num_entries - 1) {
#endif
- {
/* Illegal buffer or ring index cannot be used by S/W*/
dev_err(&adapter->pdev->dev,
"NICRxPkts PSR Entry %d indicates "
@@ -4326,8 +4324,7 @@ static int et131x_mii_probe(struct net_device *netdev)
phydev->advertising = phydev->supported;
adapter->phydev = phydev;
- dev_info(&adapter->pdev->dev, "attached PHY driver [%s] "
- "(mii_bus:phy_addr=%s)\n",
+ dev_info(&adapter->pdev->dev, "attached PHY driver [%s] (mii_bus:phy_addr=%s)\n",
phydev->drv->name, dev_name(&phydev->dev));
return 0;