Commit c6b7b1b5 authored by Sean Anderson's avatar Sean Anderson Committed by David S. Miller
Browse files

net: fman: Pass params directly to mac init 



Instead of having the mac init functions call back into the fman core to
get their params, just pass them directly to the init functions.

Signed-off-by: default avatarSean Anderson <sean.anderson@seco.com>
Acked-by: default avatarCamelia Groza <camelia.groza@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 262f2b78

drivers/net/ethernet/freescale/fman/fman_dtsec.c

+3 −7
Original line number Diff line number Diff line
@@ -1474,10 +1474,10 @@ static struct fman_mac *dtsec_config(struct fman_mac_params *params) 
}



int dtsec_initialization(struct mac_device *mac_dev,

			 struct device_node *mac_node)

			 struct device_node *mac_node,

			 struct fman_mac_params *params)

{

	int			err;

	struct fman_mac_params	params;

	struct fman_mac		*dtsec;

	struct device_node	*phy_node;
@@ -1495,11 +1495,7 @@ int dtsec_initialization(struct mac_device *mac_dev, 
	mac_dev->enable			= dtsec_enable;

	mac_dev->disable		= dtsec_disable;



	err = set_fman_mac_params(mac_dev, &params);

	if (err)

		goto _return;



	mac_dev->fman_mac = dtsec_config(&params);

	mac_dev->fman_mac = dtsec_config(params);

	if (!mac_dev->fman_mac) {

		err = -EINVAL;

		goto _return;

drivers/net/ethernet/freescale/fman/fman_dtsec.h

+2 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
struct mac_device;



int dtsec_initialization(struct mac_device *mac_dev,

			 struct device_node *mac_node);

			 struct device_node *mac_node,

			 struct fman_mac_params *params);



#endif /* __DTSEC_H */

drivers/net/ethernet/freescale/fman/fman_memac.c

+5 −9
Original line number Diff line number Diff line
@@ -1154,11 +1154,11 @@ static struct fman_mac *memac_config(struct fman_mac_params *params) 
}



int memac_initialization(struct mac_device *mac_dev,

			 struct device_node *mac_node)

			 struct device_node *mac_node,

			 struct fman_mac_params *params)

{

	int			 err;

	struct device_node	*phy_node;

	struct fman_mac_params	 params;

	struct fixed_phy_status *fixed_link;

	struct fman_mac		*memac;
@@ -1176,14 +1176,10 @@ int memac_initialization(struct mac_device *mac_dev, 
	mac_dev->enable			= memac_enable;

	mac_dev->disable		= memac_disable;



	err = set_fman_mac_params(mac_dev, &params);

	if (err)

		goto _return;



	if (params.max_speed == SPEED_10000)

		params.phy_if = PHY_INTERFACE_MODE_XGMII;

	if (params->max_speed == SPEED_10000)

		params->phy_if = PHY_INTERFACE_MODE_XGMII;



	mac_dev->fman_mac = memac_config(&params);

	mac_dev->fman_mac = memac_config(params);

	if (!mac_dev->fman_mac) {

		err = -EINVAL;

		goto _return;

drivers/net/ethernet/freescale/fman/fman_memac.h

+2 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
struct mac_device;



int memac_initialization(struct mac_device *mac_dev,

			 struct device_node *mac_node);

			 struct device_node *mac_node,

			 struct fman_mac_params *params);



#endif /* __MEMAC_H */

drivers/net/ethernet/freescale/fman/fman_tgec.c

+3 −7
Original line number Diff line number Diff line
@@ -783,10 +783,10 @@ static struct fman_mac *tgec_config(struct fman_mac_params *params) 
}



int tgec_initialization(struct mac_device *mac_dev,

			struct device_node *mac_node)

			struct device_node *mac_node,

			struct fman_mac_params *params)

{

	int err;

	struct fman_mac_params	params;

	struct fman_mac		*tgec;



	mac_dev->set_promisc		= tgec_set_promiscuous;
@@ -803,11 +803,7 @@ int tgec_initialization(struct mac_device *mac_dev, 
	mac_dev->enable			= tgec_enable;

	mac_dev->disable		= tgec_disable;



	err = set_fman_mac_params(mac_dev, &params);

	if (err)

		goto _return;



	mac_dev->fman_mac = tgec_config(&params);

	mac_dev->fman_mac = tgec_config(params);

	if (!mac_dev->fman_mac) {

		err = -EINVAL;

		goto _return;