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

Commit 2c265f74 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files

staging: octeon-ethernet: drop poll_now parameter from cvm_oct_common_open 



Drop redundant poll_now parameter from cvm_oct_common_open.

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 064e0835

drivers/staging/octeon/ethernet-rgmii.c

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ static irqreturn_t cvm_oct_rgmii_rml_interrupt(int cpl, void *dev_id) 


int cvm_oct_rgmii_open(struct net_device *dev)

{

	return cvm_oct_common_open(dev, cvm_oct_rgmii_poll, true);

	return cvm_oct_common_open(dev, cvm_oct_rgmii_poll);

}



static void cvm_oct_rgmii_immediate_poll(struct work_struct *work)

drivers/staging/octeon/ethernet-sgmii.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 


int cvm_oct_sgmii_open(struct net_device *dev)

{

	return cvm_oct_common_open(dev, cvm_oct_link_poll, true);

	return cvm_oct_common_open(dev, cvm_oct_link_poll);

}



int cvm_oct_sgmii_init(struct net_device *dev)

drivers/staging/octeon/ethernet-xaui.c

+1 −1
Original line number Diff line number Diff line
@@ -27,5 +27,5 @@ 


int cvm_oct_xaui_open(struct net_device *dev)

{

	return cvm_oct_common_open(dev, cvm_oct_link_poll, true);

	return cvm_oct_common_open(dev, cvm_oct_link_poll);

}

drivers/staging/octeon/ethernet.c

+2 −3
Original line number Diff line number Diff line
@@ -481,7 +481,7 @@ void cvm_oct_common_uninit(struct net_device *dev) 
}



int cvm_oct_common_open(struct net_device *dev,

			void (*link_poll)(struct net_device *), bool poll_now)

			void (*link_poll)(struct net_device *))

{

	union cvmx_gmxx_prtx_cfg gmx_cfg;

	struct octeon_ethernet *priv = netdev_priv(dev);
@@ -512,7 +512,6 @@ int cvm_oct_common_open(struct net_device *dev, 
		if (!link_info.s.link_up)

			netif_carrier_off(dev);

		priv->poll = link_poll;

		if (poll_now)

		link_poll(dev);

	}

drivers/staging/octeon/octeon-ethernet.h

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ void cvm_oct_common_uninit(struct net_device *dev); 
void cvm_oct_adjust_link(struct net_device *dev);

int cvm_oct_common_stop(struct net_device *dev);

int cvm_oct_common_open(struct net_device *dev,

			void (*link_poll)(struct net_device *), bool poll_now);

			void (*link_poll)(struct net_device *));

void cvm_oct_note_carrier(struct octeon_ethernet *priv,

			  cvmx_helper_link_info_t li);

void cvm_oct_link_poll(struct net_device *dev);