1 files changed, 15 insertions, 14 deletions

diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c
index 6168a130f33f..771bb614ccc9 100644
--- a/drivers/net/qla3xxx.c
+++ b/drivers/net/qla3xxx.c
@@ -35,6 +35,7 @@
 #include <linux/if_vlan.h>
 #include <linux/delay.h>
 #include <linux/mm.h>
+#include <linux/prefetch.h>
 
 #include "qla3xxx.h"
 
@@ -379,7 +380,7 @@ static void fm93c56a_select(struct ql3_adapter *qdev)
 {
         struct ql3xxx_port_registers __iomem *port_regs =
                         qdev->mem_map_registers;
-        u32 *spir = &port_regs->CommonRegs.serialPortInterfaceReg;
+        __iomem u32 *spir = &port_regs->CommonRegs.serialPortInterfaceReg;
 
         qdev->eeprom_cmd_data = AUBURN_EEPROM_CS_1;
         ql_write_nvram_reg(qdev, spir, ISP_NVRAM_MASK | qdev->eeprom_cmd_data);
@@ -398,7 +399,7 @@ static void fm93c56a_cmd(struct ql3_adapter *qdev, u32 cmd, u32 eepromAddr)
         u32 previousBit;
         struct ql3xxx_port_registers __iomem *port_regs =
                         qdev->mem_map_registers;
-        u32 *spir = &port_regs->CommonRegs.serialPortInterfaceReg;
+        __iomem u32 *spir = &port_regs->CommonRegs.serialPortInterfaceReg;
 
         /* Clock in a zero, then do the start bit */
         ql_write_nvram_reg(qdev, spir,
@@ -467,7 +468,7 @@ static void fm93c56a_deselect(struct ql3_adapter *qdev)
 {
         struct ql3xxx_port_registers __iomem *port_regs =
                         qdev->mem_map_registers;
-        u32 *spir = &port_regs->CommonRegs.serialPortInterfaceReg;
+        __iomem u32 *spir = &port_regs->CommonRegs.serialPortInterfaceReg;
 
         qdev->eeprom_cmd_data = AUBURN_EEPROM_CS_0;
         ql_write_nvram_reg(qdev, spir, ISP_NVRAM_MASK | qdev->eeprom_cmd_data);
@@ -483,7 +484,7 @@ static void fm93c56a_datain(struct ql3_adapter *qdev, unsigned short *value)
         u32 dataBit;
         struct ql3xxx_port_registers __iomem *port_regs =
                         qdev->mem_map_registers;
-        u32 *spir = &port_regs->CommonRegs.serialPortInterfaceReg;
+        __iomem u32 *spir = &port_regs->CommonRegs.serialPortInterfaceReg;
 
         /* Read the data bits */
         /* The first bit is a dummy.  Clock right over it. */
@@ -1725,7 +1726,7 @@ static int ql_get_settings(struct net_device *ndev, struct ethtool_cmd *ecmd)
         }
         ecmd->advertising = ql_supported_modes(qdev);
         ecmd->autoneg = ql_get_auto_cfg_status(qdev);
-        ecmd->speed = ql_get_speed(qdev);
+        ethtool_cmd_speed_set(ecmd, ql_get_speed(qdev));
         ecmd->duplex = ql_get_full_dup(qdev);
         return 0;
 }
@@ -2029,7 +2030,7 @@ static void ql_process_mac_rx_intr(struct ql3_adapter *qdev,
                          dma_unmap_len(lrg_buf_cb2, maplen),
                          PCI_DMA_FROMDEVICE);
         prefetch(skb->data);
-        skb->ip_summed = CHECKSUM_NONE;
+        skb_checksum_none_assert(skb);
         skb->protocol = eth_type_trans(skb, qdev->ndev);
 
         netif_receive_skb(skb);
@@ -2076,7 +2077,7 @@ static void ql_process_macip_rx_intr(struct ql3_adapter *qdev,
                          PCI_DMA_FROMDEVICE);
         prefetch(skb2->data);
 
-        skb2->ip_summed = CHECKSUM_NONE;
+        skb_checksum_none_assert(skb2);
         if (qdev->device_id == QL3022_DEVICE_ID) {
                 /*
                  * Copy the ethhdr from first buffer to second. This
@@ -2460,14 +2461,14 @@ map_error:
  * The 3032 supports sglists by using the 3 addr/len pairs (ALP)
  * in the IOCB plus a chain of outbound address lists (OAL) that
  * each contain 5 ALPs.  The last ALP of the IOCB (3rd) or OAL (5th)
- * will used to point to an OAL when more ALP entries are required.
+ * will be used to point to an OAL when more ALP entries are required.
  * The IOCB is always the top of the chain followed by one or more
  * OALs (when necessary).
  */
 static netdev_tx_t ql3xxx_send(struct sk_buff *skb,
                                struct net_device *ndev)
 {
-        struct ql3_adapter *qdev = (struct ql3_adapter *)netdev_priv(ndev);
+        struct ql3_adapter *qdev = netdev_priv(ndev);
         struct ql3xxx_port_registers __iomem *port_regs =
                         qdev->mem_map_registers;
         struct ql_tx_buf_cb *tx_cb;
@@ -3011,7 +3012,7 @@ static int ql_adapter_initialize(struct ql3_adapter *qdev)
         u32 value;
         struct ql3xxx_port_registers __iomem *port_regs =
                 qdev->mem_map_registers;
-        u32 *spir = &port_regs->CommonRegs.serialPortInterfaceReg;
+        __iomem u32 *spir = &port_regs->CommonRegs.serialPortInterfaceReg;
         struct ql3xxx_host_memory_registers __iomem *hmem_regs =
                 (void __iomem *)port_regs;
         u32 delay = 10;
@@ -3390,7 +3391,7 @@ static void ql_set_mac_info(struct ql3_adapter *qdev)
 
 static void ql_display_dev_info(struct net_device *ndev)
 {
-        struct ql3_adapter *qdev = (struct ql3_adapter *)netdev_priv(ndev);
+        struct ql3_adapter *qdev = netdev_priv(ndev);
         struct pci_dev *pdev = qdev->pdev;
 
         netdev_info(ndev,
@@ -3468,7 +3469,7 @@ static int ql_adapter_up(struct ql3_adapter *qdev)
 {
         struct net_device *ndev = qdev->ndev;
         int err;
-        unsigned long irq_flags = IRQF_SAMPLE_RANDOM | IRQF_SHARED;
+        unsigned long irq_flags = IRQF_SHARED;
         unsigned long hw_flags;
 
         if (ql_alloc_mem_resources(qdev)) {
@@ -3573,7 +3574,7 @@ static int ql3xxx_open(struct net_device *ndev)
 
 static int ql3xxx_set_mac_address(struct net_device *ndev, void *p)
 {
-        struct ql3_adapter *qdev = (struct ql3_adapter *)netdev_priv(ndev);
+        struct ql3_adapter *qdev = netdev_priv(ndev);
         struct ql3xxx_port_registers __iomem *port_regs =
                         qdev->mem_map_registers;
         struct sockaddr *addr = p;
@@ -3608,7 +3609,7 @@ static int ql3xxx_set_mac_address(struct net_device *ndev, void *p)
 
 static void ql3xxx_tx_timeout(struct net_device *ndev)
 {
-        struct ql3_adapter *qdev = (struct ql3_adapter *)netdev_priv(ndev);
+        struct ql3_adapter *qdev = netdev_priv(ndev);
 
         netdev_err(ndev, "Resetting...\n");
         /*