Skip to content

L
linux
Commit abd36fc1 authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds
Browse files
Options

[PATCH] (25/32) lanstreamer iomem annotations 

Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.theplanet.co.uk>
parent b97c402b
Show whitespace changes
Inline Side-by-side
Showing with 13 additions and 13 deletions
drivers/net/tokenring/lanstreamer.c
View file @ abd36fc1
...@@ -443,7 +443,7 @@ static void __devexit streamer_remove_one(struct pci_dev *pdev) ...@@ -443,7 +443,7 @@ static void __devexit streamer_remove_one(struct pci_dev *pdev)
static int streamer_reset(struct net_device *dev) static int streamer_reset(struct net_device *dev)
{ {
struct streamer_private *streamer_priv; struct streamer_private *streamer_priv;
__u8 *streamer_mmio; __u8 __iomem *streamer_mmio;
unsigned long t; unsigned long t;
unsigned int uaa_addr; unsigned int uaa_addr;
struct sk_buff *skb = NULL; struct sk_buff *skb = NULL;
...@@ -591,7 +591,7 @@ static int streamer_reset(struct net_device *dev) ...@@ -591,7 +591,7 @@ static int streamer_reset(struct net_device *dev)
static int streamer_open(struct net_device *dev) static int streamer_open(struct net_device *dev)
{ {
struct streamer_private *streamer_priv = (struct streamer_private *) dev->priv; struct streamer_private *streamer_priv = (struct streamer_private *) dev->priv;
__u8 *streamer_mmio = streamer_priv->streamer_mmio; __u8 __iomem *streamer_mmio = streamer_priv->streamer_mmio;
unsigned long flags; unsigned long flags;
char open_error[255]; char open_error[255];
int i, open_finished = 1; int i, open_finished = 1;
...@@ -908,7 +908,7 @@ static void streamer_rx(struct net_device *dev) ...@@ -908,7 +908,7 @@ static void streamer_rx(struct net_device *dev)
{ {
struct streamer_private *streamer_priv = struct streamer_private *streamer_priv =
(struct streamer_private *) dev->priv; (struct streamer_private *) dev->priv;
__u8 *streamer_mmio = streamer_priv->streamer_mmio; __u8 __iomem *streamer_mmio = streamer_priv->streamer_mmio;
struct streamer_rx_desc *rx_desc; struct streamer_rx_desc *rx_desc;
int rx_ring_last_received, length, frame_length, buffer_cnt = 0; int rx_ring_last_received, length, frame_length, buffer_cnt = 0;
struct sk_buff *skb, *skb2; struct sk_buff *skb, *skb2;
...@@ -1035,7 +1035,7 @@ static irqreturn_t streamer_interrupt(int irq, void *dev_id, struct pt_regs *reg ...@@ -1035,7 +1035,7 @@ static irqreturn_t streamer_interrupt(int irq, void *dev_id, struct pt_regs *reg
struct net_device *dev = (struct net_device *) dev_id; struct net_device *dev = (struct net_device *) dev_id;
struct streamer_private *streamer_priv = struct streamer_private *streamer_priv =
(struct streamer_private *) dev->priv; (struct streamer_private *) dev->priv;
__u8 *streamer_mmio = streamer_priv->streamer_mmio; __u8 __iomem *streamer_mmio = streamer_priv->streamer_mmio;
__u16 sisr; __u16 sisr;
__u16 misr; __u16 misr;
u8 max_intr = MAX_INTR; u8 max_intr = MAX_INTR;
...@@ -1158,7 +1158,7 @@ static int streamer_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -1158,7 +1158,7 @@ static int streamer_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
struct streamer_private *streamer_priv = struct streamer_private *streamer_priv =
(struct streamer_private *) dev->priv; (struct streamer_private *) dev->priv;
__u8 *streamer_mmio = streamer_priv->streamer_mmio; __u8 __iomem *streamer_mmio = streamer_priv->streamer_mmio;
unsigned long flags ; unsigned long flags ;
spin_lock_irqsave(&streamer_priv->streamer_lock, flags); spin_lock_irqsave(&streamer_priv->streamer_lock, flags);
...@@ -1209,7 +1209,7 @@ static int streamer_close(struct net_device *dev) ...@@ -1209,7 +1209,7 @@ static int streamer_close(struct net_device *dev)
{ {
struct streamer_private *streamer_priv = struct streamer_private *streamer_priv =
(struct streamer_private *) dev->priv; (struct streamer_private *) dev->priv;
__u8 *streamer_mmio = streamer_priv->streamer_mmio; __u8 __iomem *streamer_mmio = streamer_priv->streamer_mmio;
unsigned long flags; unsigned long flags;
int i; int i;
...@@ -1275,7 +1275,7 @@ static void streamer_set_rx_mode(struct net_device *dev) ...@@ -1275,7 +1275,7 @@ static void streamer_set_rx_mode(struct net_device *dev)
{ {
struct streamer_private *streamer_priv = struct streamer_private *streamer_priv =
(struct streamer_private *) dev->priv; (struct streamer_private *) dev->priv;
__u8 *streamer_mmio = streamer_priv->streamer_mmio; __u8 __iomem *streamer_mmio = streamer_priv->streamer_mmio;
__u8 options = 0; __u8 options = 0;
struct dev_mc_list *dmi; struct dev_mc_list *dmi;
unsigned char dev_mc_address[5]; unsigned char dev_mc_address[5];
...@@ -1334,7 +1334,7 @@ static void streamer_set_rx_mode(struct net_device *dev) ...@@ -1334,7 +1334,7 @@ static void streamer_set_rx_mode(struct net_device *dev)
static void streamer_srb_bh(struct net_device *dev) static void streamer_srb_bh(struct net_device *dev)
{ {
struct streamer_private *streamer_priv = (struct streamer_private *) dev->priv; struct streamer_private *streamer_priv = (struct streamer_private *) dev->priv;
__u8 *streamer_mmio = streamer_priv->streamer_mmio; __u8 __iomem *streamer_mmio = streamer_priv->streamer_mmio;
__u16 srb_word; __u16 srb_word;
writew(streamer_priv->srb, streamer_mmio + LAPA); writew(streamer_priv->srb, streamer_mmio + LAPA);
...@@ -1531,7 +1531,7 @@ static void streamer_arb_cmd(struct net_device *dev) ...@@ -1531,7 +1531,7 @@ static void streamer_arb_cmd(struct net_device *dev)
{ {
struct streamer_private *streamer_priv = struct streamer_private *streamer_priv =
(struct streamer_private *) dev->priv; (struct streamer_private *) dev->priv;
__u8 *streamer_mmio = streamer_priv->streamer_mmio; __u8 __iomem *streamer_mmio = streamer_priv->streamer_mmio;
__u8 header_len; __u8 header_len;
__u16 frame_len, buffer_len; __u16 frame_len, buffer_len;
struct sk_buff *mac_frame; struct sk_buff *mac_frame;
...@@ -1747,7 +1747,7 @@ static void streamer_asb_bh(struct net_device *dev) ...@@ -1747,7 +1747,7 @@ static void streamer_asb_bh(struct net_device *dev)
{ {
struct streamer_private *streamer_priv = struct streamer_private *streamer_priv =
(struct streamer_private *) dev->priv; (struct streamer_private *) dev->priv;
__u8 *streamer_mmio = streamer_priv->streamer_mmio; __u8 __iomem *streamer_mmio = streamer_priv->streamer_mmio;
if (streamer_priv->asb_queued == 1) if (streamer_priv->asb_queued == 1)
{ {
...@@ -1855,7 +1855,7 @@ static int sprintf_info(char *buffer, struct net_device *dev) ...@@ -1855,7 +1855,7 @@ static int sprintf_info(char *buffer, struct net_device *dev)
{ {
struct streamer_private *streamer_priv = struct streamer_private *streamer_priv =
(struct streamer_private *) dev->priv; (struct streamer_private *) dev->priv;
__u8 *streamer_mmio = streamer_priv->streamer_mmio; __u8 __iomem *streamer_mmio = streamer_priv->streamer_mmio;
struct streamer_adapter_addr_table sat; struct streamer_adapter_addr_table sat;
struct streamer_parameters_table spt; struct streamer_parameters_table spt;
int size = 0; int size = 0;
...@@ -1939,7 +1939,7 @@ static int streamer_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) ...@@ -1939,7 +1939,7 @@ static int streamer_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
{ {
int i; int i;
struct streamer_private *streamer_priv = (struct streamer_private *) dev->priv; struct streamer_private *streamer_priv = (struct streamer_private *) dev->priv;
u8 *streamer_mmio = streamer_priv->streamer_mmio; u8 __iomem *streamer_mmio = streamer_priv->streamer_mmio;
switch(cmd) { switch(cmd) {
case IOCTL_SISR_MASK: case IOCTL_SISR_MASK:
......
drivers/net/tokenring/lanstreamer.h
View file @ abd36fc1
...@@ -293,7 +293,7 @@ struct streamer_private { ...@@ -293,7 +293,7 @@ struct streamer_private {
struct streamer_private *next; struct streamer_private *next;
struct pci_dev *pci_dev; struct pci_dev *pci_dev;
__u8 *streamer_mmio; __u8 __iomem *streamer_mmio;
char *streamer_card_name; char *streamer_card_name;
spinlock_t streamer_lock; spinlock_t streamer_lock;
......
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