5 files changed, 20 insertions, 22 deletions

diff --git a/drivers/net/cxgb3/ael1002.c b/drivers/net/cxgb3/ael1002.c
index 35cd36729155..2028da95afa1 100644
--- a/drivers/net/cxgb3/ael1002.c
+++ b/drivers/net/cxgb3/ael1002.c
@@ -292,7 +292,7 @@ unknown:
  */
 static int ael2005_setup_sr_edc(struct cphy *phy)
 {
-        static struct reg_val regs[] = {
+        static const struct reg_val regs[] = {
                 { MDIO_MMD_PMAPMD, 0xc003, 0xffff, 0x181 },
                 { MDIO_MMD_PMAPMD, 0xc010, 0xffff, 0x448a },
                 { MDIO_MMD_PMAPMD, 0xc04a, 0xffff, 0x5200 },
@@ -324,11 +324,11 @@ static int ael2005_setup_sr_edc(struct cphy *phy)
 
 static int ael2005_setup_twinax_edc(struct cphy *phy, int modtype)
 {
-        static struct reg_val regs[] = {
+        static const struct reg_val regs[] = {
                 { MDIO_MMD_PMAPMD, 0xc04a, 0xffff, 0x5a00 },
                 { 0, 0, 0, 0 }
         };
-        static struct reg_val preemphasis[] = {
+        static const struct reg_val preemphasis[] = {
                 { MDIO_MMD_PMAPMD, 0xc014, 0xffff, 0xfe16 },
                 { MDIO_MMD_PMAPMD, 0xc015, 0xffff, 0xa000 },
                 { 0, 0, 0, 0 }
@@ -393,7 +393,7 @@ static int ael2005_intr_clear(struct cphy *phy)
 
 static int ael2005_reset(struct cphy *phy, int wait)
 {
-        static struct reg_val regs0[] = {
+        static const struct reg_val regs0[] = {
                 { MDIO_MMD_PMAPMD, 0xc001, 0, 1 << 5 },
                 { MDIO_MMD_PMAPMD, 0xc017, 0, 1 << 5 },
                 { MDIO_MMD_PMAPMD, 0xc013, 0xffff, 0xf341 },
@@ -403,7 +403,7 @@ static int ael2005_reset(struct cphy *phy, int wait)
                 { MDIO_MMD_PMAPMD, 0xc210, 0xffff, 0 },
                 { 0, 0, 0, 0 }
         };
-        static struct reg_val regs1[] = {
+        static const struct reg_val regs1[] = {
                 { MDIO_MMD_PMAPMD, 0xca00, 0xffff, 0x0080 },
                 { MDIO_MMD_PMAPMD, 0xca12, 0xffff, 0 },
                 { 0, 0, 0, 0 }
@@ -522,7 +522,7 @@ int t3_ael2005_phy_prep(struct cphy *phy, struct adapter *adapter,
  */
 static int ael2020_setup_sr_edc(struct cphy *phy)
 {
-        static struct reg_val regs[] = {
+        static const struct reg_val regs[] = {
                 /* set CDR offset to 10 */
                 { MDIO_MMD_PMAPMD, 0xcc01, 0xffff, 0x488a },
 
@@ -551,20 +551,20 @@ static int ael2020_setup_sr_edc(struct cphy *phy)
 static int ael2020_setup_twinax_edc(struct cphy *phy, int modtype)
 {
         /* set uC to 40MHz */
-        static struct reg_val uCclock40MHz[] = {
+        static const struct reg_val uCclock40MHz[] = {
                 { MDIO_MMD_PMAPMD, 0xff28, 0xffff, 0x4001 },
                 { MDIO_MMD_PMAPMD, 0xff2a, 0xffff, 0x0002 },
                 { 0, 0, 0, 0 }
         };
 
         /* activate uC clock */
-        static struct reg_val uCclockActivate[] = {
+        static const struct reg_val uCclockActivate[] = {
                 { MDIO_MMD_PMAPMD, 0xd000, 0xffff, 0x5200 },
                 { 0, 0, 0, 0 }
         };
 
         /* set PC to start of SRAM and activate uC */
-        static struct reg_val uCactivate[] = {
+        static const struct reg_val uCactivate[] = {
                 { MDIO_MMD_PMAPMD, 0xd080, 0xffff, 0x0100 },
                 { MDIO_MMD_PMAPMD, 0xd092, 0xffff, 0x0000 },
                 { 0, 0, 0, 0 }
@@ -624,7 +624,7 @@ static int ael2020_get_module_type(struct cphy *phy, int delay_ms)
  */
 static int ael2020_intr_enable(struct cphy *phy)
 {
-        struct reg_val regs[] = {
+        static const struct reg_val regs[] = {
                 /* output Module's Loss Of Signal (LOS) to LED */
                 { MDIO_MMD_PMAPMD, AEL2020_GPIO_CFG+AEL2020_GPIO_LSTAT,
                         0xffff, 0x4 },
@@ -664,7 +664,7 @@ static int ael2020_intr_enable(struct cphy *phy)
  */
 static int ael2020_intr_disable(struct cphy *phy)
 {
-        struct reg_val regs[] = {
+        static const struct reg_val regs[] = {
                 /* reset "link status" LED to "off" */
                 { MDIO_MMD_PMAPMD, AEL2020_GPIO_CTRL,
                         0xffff, 0xb << (AEL2020_GPIO_LSTAT*4) },
@@ -701,7 +701,7 @@ static int ael2020_intr_clear(struct cphy *phy)
         return err ? err : t3_phy_lasi_intr_clear(phy);
 }
 
-static struct reg_val ael2020_reset_regs[] = {
+static const struct reg_val ael2020_reset_regs[] = {
         /* Erratum #2: CDRLOL asserted, causing PMA link down status */
         { MDIO_MMD_PMAPMD, 0xc003, 0xffff, 0x3101 },
 
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index 046d846c652d..4d538a4e9d55 100644
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -1359,6 +1359,7 @@ out:
 static int offload_close(struct t3cdev *tdev)
 {
         struct adapter *adapter = tdev2adap(tdev);
+        struct t3c_data *td = T3C_DATA(tdev);
 
         if (!test_bit(OFFLOAD_DEVMAP_BIT, &adapter->open_device_map))
                 return 0;
@@ -1369,7 +1370,7 @@ static int offload_close(struct t3cdev *tdev)
         sysfs_remove_group(&tdev->lldev->dev.kobj, &offload_attr_group);
 
         /* Flush work scheduled while releasing TIDs */
-        flush_scheduled_work();
+        flush_work_sync(&td->tid_release_task);
 
         tdev->lldev = NULL;
         cxgb3_set_dummy_ops(tdev);
@@ -3006,12 +3007,11 @@ static pci_ers_result_t t3_io_error_detected(struct pci_dev *pdev,
                                              pci_channel_state_t state)
 {
         struct adapter *adapter = pci_get_drvdata(pdev);
-        int ret;
 
         if (state == pci_channel_io_perm_failure)
                 return PCI_ERS_RESULT_DISCONNECT;
 
-        ret = t3_adapter_error(adapter, 0, 0);
+        t3_adapter_error(adapter, 0, 0);
 
         /* Request a slot reset. */
         return PCI_ERS_RESULT_NEED_RESET;
diff --git a/drivers/net/cxgb3/cxgb3_offload.c b/drivers/net/cxgb3/cxgb3_offload.c
index bcf07532953d..ef02aa68c926 100644
--- a/drivers/net/cxgb3/cxgb3_offload.c
+++ b/drivers/net/cxgb3/cxgb3_offload.c
@@ -1164,12 +1164,10 @@ static void cxgb_redirect(struct dst_entry *old, struct dst_entry *new)
  */
 void *cxgb_alloc_mem(unsigned long size)
 {
-        void *p = kmalloc(size, GFP_KERNEL);
+        void *p = kzalloc(size, GFP_KERNEL);
 
         if (!p)
-                p = vmalloc(size);
-        if (p)
-                memset(p, 0, size);
+                p = vzalloc(size);
         return p;
 }
 
diff --git a/drivers/net/cxgb3/mc5.c b/drivers/net/cxgb3/mc5.c
index a8766fb2f9ab..e13b7fe9d082 100644
--- a/drivers/net/cxgb3/mc5.c
+++ b/drivers/net/cxgb3/mc5.c
@@ -318,7 +318,7 @@ static void mc5_dbgi_mode_disable(const struct mc5 *mc5)
 
 /*
  * Initialization that requires the OS and protocol layers to already
- * be intialized goes here.
+ * be initialized goes here.
  */
 int t3_mc5_init(struct mc5 *mc5, unsigned int nservers, unsigned int nfilters,
                 unsigned int nroutes)
diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c
index 3a6adf0b3e9d..d55db6b38e7b 100644
--- a/drivers/net/cxgb3/t3_hw.c
+++ b/drivers/net/cxgb3/t3_hw.c
@@ -607,7 +607,7 @@ struct t3_vpd {
  *
  *      Read a 32-bit word from a location in VPD EEPROM using the card's PCI
  *      VPD ROM capability.  A zero is written to the flag bit when the
- *      addres is written to the control register.  The hardware device will
+ *      address is written to the control register.  The hardware device will
  *      set the flag to 1 when 4 bytes have been read into the data register.
  */
 int t3_seeprom_read(struct adapter *adapter, u32 addr, __le32 *data)
@@ -1562,7 +1562,7 @@ static void tp_intr_handler(struct adapter *adapter)
                 {0}
         };
 
-        static struct intr_info tp_intr_info_t3c[] = {
+        static const struct intr_info tp_intr_info_t3c[] = {
                 {0x1fffffff, "TP parity error", -1, 1},
                 {F_FLMRXFLSTEMPTY, "TP out of Rx pages", -1, 1},
                 {F_FLMTXFLSTEMPTY, "TP out of Tx pages", -1, 1},