#include <linux/pci.h>
#include <linux/spinlock.h>
#include <linux/version.h>
+#include <linux/bitops.h>
#include <net/checksum.h>
#include <asm/io.h>
#include <asm/system.h>
-#include <asm/bitops.h>
#include "lanstreamer.h"
static int ringspeed[STREAMER_MAX_ADAPTERS] = { 0, };
-MODULE_PARM(ringspeed, "1-" __MODULE_STRING(STREAMER_MAX_ADAPTERS) "i");
+module_param_array(ringspeed, int, NULL, 0);
/* Packet buffer size */
static int pkt_buf_sz[STREAMER_MAX_ADAPTERS] = { 0, };
-MODULE_PARM(pkt_buf_sz, "1-" __MODULE_STRING(STREAMER_MAX_ADAPTERS) "i");
+module_param_array(pkt_buf_sz, int, NULL, 0);
/* Message Level */
static int message_level[STREAMER_MAX_ADAPTERS] = { 1, };
-MODULE_PARM(message_level,
- "1-" __MODULE_STRING(STREAMER_MAX_ADAPTERS) "i");
+module_param_array(message_level, int, NULL, 0);
#if STREAMER_IOCTL
static int streamer_ioctl(struct net_device *, struct ifreq *, int);
static int streamer_reset(struct net_device *dev)
{
struct streamer_private *streamer_priv;
- __u8 *streamer_mmio;
+ __u8 __iomem *streamer_mmio;
unsigned long t;
unsigned int uaa_addr;
struct sk_buff *skb = NULL;
static int streamer_open(struct net_device *dev)
{
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;
char open_error[255];
int i, open_finished = 1;
{
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;
struct streamer_rx_desc *rx_desc;
int rx_ring_last_received, length, frame_length, buffer_cnt = 0;
struct sk_buff *skb, *skb2;
struct net_device *dev = (struct net_device *) dev_id;
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 sisr;
__u16 misr;
u8 max_intr = MAX_INTR;
{
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 ;
spin_lock_irqsave(&streamer_priv->streamer_lock, flags);
{
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;
int i;
{
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;
__u8 options = 0;
struct dev_mc_list *dmi;
unsigned char dev_mc_address[5];
static void streamer_srb_bh(struct net_device *dev)
{
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;
writew(streamer_priv->srb, streamer_mmio + LAPA);
{
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;
__u8 header_len;
__u16 frame_len, buffer_len;
struct sk_buff *mac_frame;
i += 2;
}
- memcpy_fromio(skb_put(mac_frame, buffer_len),
+ memcpy(skb_put(mac_frame, buffer_len),
frame_data, buffer_len);
} while (next_ptr && (buff_off = next_ptr));
{
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;
if (streamer_priv->asb_queued == 1)
{
{
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;
struct streamer_adapter_addr_table sat;
struct streamer_parameters_table spt;
int size = 0;
{
int i;
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) {
case IOCTL_SISR_MASK: