Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / orinoco / fw.c

diff --git a/drivers/net/wireless/orinoco/fw.c b/drivers/net/wireless/orinoco/fw.c
index 5ea0f7cf85b1d2f8653eb0941f2a50eeaf7861dc..3e1947d097ca83faf849b8de051eb506247f9cb3 100644 (file)
--- a/drivers/net/wireless/orinoco/fw.c
+++ b/drivers/net/wireless/orinoco/fw.c
@@ -122,7 +122,7 @@ orinoco_dl_firmware(struct orinoco_private *priv,
        dev_dbg(dev, "Attempting to download firmware %s\n", firmware);
 
        /* Read current plug data */
-       err = hermes_read_pda(hw, pda, fw->pda_addr, fw->pda_size, 0);
+       err = hw->ops->read_pda(hw, pda, fw->pda_addr, fw->pda_size);
        dev_dbg(dev, "Read PDA returned %d\n", err);
        if (err)
                goto free;
@@ -149,7 +149,7 @@ orinoco_dl_firmware(struct orinoco_private *priv,
        }
 
        /* Enable aux port to allow programming */
-       err = hermesi_program_init(hw, le32_to_cpu(hdr->entry_point));
+       err = hw->ops->program_init(hw, le32_to_cpu(hdr->entry_point));
        dev_dbg(dev, "Program init returned %d\n", err);
        if (err != 0)
                goto abort;
@@ -177,7 +177,7 @@ orinoco_dl_firmware(struct orinoco_private *priv,
                goto abort;
 
        /* Tell card we've finished */
-       err = hermesi_program_end(hw);
+       err = hw->ops->program_end(hw);
        dev_dbg(dev, "Program end returned %d\n", err);
        if (err != 0)
                goto abort;
@@ -224,7 +224,7 @@ symbol_dl_image(struct orinoco_private *priv, const struct fw_info *fw,
                if (!pda)
                        return -ENOMEM;
 
-               ret = hermes_read_pda(hw, pda, fw->pda_addr, fw->pda_size, 1);
+               ret = hw->ops->read_pda(hw, pda, fw->pda_addr, fw->pda_size);
                if (ret)
                        goto free;
        }
@@ -260,7 +260,7 @@ symbol_dl_image(struct orinoco_private *priv, const struct fw_info *fw,
        }
 
        /* Reset hermes chip and make sure it responds */
-       ret = hermes_init(hw);
+       ret = hw->ops->init(hw);
 
        /* hermes_reset() should return 0 with the secondary firmware */
        if (secondary && ret != 0)