Skip to content

L
linux
Commit a2cc1c35 authored by Alexander Viro's avatar Alexander Viro Committed by Jeff Garzik
Browse files
Options

[PATCH] 3c359 iomem annotations 

Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.theplanet.co.uk>
parent 15cc6d41
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 19 deletions
drivers/net/tokenring/3c359.c
View file @ a2cc1c35
...@@ -159,7 +159,7 @@ static void print_tx_state(struct net_device *dev) ...@@ -159,7 +159,7 @@ static void print_tx_state(struct net_device *dev)
struct xl_private *xl_priv = (struct xl_private *)dev->priv ; struct xl_private *xl_priv = (struct xl_private *)dev->priv ;
struct xl_tx_desc *txd ; struct xl_tx_desc *txd ;
u8 *xl_mmio = xl_priv->xl_mmio ; u8 __iomem *xl_mmio = xl_priv->xl_mmio ;
int i ; int i ;
printk("tx_ring_head: %d, tx_ring_tail: %d, free_ent: %d \n",xl_priv->tx_ring_head, printk("tx_ring_head: %d, tx_ring_tail: %d, free_ent: %d \n",xl_priv->tx_ring_head,
...@@ -182,7 +182,7 @@ static void print_rx_state(struct net_device *dev) ...@@ -182,7 +182,7 @@ static void print_rx_state(struct net_device *dev)
struct xl_private *xl_priv = (struct xl_private *)dev->priv ; struct xl_private *xl_priv = (struct xl_private *)dev->priv ;
struct xl_rx_desc *rxd ; struct xl_rx_desc *rxd ;
u8 *xl_mmio = xl_priv->xl_mmio ; u8 __iomem *xl_mmio = xl_priv->xl_mmio ;
int i ; int i ;
printk("rx_ring_tail: %d \n", xl_priv->rx_ring_tail) ; printk("rx_ring_tail: %d \n", xl_priv->rx_ring_tail) ;
...@@ -215,7 +215,7 @@ static void print_rx_state(struct net_device *dev) ...@@ -215,7 +215,7 @@ static void print_rx_state(struct net_device *dev)
static u16 xl_ee_read(struct net_device *dev, int ee_addr) static u16 xl_ee_read(struct net_device *dev, int ee_addr)
{ {
struct xl_private *xl_priv = (struct xl_private *)dev->priv ; struct xl_private *xl_priv = (struct xl_private *)dev->priv ;
u8 *xl_mmio = xl_priv->xl_mmio ; u8 __iomem *xl_mmio = xl_priv->xl_mmio ;
/* Wait for EEProm to not be busy */ /* Wait for EEProm to not be busy */
writel(IO_WORD_READ | EECONTROL, xl_mmio + MMIO_MAC_ACCESS_CMD) ; writel(IO_WORD_READ | EECONTROL, xl_mmio + MMIO_MAC_ACCESS_CMD) ;
...@@ -247,7 +247,7 @@ static u16 xl_ee_read(struct net_device *dev, int ee_addr) ...@@ -247,7 +247,7 @@ static u16 xl_ee_read(struct net_device *dev, int ee_addr)
static void xl_ee_write(struct net_device *dev, int ee_addr, u16 ee_value) static void xl_ee_write(struct net_device *dev, int ee_addr, u16 ee_value)
{ {
struct xl_private *xl_priv = (struct xl_private *)dev->priv ; struct xl_private *xl_priv = (struct xl_private *)dev->priv ;
u8 *xl_mmio = xl_priv->xl_mmio ; u8 __iomem *xl_mmio = xl_priv->xl_mmio ;
/* Wait for EEProm to not be busy */ /* Wait for EEProm to not be busy */
writel(IO_WORD_READ | EECONTROL, xl_mmio + MMIO_MAC_ACCESS_CMD) ; writel(IO_WORD_READ | EECONTROL, xl_mmio + MMIO_MAC_ACCESS_CMD) ;
...@@ -386,7 +386,7 @@ static int __init xl_init(struct net_device *dev) ...@@ -386,7 +386,7 @@ static int __init xl_init(struct net_device *dev)
static int xl_hw_reset(struct net_device *dev) static int xl_hw_reset(struct net_device *dev)
{ {
struct xl_private *xl_priv = (struct xl_private *)dev->priv ; struct xl_private *xl_priv = (struct xl_private *)dev->priv ;
u8 *xl_mmio = xl_priv->xl_mmio ; u8 __iomem *xl_mmio = xl_priv->xl_mmio ;
unsigned long t ; unsigned long t ;
u16 i ; u16 i ;
u16 result_16 ; u16 result_16 ;
...@@ -569,7 +569,7 @@ static int xl_hw_reset(struct net_device *dev) ...@@ -569,7 +569,7 @@ static int xl_hw_reset(struct net_device *dev)
static int xl_open(struct net_device *dev) static int xl_open(struct net_device *dev)
{ {
struct xl_private *xl_priv=(struct xl_private *)dev->priv; struct xl_private *xl_priv=(struct xl_private *)dev->priv;
u8 * xl_mmio = xl_priv->xl_mmio ; u8 __iomem *xl_mmio = xl_priv->xl_mmio ;
u8 i ; u8 i ;
u16 hwaddr[3] ; /* Should be u8[6] but we get word return values */ u16 hwaddr[3] ; /* Should be u8[6] but we get word return values */
int open_err ; int open_err ;
...@@ -727,7 +727,7 @@ static int xl_open(struct net_device *dev) ...@@ -727,7 +727,7 @@ static int xl_open(struct net_device *dev)
static int xl_open_hw(struct net_device *dev) static int xl_open_hw(struct net_device *dev)
{ {
struct xl_private *xl_priv=(struct xl_private *)dev->priv; struct xl_private *xl_priv=(struct xl_private *)dev->priv;
u8 * xl_mmio = xl_priv->xl_mmio ; u8 __iomem *xl_mmio = xl_priv->xl_mmio ;
u16 vsoff ; u16 vsoff ;
char ver_str[33]; char ver_str[33];
int open_err ; int open_err ;
...@@ -891,7 +891,7 @@ static void adv_rx_ring(struct net_device *dev) /* Advance rx_ring, cut down on ...@@ -891,7 +891,7 @@ static void adv_rx_ring(struct net_device *dev) /* Advance rx_ring, cut down on
static void xl_rx(struct net_device *dev) static void xl_rx(struct net_device *dev)
{ {
struct xl_private *xl_priv=(struct xl_private *)dev->priv; struct xl_private *xl_priv=(struct xl_private *)dev->priv;
u8 * xl_mmio = xl_priv->xl_mmio ; u8 __iomem * xl_mmio = xl_priv->xl_mmio ;
struct sk_buff *skb, *skb2 ; struct sk_buff *skb, *skb2 ;
int frame_length = 0, copy_len = 0 ; int frame_length = 0, copy_len = 0 ;
int temp_ring_loc ; int temp_ring_loc ;
...@@ -999,7 +999,7 @@ static void xl_rx(struct net_device *dev) ...@@ -999,7 +999,7 @@ static void xl_rx(struct net_device *dev)
static void xl_reset(struct net_device *dev) static void xl_reset(struct net_device *dev)
{ {
struct xl_private *xl_priv=(struct xl_private *)dev->priv; struct xl_private *xl_priv=(struct xl_private *)dev->priv;
u8 * xl_mmio = xl_priv->xl_mmio ; u8 __iomem * xl_mmio = xl_priv->xl_mmio ;
unsigned long t; unsigned long t;
writew( GLOBAL_RESET, xl_mmio + MMIO_COMMAND ) ; writew( GLOBAL_RESET, xl_mmio + MMIO_COMMAND ) ;
...@@ -1046,7 +1046,7 @@ static irqreturn_t xl_interrupt(int irq, void *dev_id, struct pt_regs *regs) ...@@ -1046,7 +1046,7 @@ static irqreturn_t xl_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{ {
struct net_device *dev = (struct net_device *)dev_id; struct net_device *dev = (struct net_device *)dev_id;
struct xl_private *xl_priv =(struct xl_private *)dev->priv; struct xl_private *xl_priv =(struct xl_private *)dev->priv;
u8 * xl_mmio = xl_priv->xl_mmio ; u8 __iomem * xl_mmio = xl_priv->xl_mmio ;
u16 intstatus, macstatus ; u16 intstatus, macstatus ;
if (!dev) { if (!dev) {
...@@ -1234,7 +1234,7 @@ static int xl_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -1234,7 +1234,7 @@ static int xl_xmit(struct sk_buff *skb, struct net_device *dev)
static void xl_dn_comp(struct net_device *dev) static void xl_dn_comp(struct net_device *dev)
{ {
struct xl_private *xl_priv=(struct xl_private *)dev->priv; struct xl_private *xl_priv=(struct xl_private *)dev->priv;
u8 * xl_mmio = xl_priv->xl_mmio ; u8 __iomem * xl_mmio = xl_priv->xl_mmio ;
struct xl_tx_desc *txd ; struct xl_tx_desc *txd ;
...@@ -1270,7 +1270,7 @@ static void xl_dn_comp(struct net_device *dev) ...@@ -1270,7 +1270,7 @@ static void xl_dn_comp(struct net_device *dev)
static int xl_close(struct net_device *dev) static int xl_close(struct net_device *dev)
{ {
struct xl_private *xl_priv = (struct xl_private *) dev->priv ; struct xl_private *xl_priv = (struct xl_private *) dev->priv ;
u8 * xl_mmio = xl_priv->xl_mmio ; u8 __iomem * xl_mmio = xl_priv->xl_mmio ;
unsigned long t ; unsigned long t ;
netif_stop_queue(dev) ; netif_stop_queue(dev) ;
...@@ -1409,7 +1409,7 @@ static void xl_set_rx_mode(struct net_device *dev) ...@@ -1409,7 +1409,7 @@ static void xl_set_rx_mode(struct net_device *dev)
static void xl_srb_bh(struct net_device *dev) static void xl_srb_bh(struct net_device *dev)
{ {
struct xl_private *xl_priv = (struct xl_private *) dev->priv ; struct xl_private *xl_priv = (struct xl_private *) dev->priv ;
u8 * xl_mmio = xl_priv->xl_mmio ; u8 __iomem * xl_mmio = xl_priv->xl_mmio ;
u8 srb_cmd, ret_code ; u8 srb_cmd, ret_code ;
int i ; int i ;
...@@ -1506,7 +1506,7 @@ static int xl_set_mac_address (struct net_device *dev, void *addr) ...@@ -1506,7 +1506,7 @@ static int xl_set_mac_address (struct net_device *dev, void *addr)
static void xl_arb_cmd(struct net_device *dev) static void xl_arb_cmd(struct net_device *dev)
{ {
struct xl_private *xl_priv = (struct xl_private *) dev->priv; struct xl_private *xl_priv = (struct xl_private *) dev->priv;
u8 * xl_mmio = xl_priv->xl_mmio ; u8 __iomem * xl_mmio = xl_priv->xl_mmio ;
u8 arb_cmd ; u8 arb_cmd ;
u16 lan_status, lan_status_diff ; u16 lan_status, lan_status_diff ;
...@@ -1634,7 +1634,7 @@ static void xl_arb_cmd(struct net_device *dev) ...@@ -1634,7 +1634,7 @@ static void xl_arb_cmd(struct net_device *dev)
static void xl_asb_cmd(struct net_device *dev) static void xl_asb_cmd(struct net_device *dev)
{ {
struct xl_private *xl_priv = (struct xl_private *) dev->priv ; struct xl_private *xl_priv = (struct xl_private *) dev->priv ;
u8 * xl_mmio = xl_priv->xl_mmio ; u8 __iomem * xl_mmio = xl_priv->xl_mmio ;
if (xl_priv->asb_queued == 1) if (xl_priv->asb_queued == 1)
writel(ACK_INTERRUPT | LATCH_ACK | ASBFACK, xl_mmio + MMIO_COMMAND) ; writel(ACK_INTERRUPT | LATCH_ACK | ASBFACK, xl_mmio + MMIO_COMMAND) ;
...@@ -1665,7 +1665,7 @@ static void xl_asb_cmd(struct net_device *dev) ...@@ -1665,7 +1665,7 @@ static void xl_asb_cmd(struct net_device *dev)
static void xl_asb_bh(struct net_device *dev) static void xl_asb_bh(struct net_device *dev)
{ {
struct xl_private *xl_priv = (struct xl_private *) dev->priv ; struct xl_private *xl_priv = (struct xl_private *) dev->priv ;
u8 * xl_mmio = xl_priv->xl_mmio ; u8 __iomem * xl_mmio = xl_priv->xl_mmio ;
u8 ret_code ; u8 ret_code ;
writel(MMIO_BYTE_READ | 0xd0000 | xl_priv->asb | 2, xl_mmio + MMIO_MAC_ACCESS_CMD) ; writel(MMIO_BYTE_READ | 0xd0000 | xl_priv->asb | 2, xl_mmio + MMIO_MAC_ACCESS_CMD) ;
...@@ -1693,7 +1693,7 @@ static void xl_asb_bh(struct net_device *dev) ...@@ -1693,7 +1693,7 @@ static void xl_asb_bh(struct net_device *dev)
static void xl_srb_cmd(struct net_device *dev, int srb_cmd) static void xl_srb_cmd(struct net_device *dev, int srb_cmd)
{ {
struct xl_private *xl_priv = (struct xl_private *) dev->priv ; struct xl_private *xl_priv = (struct xl_private *) dev->priv ;
u8 * xl_mmio = xl_priv->xl_mmio ; u8 __iomem * xl_mmio = xl_priv->xl_mmio ;
switch (srb_cmd) { switch (srb_cmd) {
case READ_LOG: case READ_LOG:
...@@ -1750,7 +1750,7 @@ static void xl_srb_cmd(struct net_device *dev, int srb_cmd) ...@@ -1750,7 +1750,7 @@ static void xl_srb_cmd(struct net_device *dev, int srb_cmd)
static void xl_wait_misr_flags(struct net_device *dev) static void xl_wait_misr_flags(struct net_device *dev)
{ {
struct xl_private *xl_priv = (struct xl_private *) dev->priv ; struct xl_private *xl_priv = (struct xl_private *) dev->priv ;
u8 * xl_mmio = xl_priv->xl_mmio ; u8 __iomem * xl_mmio = xl_priv->xl_mmio ;
int i ; int i ;
......
drivers/net/tokenring/3c359.h
View file @ a2cc1c35
...@@ -263,7 +263,7 @@ struct xl_private { ...@@ -263,7 +263,7 @@ struct xl_private {
u16 arb; u16 arb;
u16 asb; u16 asb;
u8 *xl_mmio; u8 __iomem *xl_mmio;
char *xl_card_name; char *xl_card_name;
struct pci_dev *pdev ; struct pci_dev *pdev ;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7