Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b31a1bf authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'break_after_return' 



Fabian Frederick says:

====================
drivers/net: remove unnecessary break after return

Second patchset after "remove unnecessary break after goto" addressing break redundancy on drivers/net branch
(suggested by Joe Perches)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents fa4eff44 b684106a

drivers/net/cris/eth_v10.c

+0 −1
Original line number Diff line number Diff line
@@ -1496,7 +1496,6 @@ e100_set_config(struct net_device *dev, struct ifmap *map) 
		case IF_PORT_AUI:

			spin_unlock(&np->lock);

			return -EOPNOTSUPP;

			break;

		default:

			printk(KERN_ERR "%s: Invalid media selected", dev->name);

			spin_unlock(&np->lock);

drivers/net/ethernet/8390/mac8390.c

+0 −8
Original line number Diff line number Diff line
@@ -178,10 +178,8 @@ static enum mac8390_type __init mac8390_ident(struct nubus_dev *dev) 
		case NUBUS_DRHW_APPLE_SONIC_LC:

		case NUBUS_DRHW_SONNET:

			return MAC8390_NONE;

			break;

		default:

			return MAC8390_APPLE;

			break;

		}

		break;
@@ -189,13 +187,10 @@ static enum mac8390_type __init mac8390_ident(struct nubus_dev *dev) 
		switch (dev->dr_hw) {

		case NUBUS_DRHW_ASANTE_LC:

			return MAC8390_NONE;

			break;

		case NUBUS_DRHW_CABLETRON:

			return MAC8390_CABLETRON;

			break;

		default:

			return MAC8390_APPLE;

			break;

		}

		break;
@@ -220,10 +215,8 @@ static enum mac8390_type __init mac8390_ident(struct nubus_dev *dev) 
		switch (dev->dr_hw) {

		case NUBUS_DRHW_INTERLAN:

			return MAC8390_INTERLAN;

			break;

		default:

			return MAC8390_KINETICS;

			break;

		}

		break;
@@ -563,7 +556,6 @@ static int __init mac8390_initdev(struct net_device *dev, 
		case ACCESS_UNKNOWN:

			pr_err("Don't know how to access card memory!\n");

			return -ENODEV;

			break;



		case ACCESS_16:

			/* 16 bit card, register map is reversed */

drivers/net/ethernet/atheros/atl1c/atl1c_hw.c

+0 −2
Original line number Diff line number Diff line
@@ -639,7 +639,6 @@ int atl1c_phy_init(struct atl1c_hw *hw) 
			dev_err(&pdev->dev, "Wrong Media type %d\n",

				hw->media_type);

		return -1;

		break;

	}



	ret_val = atl1c_write_phy_reg(hw, MII_BMCR, mii_bmcr_data);
@@ -682,7 +681,6 @@ int atl1c_get_speed_and_duplex(struct atl1c_hw *hw, u16 *speed, u16 *duplex) 
		break;

	default:

		return -1;

		break;

	}



	if (phy_data & GIGA_PSSR_DPLX)

drivers/net/ethernet/atheros/atl1e/atl1e_hw.c

+0 −1
Original line number Diff line number Diff line
@@ -618,7 +618,6 @@ int atl1e_get_speed_and_duplex(struct atl1e_hw *hw, u16 *speed, u16 *duplex) 
		break;

	default:

		return AT_ERR_PHY_SPEED;

		break;

	}



	if (phy_data & MII_AT001_PSSR_DPLX)

drivers/net/ethernet/atheros/atlx/atl1.c

+0 −1
Original line number Diff line number Diff line
@@ -910,7 +910,6 @@ static s32 atl1_get_speed_and_duplex(struct atl1_hw *hw, u16 *speed, u16 *duplex 
		if (netif_msg_hw(adapter))

			dev_dbg(&pdev->dev, "error getting speed\n");

		return ATLX_ERR_PHY_SPEED;

		break;

	}

	if (phy_data & MII_ATLX_PSSR_DPLX)

		*duplex = FULL_DUPLEX;