umem: Fix match of pci_ids in umem driver

[sfrench/cifs-2.6.git] / drivers / net / atari_pamsnet.c

diff --git a/drivers/net/atari_pamsnet.c b/drivers/net/atari_pamsnet.c
index d6039e62d832ebf7858648a097841c4b9edf5bbb..f7356374a2e72de6d64920430f7c1a00e2711f4e 100644 (file)
--- a/drivers/net/atari_pamsnet.c
+++ b/drivers/net/atari_pamsnet.c
@@ -163,7 +163,7 @@ static int pamsnet_close(struct net_device *dev);
 static struct net_device_stats *net_get_stats(struct net_device *dev);
 static void pamsnet_tick(unsigned long);
 
-static irqreturn_t pamsnet_intr(int irq, void *data, struct pt_regs *fp);
+static irqreturn_t pamsnet_intr(int irq, void *data);
 
 static DEFINE_TIMER(pamsnet_timer, pamsnet_tick, 0, 0);
 
@@ -295,10 +295,7 @@ int if_up = 0;
 /* Setup the DMA counter */
 
 static void
-setup_dma (address, rw_flag, num_blocks)
-       void *address;
-       unsigned rw_flag;
-       int num_blocks;
+setup_dma (void *address, unsigned rw_flag, int num_blocks)
 {
        WRITEMODE((unsigned) rw_flag          | DMA_FDC | SEC_COUNT | REG_ACSI |
                  A1);
@@ -317,9 +314,7 @@ setup_dma (address, rw_flag, num_blocks)
 /* Send the first byte of an command block */
 
 static int
-send_first (target, byte)
-       int target;
-       unsigned char byte;
+send_first (int target, unsigned char byte)
 {
        rw = READ;
        acsi_delay_end(COMMAND_DELAY);
@@ -338,10 +333,7 @@ send_first (target, byte)
 /* Send the rest of an command block */
 
 static int
-send_1_5 (lun, command, dma)
-       int lun;
-       unsigned char *command;
-       int dma;
+send_1_5 (int lun, unsigned char *command, int dma)
 {
        int i, j;
 
@@ -371,8 +363,7 @@ get_status (void)
 /* Calculate the number of received bytes */
 
 static int
-calc_received (start_address)
-       void *start_address;
+calc_received (void *start_address)
 {
        return (int)(
                (((unsigned long)DMAHIGH << 16) | ((unsigned)DMAMID << 8) | DMALOW)
@@ -384,8 +375,7 @@ calc_received (start_address)
 /* start() starts the PAM's DMA adaptor */
 
 static void
-start (target)
-       int target;
+start (int target)
 {
        send_first(target, START);
 }
@@ -393,8 +383,7 @@ start (target)
 /* stop() stops the PAM's DMA adaptor and returns a value of zero in case of success */
 
 static int
-stop (target)
-       int target;
+stop (int target)
 {
        int ret = -1;
        unsigned char cmd_buffer[5];
@@ -415,8 +404,7 @@ bad:
 /* testpkt() returns the number of received packets waiting in the queue */
 
 static int
-testpkt(target)
-       int target;
+testpkt(int target)
 {
        int ret = -1;
 
@@ -431,9 +419,7 @@ bad:
 /* Please note: The buffer is for internal use only but must be defined!   */
 
 static int
-inquiry (target, buffer)
-       int target;
-       unsigned char *buffer;
+inquiry (int target, unsigned char *buffer)
 {
        int ret = -1;
        unsigned char *vbuffer = phys_to_virt((unsigned long)buffer);
@@ -468,9 +454,7 @@ bad:
  */
 
 static HADDR
-*read_hw_addr(target, buffer)
-       int target;
-       unsigned char *buffer;
+*read_hw_addr(int target, unsigned char *buffer)
 {
        HADDR *ret = 0;
        unsigned char cmd_buffer[5];
@@ -491,10 +475,7 @@ bad:
 }
 
 static irqreturn_t
-pamsnet_intr(irq, data, fp)
-       int irq;
-       void *data;
-       struct pt_regs *fp;
+pamsnet_intr(int irq, void *data)
 {
        return IRQ_HANDLED;
 }
@@ -502,9 +483,7 @@ pamsnet_intr(irq, data, fp)
 /* receivepkt() loads a packet to a given buffer and returns its length */
 
 static int
-receivepkt (target, buffer)
-       int target;
-       unsigned char *buffer;
+receivepkt (int target, unsigned char *buffer)
 {
        int ret = -1;
        unsigned char cmd_buffer[5];
@@ -527,10 +506,7 @@ bad:
              successfully */
 
 static int
-sendpkt (target, buffer, length)
-       int target;
-       unsigned char *buffer;
-       int length;
+sendpkt (int target, unsigned char *buffer, int length)
 {
        int ret = -1;
        unsigned char cmd_buffer[5];
@@ -666,7 +642,8 @@ struct net_device * __init pamsnet_probe (int unit)
    there is non-reboot way to recover if something goes wrong.
  */
 static int
-pamsnet_open(struct net_device *dev) {
+pamsnet_open(struct net_device *dev)
+{
        struct net_local *lp = netdev_priv(dev);
 
        if (pamsnet_debug > 0)
@@ -695,7 +672,8 @@ pamsnet_open(struct net_device *dev) {
 }
 
 static int
-pamsnet_send_packet(struct sk_buff *skb, struct net_device *dev) {
+pamsnet_send_packet(struct sk_buff *skb, struct net_device *dev)
+{
        struct net_local *lp = netdev_priv(dev);
        unsigned long flags;
 
@@ -718,7 +696,8 @@ pamsnet_send_packet(struct sk_buff *skb, struct net_device *dev) {
 
                local_irq_restore(flags);
                if( !STRAM_ADDR(buf+length-1) ) {
-                       memcpy(nic_packet->buffer, skb->data, length);
+                       skb_copy_from_linear_data(skb, nic_packet->buffer,
+                                                 length);
                        buf = (unsigned long)phys_nic_packet;
                }
 
@@ -741,7 +720,8 @@ pamsnet_send_packet(struct sk_buff *skb, struct net_device *dev) {
 /* We have a good packet(s), get it/them out of the buffers.
  */
 static void
-pamsnet_poll_rx(struct net_device *dev) {
+pamsnet_poll_rx(struct net_device *dev)
+{
        struct net_local *lp = netdev_priv(dev);
        int boguscount;
        int pkt_len;
@@ -793,7 +773,8 @@ pamsnet_poll_rx(struct net_device *dev) {
 
                        /* 'skb->data' points to the start of sk_buff data area.
                         */
-                       memcpy(skb->data, nic_packet->buffer, pkt_len);
+                       skb_copy_to_linear_data(skb, nic_packet->buffer,
+                                               pkt_len);
                        netif_rx(skb);
                        dev->last_rx = jiffies;
                        lp->stats.rx_packets++;
@@ -815,7 +796,8 @@ pamsnet_poll_rx(struct net_device *dev) {
  * passes them to the higher layers and restarts the timer.
  */
 static void
-pamsnet_tick(unsigned long data) {
+pamsnet_tick(unsigned long data)
+{
        struct net_device        *dev = (struct net_device *)data;
        struct net_local *lp = netdev_priv(dev);
 
@@ -831,7 +813,8 @@ pamsnet_tick(unsigned long data) {
 /* The inverse routine to pamsnet_open().
  */
 static int
-pamsnet_close(struct net_device *dev) {
+pamsnet_close(struct net_device *dev)
+{
        struct net_local *lp = netdev_priv(dev);
 
        if (pamsnet_debug > 0)
@@ -857,7 +840,7 @@ pamsnet_close(struct net_device *dev) {
 /* Get the current statistics.
    This may be called with the card open or closed.
  */
-static struct net_device_stats *net_get_stats(struct net_device *dev) 
+static struct net_device_stats *net_get_stats(struct net_device *dev)
 {
        struct net_local *lp = netdev_priv(dev);
        return &lp->stats;