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

Commit c697f83e authored by Francois Romieu's avatar Francois Romieu Committed by Jeff Garzik
Browse files

chelsio: move return, break and continue statements on their own line 



Signed-off-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
parent ea8862dc

drivers/net/chelsio/espi.c

+2 −1
Original line number Diff line number Diff line
@@ -301,7 +301,8 @@ void t1_espi_set_misc_ctrl(adapter_t *adapter, u32 val) 
{

	struct peespi *espi = adapter->espi;



	if (!is_T2(adapter)) return;

	if (!is_T2(adapter))

		return;

	spin_lock(&espi->lock);

	espi->misc_ctrl = (val & ~MON_MASK) |

			  (espi->misc_ctrl & MON_MASK);

drivers/net/chelsio/ixf1010.c

+6 −3
Original line number Diff line number Diff line
@@ -273,7 +273,8 @@ static int mac_set_rx_mode(struct cmac *mac, struct t1_rx_mode *rm) 
static int mac_set_mtu(struct cmac *mac, int mtu)

{

	/* MAX_FRAME_SIZE inludes header + FCS, mtu doesn't */

	if (mtu > (MAX_FRAME_SIZE - 14 - 4)) return -EINVAL;

	if (mtu > (MAX_FRAME_SIZE - 14 - 4))

		return -EINVAL;

	t1_tpi_write(mac->adapter, MACREG(mac, REG_MAX_FRAME_SIZE),

		     mtu + 14 + 4);

	return 0;
@@ -460,10 +461,12 @@ static struct cmac *ixf1010_mac_create(adapter_t *adapter, int index) 
	struct cmac *mac;

	u32 val;



	if (index > 9) return NULL;

	if (index > 9)

		return NULL;



	mac = kzalloc(sizeof(*mac) + sizeof(cmac_instance), GFP_KERNEL);

	if (!mac) return NULL;

	if (!mac)

		return NULL;



	mac->ops = &ixf1010_ops;

	mac->instance = (cmac_instance *)(mac + 1);

drivers/net/chelsio/mv88e1xxx.c

+4 −2
Original line number Diff line number Diff line
@@ -308,7 +308,8 @@ static int mv88e1xxx_interrupt_handler(struct cphy *cphy) 
				MV88E1XXX_INTERRUPT_STATUS_REGISTER,

				&cause);

		cause &= INTR_ENABLE_MASK;

		if (!cause) break;

		if (!cause)

			break;



		if (cause & MV88E1XXX_INTR_LINK_CHNG) {

			(void) simple_mdio_read(cphy,
@@ -360,7 +361,8 @@ static struct cphy *mv88e1xxx_phy_create(adapter_t *adapter, int phy_addr, 
{

	struct cphy *cphy = kzalloc(sizeof(*cphy), GFP_KERNEL);



	if (!cphy) return NULL;

	if (!cphy)

		return NULL;



	cphy_init(cphy, adapter, phy_addr, &mv88e1xxx_ops, mdio_ops);

drivers/net/chelsio/subr.c

+4 −2
Original line number Diff line number Diff line
@@ -612,7 +612,8 @@ int t1_elmer0_ext_intr_handler(adapter_t *adapter) 
                int i, port_bit;

		for_each_port(adapter, i) {

			port_bit = i + 1;

			if (!(cause & (1 << port_bit))) continue;

			if (!(cause & (1 << port_bit)))

				continue;



	                phy = adapter->port[i].phy;

			phy_cause = phy->ops->interrupt_handler(phy);
@@ -688,7 +689,8 @@ int t1_elmer0_ext_intr_handler(adapter_t *adapter) 


			for_each_port(adapter, i) {

				port_bit = i ? i + 1 : 0;

				if (!(cause & (1 << port_bit))) continue;

				if (!(cause & (1 << port_bit)))

					continue;



				phy = adapter->port[i].phy;

				phy_cause = phy->ops->interrupt_handler(phy);

drivers/net/chelsio/vsc7326.c

+2 −1
Original line number Diff line number Diff line
@@ -686,7 +686,8 @@ static struct cmac *vsc7326_mac_create(adapter_t *adapter, int index) 
	int i;



	mac = kzalloc(sizeof(*mac) + sizeof(cmac_instance), GFP_KERNEL);

	if (!mac) return NULL;

	if (!mac)

		return NULL;



	mac->ops = &vsc7326_ops;

	mac->instance = (cmac_instance *)(mac + 1);