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

Commit ad01b7d4 authored by Giuseppe CAVALLARO's avatar Giuseppe CAVALLARO Committed by David S. Miller
Browse files

stmmac: make ioaddr 'void __iomem *' rather than unsigned long 



This avoids unnecessary casting and adds the ioaddr in the
private structure.
This patch also removes many warning when compile the driver.

Signed-off-by: default avatarGiuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ac75791a

drivers/net/stmmac/common.h

+25 −25
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ struct stmmac_desc_ops { 
	int (*get_tx_ls) (struct dma_desc *p);

	/* Return the transmit status looking at the TDES1 */

	int (*tx_status) (void *data, struct stmmac_extra_stats *x,

			  struct dma_desc *p, unsigned long ioaddr);

			  struct dma_desc *p, void __iomem *ioaddr);

	/* Get the buffer size from the descriptor */

	int (*get_tx_len) (struct dma_desc *p);

	/* Handle extra events on specific interrupts hw dependent */
@@ -182,44 +182,44 @@ struct stmmac_desc_ops { 


struct stmmac_dma_ops {

	/* DMA core initialization */

	int (*init) (unsigned long ioaddr, int pbl, u32 dma_tx, u32 dma_rx);

	int (*init) (void __iomem *ioaddr, int pbl, u32 dma_tx, u32 dma_rx);

	/* Dump DMA registers */

	void (*dump_regs) (unsigned long ioaddr);

	void (*dump_regs) (void __iomem *ioaddr);

	/* Set tx/rx threshold in the csr6 register

	 * An invalid value enables the store-and-forward mode */

	void (*dma_mode) (unsigned long ioaddr, int txmode, int rxmode);

	void (*dma_mode) (void __iomem *ioaddr, int txmode, int rxmode);

	/* To track extra statistic (if supported) */

	void (*dma_diagnostic_fr) (void *data, struct stmmac_extra_stats *x,

				   unsigned long ioaddr);

	void (*enable_dma_transmission) (unsigned long ioaddr);

	void (*enable_dma_irq) (unsigned long ioaddr);

	void (*disable_dma_irq) (unsigned long ioaddr);

	void (*start_tx) (unsigned long ioaddr);

	void (*stop_tx) (unsigned long ioaddr);

	void (*start_rx) (unsigned long ioaddr);

	void (*stop_rx) (unsigned long ioaddr);

	int (*dma_interrupt) (unsigned long ioaddr,

				   void __iomem *ioaddr);

	void (*enable_dma_transmission) (void __iomem *ioaddr);

	void (*enable_dma_irq) (void __iomem *ioaddr);

	void (*disable_dma_irq) (void __iomem *ioaddr);

	void (*start_tx) (void __iomem *ioaddr);

	void (*stop_tx) (void __iomem *ioaddr);

	void (*start_rx) (void __iomem *ioaddr);

	void (*stop_rx) (void __iomem *ioaddr);

	int (*dma_interrupt) (void __iomem *ioaddr,

			      struct stmmac_extra_stats *x);

};



struct stmmac_ops {

	/* MAC core initialization */

	void (*core_init) (unsigned long ioaddr) ____cacheline_aligned;

	void (*core_init) (void __iomem *ioaddr) ____cacheline_aligned;

	/* Dump MAC registers */

	void (*dump_regs) (unsigned long ioaddr);

	void (*dump_regs) (void __iomem *ioaddr);

	/* Handle extra events on specific interrupts hw dependent */

	void (*host_irq_status) (unsigned long ioaddr);

	void (*host_irq_status) (void __iomem *ioaddr);

	/* Multicast filter setting */

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

	/* Flow control setting */

	void (*flow_ctrl) (unsigned long ioaddr, unsigned int duplex,

	void (*flow_ctrl) (void __iomem *ioaddr, unsigned int duplex,

			   unsigned int fc, unsigned int pause_time);

	/* Set power management mode (e.g. magic frame) */

	void (*pmt) (unsigned long ioaddr, unsigned long mode);

	void (*pmt) (void __iomem *ioaddr, unsigned long mode);

	/* Set/Get Unicast MAC addresses */

	void (*set_umac_addr) (unsigned long ioaddr, unsigned char *addr,

	void (*set_umac_addr) (void __iomem *ioaddr, unsigned char *addr,

			       unsigned int reg_n);

	void (*get_umac_addr) (unsigned long ioaddr, unsigned char *addr,

	void (*get_umac_addr) (void __iomem *ioaddr, unsigned char *addr,

			       unsigned int reg_n);

};
@@ -243,11 +243,11 @@ struct mac_device_info { 
	struct mac_link link;

};



struct mac_device_info *dwmac1000_setup(unsigned long addr);

struct mac_device_info *dwmac100_setup(unsigned long addr);

struct mac_device_info *dwmac1000_setup(void __iomem *ioaddr);

struct mac_device_info *dwmac100_setup(void __iomem *ioaddr);



extern void stmmac_set_mac_addr(unsigned long ioaddr, u8 addr[6],

extern void stmmac_set_mac_addr(void __iomem *ioaddr, u8 addr[6],

				unsigned int high, unsigned int low);

extern void stmmac_get_mac_addr(unsigned long ioaddr, unsigned char *addr,

extern void stmmac_get_mac_addr(void __iomem *ioaddr, unsigned char *addr,

				unsigned int high, unsigned int low);

extern void dwmac_dma_flush_tx_fifo(unsigned long ioaddr);
 
extern void dwmac_dma_flush_tx_fifo(void __iomem *ioaddr);

drivers/net/stmmac/dwmac1000_core.c

+9 −9
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include <linux/slab.h>

#include "dwmac1000.h"



static void dwmac1000_core_init(unsigned long ioaddr)

static void dwmac1000_core_init(void __iomem *ioaddr)

{

	u32 value = readl(ioaddr + GMAC_CONTROL);

	value |= GMAC_CORE_INIT;
@@ -50,7 +50,7 @@ static void dwmac1000_core_init(unsigned long ioaddr) 
#endif

}



static void dwmac1000_dump_regs(unsigned long ioaddr)

static void dwmac1000_dump_regs(void __iomem *ioaddr)

{

	int i;

	pr_info("\tDWMAC1000 regs (base addr = 0x%8x)\n", (unsigned int)ioaddr);
@@ -62,14 +62,14 @@ static void dwmac1000_dump_regs(unsigned long ioaddr) 
	}

}



static void dwmac1000_set_umac_addr(unsigned long ioaddr, unsigned char *addr,

static void dwmac1000_set_umac_addr(void __iomem *ioaddr, unsigned char *addr,

				unsigned int reg_n)

{

	stmmac_set_mac_addr(ioaddr, addr, GMAC_ADDR_HIGH(reg_n),

				GMAC_ADDR_LOW(reg_n));

}



static void dwmac1000_get_umac_addr(unsigned long ioaddr, unsigned char *addr,

static void dwmac1000_get_umac_addr(void __iomem *ioaddr, unsigned char *addr,

				unsigned int reg_n)

{

	stmmac_get_mac_addr(ioaddr, addr, GMAC_ADDR_HIGH(reg_n),
@@ -78,7 +78,7 @@ static void dwmac1000_get_umac_addr(unsigned long ioaddr, unsigned char *addr, 


static void dwmac1000_set_filter(struct net_device *dev)

{

	unsigned long ioaddr = dev->base_addr;

	void __iomem *ioaddr = (void __iomem *) dev->base_addr;

	unsigned int value = 0;



	CHIP_DBG(KERN_INFO "%s: # mcasts %d, # unicast %d\n",
@@ -139,7 +139,7 @@ static void dwmac1000_set_filter(struct net_device *dev) 
	    readl(ioaddr + GMAC_HASH_HIGH), readl(ioaddr + GMAC_HASH_LOW));

}



static void dwmac1000_flow_ctrl(unsigned long ioaddr, unsigned int duplex,

static void dwmac1000_flow_ctrl(void __iomem *ioaddr, unsigned int duplex,

			   unsigned int fc, unsigned int pause_time)

{

	unsigned int flow = 0;
@@ -162,7 +162,7 @@ static void dwmac1000_flow_ctrl(unsigned long ioaddr, unsigned int duplex, 
	writel(flow, ioaddr + GMAC_FLOW_CTRL);

}



static void dwmac1000_pmt(unsigned long ioaddr, unsigned long mode)

static void dwmac1000_pmt(void __iomem *ioaddr, unsigned long mode)

{

	unsigned int pmt = 0;
@@ -178,7 +178,7 @@ static void dwmac1000_pmt(unsigned long ioaddr, unsigned long mode) 
}





static void dwmac1000_irq_status(unsigned long ioaddr)

static void dwmac1000_irq_status(void __iomem *ioaddr)

{

	u32 intr_status = readl(ioaddr + GMAC_INT_STATUS);
@@ -211,7 +211,7 @@ struct stmmac_ops dwmac1000_ops = { 
	.get_umac_addr = dwmac1000_get_umac_addr,

};



struct mac_device_info *dwmac1000_setup(unsigned long ioaddr)

struct mac_device_info *dwmac1000_setup(void __iomem *ioaddr)

{

	struct mac_device_info *mac;

	u32 uid = readl(ioaddr + GMAC_VERSION);

drivers/net/stmmac/dwmac1000_dma.c

+4 −4
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include "dwmac1000.h"

#include "dwmac_dma.h"



static int dwmac1000_dma_init(unsigned long ioaddr, int pbl, u32 dma_tx,

static int dwmac1000_dma_init(void __iomem *ioaddr, int pbl, u32 dma_tx,

			      u32 dma_rx)

{

	u32 value = readl(ioaddr + DMA_BUS_MODE);
@@ -58,7 +58,7 @@ static int dwmac1000_dma_init(unsigned long ioaddr, int pbl, u32 dma_tx, 
	return 0;

}



static void dwmac1000_dma_operation_mode(unsigned long ioaddr, int txmode,

static void dwmac1000_dma_operation_mode(void __iomem *ioaddr, int txmode,

				    int rxmode)

{

	u32 csr6 = readl(ioaddr + DMA_CONTROL);
@@ -111,12 +111,12 @@ static void dwmac1000_dma_operation_mode(unsigned long ioaddr, int txmode, 


/* Not yet implemented --- no RMON module */

static void dwmac1000_dma_diagnostic_fr(void *data,

		  struct stmmac_extra_stats *x, unsigned long ioaddr)

		  struct stmmac_extra_stats *x, void __iomem *ioaddr)

{

	return;

}



static void dwmac1000_dump_dma_regs(unsigned long ioaddr)

static void dwmac1000_dump_dma_regs(void __iomem *ioaddr)

{

	int i;

	pr_info(" DMA registers\n");

drivers/net/stmmac/dwmac100_core.c

+10 −10
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#include <linux/crc32.h>

#include "dwmac100.h"



static void dwmac100_core_init(unsigned long ioaddr)

static void dwmac100_core_init(void __iomem *ioaddr)

{

	u32 value = readl(ioaddr + MAC_CONTROL);
@@ -42,7 +42,7 @@ static void dwmac100_core_init(unsigned long ioaddr) 
#endif

}



static void dwmac100_dump_mac_regs(unsigned long ioaddr)

static void dwmac100_dump_mac_regs(void __iomem *ioaddr)

{

	pr_info("\t----------------------------------------------\n"

		"\t  DWMAC 100 CSR (base addr = 0x%8x)\n"
@@ -77,18 +77,18 @@ static void dwmac100_dump_mac_regs(unsigned long ioaddr) 
		MMC_LOW_INTR_MASK, readl(ioaddr + MMC_LOW_INTR_MASK));

}



static void dwmac100_irq_status(unsigned long ioaddr)

static void dwmac100_irq_status(void __iomem *ioaddr)

{

	return;

}



static void dwmac100_set_umac_addr(unsigned long ioaddr, unsigned char *addr,

static void dwmac100_set_umac_addr(void __iomem *ioaddr, unsigned char *addr,

				   unsigned int reg_n)

{

	stmmac_set_mac_addr(ioaddr, addr, MAC_ADDR_HIGH, MAC_ADDR_LOW);

}



static void dwmac100_get_umac_addr(unsigned long ioaddr, unsigned char *addr,

static void dwmac100_get_umac_addr(void __iomem *ioaddr, unsigned char *addr,

				   unsigned int reg_n)

{

	stmmac_get_mac_addr(ioaddr, addr, MAC_ADDR_HIGH, MAC_ADDR_LOW);
@@ -96,7 +96,7 @@ static void dwmac100_get_umac_addr(unsigned long ioaddr, unsigned char *addr, 


static void dwmac100_set_filter(struct net_device *dev)

{

	unsigned long ioaddr = dev->base_addr;

	void __iomem *ioaddr = (void __iomem *) dev->base_addr;

	u32 value = readl(ioaddr + MAC_CONTROL);



	if (dev->flags & IFF_PROMISC) {
@@ -145,7 +145,7 @@ static void dwmac100_set_filter(struct net_device *dev) 
	    readl(ioaddr + MAC_HASH_HIGH), readl(ioaddr + MAC_HASH_LOW));

}



static void dwmac100_flow_ctrl(unsigned long ioaddr, unsigned int duplex,

static void dwmac100_flow_ctrl(void __iomem *ioaddr, unsigned int duplex,

			       unsigned int fc, unsigned int pause_time)

{

	unsigned int flow = MAC_FLOW_CTRL_ENABLE;
@@ -158,7 +158,7 @@ static void dwmac100_flow_ctrl(unsigned long ioaddr, unsigned int duplex, 
/* No PMT module supported for this Ethernet Controller.

 * Tested on ST platforms only.

 */

static void dwmac100_pmt(unsigned long ioaddr, unsigned long mode)

static void dwmac100_pmt(void __iomem *ioaddr, unsigned long mode)

{

	return;

}
@@ -174,7 +174,7 @@ struct stmmac_ops dwmac100_ops = { 
	.get_umac_addr = dwmac100_get_umac_addr,

};



struct mac_device_info *dwmac100_setup(unsigned long ioaddr)

struct mac_device_info *dwmac100_setup(void __iomem *ioaddr)

{

	struct mac_device_info *mac;

drivers/net/stmmac/dwmac100_dma.c

+4 −4
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#include "dwmac100.h"

#include "dwmac_dma.h"



static int dwmac100_dma_init(unsigned long ioaddr, int pbl, u32 dma_tx,

static int dwmac100_dma_init(void __iomem *ioaddr, int pbl, u32 dma_tx,

			     u32 dma_rx)

{

	u32 value = readl(ioaddr + DMA_BUS_MODE);
@@ -58,7 +58,7 @@ static int dwmac100_dma_init(unsigned long ioaddr, int pbl, u32 dma_tx, 
/* Store and Forward capability is not used at all..

 * The transmit threshold can be programmed by

 * setting the TTC bits in the DMA control register.*/

static void dwmac100_dma_operation_mode(unsigned long ioaddr, int txmode,

static void dwmac100_dma_operation_mode(void __iomem *ioaddr, int txmode,

					int rxmode)

{

	u32 csr6 = readl(ioaddr + DMA_CONTROL);
@@ -73,7 +73,7 @@ static void dwmac100_dma_operation_mode(unsigned long ioaddr, int txmode, 
	writel(csr6, ioaddr + DMA_CONTROL);

}



static void dwmac100_dump_dma_regs(unsigned long ioaddr)

static void dwmac100_dump_dma_regs(void __iomem *ioaddr)

{

	int i;
@@ -91,7 +91,7 @@ static void dwmac100_dump_dma_regs(unsigned long ioaddr) 
/* DMA controller has two counters to track the number of

 * the receive missed frames. */

static void dwmac100_dma_diagnostic_fr(void *data, struct stmmac_extra_stats *x,

				       unsigned long ioaddr)

				       void __iomem *ioaddr)

{

	struct net_device_stats *stats = (struct net_device_stats *)data;

	u32 csr8 = readl(ioaddr + DMA_MISSED_FRAME_CTR);