Commit 7a769183 authored by Christophe Leroy's avatar Christophe Leroy Committed by Jakub Kicinski
Browse files

net: fs_enet: Move struct fs_platform_info into fs_enet.h 



struct fs_platform_info is only used in fs_enet ethernet driver since
commit 3dd82a1e ("[POWERPC] CPM: Always use new binding.").

Stale prototypes using fs_platform_info were left over in
arch/powerpc/sysdev/fsl_soc.c but they are now removed by
previous patch.

Move struct fs_platform_info into fs_enet.h

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://lore.kernel.org/r/f882d6b0b7075d0d8435310634ceaa2cc8e9938f.1691155347.git.christophe.leroy@csgroup.eu


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 62e106c8

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

+18 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#ifndef FS_ENET_H

#define FS_ENET_H



#include <linux/clk.h>

#include <linux/mii.h>

#include <linux/netdevice.h>

#include <linux/types.h>
@@ -9,7 +10,6 @@ 
#include <linux/phy.h>

#include <linux/dma-mapping.h>



#include <linux/fs_enet_pd.h>

#include <asm/fs_pd.h>



#ifdef CONFIG_CPM1
@@ -118,6 +118,23 @@ struct phy_info { 
#define ENET_RX_ALIGN  16

#define ENET_RX_FRSIZE L1_CACHE_ALIGN(PKT_MAXBUF_SIZE + ENET_RX_ALIGN - 1)



struct fs_platform_info {

	/* device specific information */

	u32 cp_command;		/* CPM page/sblock/mcn */



	u32 dpram_offset;



	struct device_node *phy_node;



	int rx_ring, tx_ring;	/* number of buffers on rx	*/

	int rx_copybreak;	/* limit we copy small frames	*/

	int napi_weight;	/* NAPI weight			*/



	int use_rmii;		/* use RMII mode		*/



	struct clk *clk_per;	/* 'per' clock for register access */

};



struct fs_enet_private {

	struct napi_struct napi;

	struct device *dev;	/* pointer back to the device (must be initialized first) */

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

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

#include <linux/platform_device.h>

#include <linux/of_address.h>

#include <linux/of_mdio.h>

#include <linux/of_platform.h>

#include <linux/pgtable.h>

include/linux/fs_enet_pd.h

+0 −16
Original line number Diff line number Diff line
@@ -110,22 +110,6 @@ struct fs_mii_bb_platform_info { 
	int irq[32]; 	/* irqs per phy's */

};



struct fs_platform_info {

	/* device specific information */

	u32 cp_command;		/* CPM page/sblock/mcn */



	u32 dpram_offset;

	

	struct device_node *phy_node;



	int rx_ring, tx_ring;	/* number of buffers on rx     */

	int rx_copybreak;	/* limit we copy small frames  */

	int napi_weight;	/* NAPI weight                 */



	int use_rmii;		/* use RMII mode 	       */



	struct clk *clk_per;	/* 'per' clock for register access */

};

struct fs_mii_fec_platform_info {

	u32 irq[32];

	u32 mii_speed;