Commit 6b576b2d authored by Maxime Chevallier's avatar Maxime Chevallier Committed by David S. Miller
Browse files

net: ethernet: fs_enet: drop unused phy_info and mii_if_info 



There's no user of the struct phy_info, the 'phy' field and the
mii_if_info in the fs_enet driver, probably dating back when phylib
wasn't as widely used.  Drop these from the driver code.

As the definition for struct mii_if_info is no longer required, drop the
include for linux/mii.h altogether in the driver.

Acked-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Reviewed-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarMaxime Chevallier <maxime.chevallier@bootlin.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent aa3672be

drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <linux/etherdevice.h>

#include <linux/skbuff.h>

#include <linux/spinlock.h>

#include <linux/mii.h>

#include <linux/ethtool.h>

#include <linux/bitops.h>

#include <linux/fs.h>

drivers/net/ethernet/freescale/fs_enet/fs_enet.h

+0 −12
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
#define FS_ENET_H



#include <linux/clk.h>

#include <linux/mii.h>

#include <linux/netdevice.h>

#include <linux/types.h>

#include <linux/list.h>
@@ -92,14 +91,6 @@ struct fs_ops { 
	void (*tx_restart)(struct net_device *dev);

};



struct phy_info {

	unsigned int id;

	const char *name;

	void (*startup) (struct net_device * dev);

	void (*shutdown) (struct net_device * dev);

	void (*ack_int) (struct net_device * dev);

};



/* The FEC stores dest/src/type, data, and checksum for receive packets.

 */

#define MAX_MTU 1508		/* Allow fullsized pppoe packets over VLAN */
@@ -153,10 +144,7 @@ struct fs_enet_private { 
	cbd_t __iomem *cur_rx;

	cbd_t __iomem *cur_tx;

	int tx_free;

	const struct phy_info *phy;

	u32 msg_enable;

	struct mii_if_info mii_if;

	unsigned int last_mii_status;

	int interrupt;



	int oldduplex, oldspeed, oldlink;	/* current settings */

drivers/net/ethernet/freescale/fs_enet/mac-fcc.c

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <linux/etherdevice.h>

#include <linux/skbuff.h>

#include <linux/spinlock.h>

#include <linux/mii.h>

#include <linux/ethtool.h>

#include <linux/bitops.h>

#include <linux/fs.h>

drivers/net/ethernet/freescale/fs_enet/mac-fec.c

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <linux/etherdevice.h>

#include <linux/skbuff.h>

#include <linux/spinlock.h>

#include <linux/mii.h>

#include <linux/ethtool.h>

#include <linux/bitops.h>

#include <linux/fs.h>

drivers/net/ethernet/freescale/fs_enet/mac-scc.c

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <linux/etherdevice.h>

#include <linux/skbuff.h>

#include <linux/spinlock.h>

#include <linux/mii.h>

#include <linux/ethtool.h>

#include <linux/bitops.h>

#include <linux/fs.h>