evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Staging: et131x: fix coding style issues

Browse source 
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>
This commit is contained in:
Adnan Ali 2012-05-25 18:56:40 +01:00 • committed by Greg Kroah-Hartman
parent ef4459341a
commit 397d3e6029
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/staging/et131x/et131x.c
View file

@ -85,8 +85,7 @@
MODULE_AUTHOR("Victor Soriano <vjsoriano@agere.com>"); MODULE_AUTHOR("Victor Soriano <vjsoriano@agere.com>");
MODULE_AUTHOR("Mark Einon <mark.einon@gmail.com>"); MODULE_AUTHOR("Mark Einon <mark.einon@gmail.com>");
MODULE_LICENSE("Dual BSD/GPL"); MODULE_LICENSE("Dual BSD/GPL");
MODULE_DESCRIPTION("10/100/1000 Base-T Ethernet Driver " MODULE_DESCRIPTION("10/100/1000 Base-T Ethernet Driver for the ET1310 by Agere Systems");
"for the ET1310 by Agere Systems");
/* EEPROM defines */ /* EEPROM defines */
#define MAX_NUM_REGISTER_POLLS 1000 #define MAX_NUM_REGISTER_POLLS 1000
@ -2967,11 +2966,10 @@ static struct rfd *nic_rx_pkts(struct et131x_adapter *adapter)
(ring_index == 0 && (ring_index == 0 &&
buff_index > rx_local->fbr[1]->num_entries - 1) || buff_index > rx_local->fbr[1]->num_entries - 1) ||
(ring_index == 1 && (ring_index == 1 &&
buff_index > rx_local->fbr[0]->num_entries - 1)) buff_index > rx_local->fbr[0]->num_entries - 1)) {
#else #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 #endif
{
/* Illegal buffer or ring index cannot be used by S/W*/ /* Illegal buffer or ring index cannot be used by S/W*/
dev_err(&adapter->pdev->dev, dev_err(&adapter->pdev->dev,
"NICRxPkts PSR Entry %d indicates " "NICRxPkts PSR Entry %d indicates "
@ -4326,8 +4324,7 @@ static int et131x_mii_probe(struct net_device *netdev)
phydev->advertising = phydev->supported; phydev->advertising = phydev->supported;
adapter->phydev = phydev; adapter->phydev = phydev;
dev_info(&adapter->pdev->dev, "attached PHY driver [%s] " dev_info(&adapter->pdev->dev, "attached PHY driver [%s] (mii_bus:phy_addr=%s)\n",
"(mii_bus:phy_addr=%s)\n",
phydev->drv->name, dev_name(&phydev->dev)); phydev->drv->name, dev_name(&phydev->dev));
return 0; return 0;