diff options
Diffstat (limited to 'drivers/net/wireless/orinoco/fw.c')
-rw-r--r-- | drivers/net/wireless/orinoco/fw.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/orinoco/fw.c b/drivers/net/wireless/orinoco/fw.c index 5ea0f7cf85b1..3e1947d097ca 100644 --- 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, | |||
122 | dev_dbg(dev, "Attempting to download firmware %s\n", firmware); | 122 | dev_dbg(dev, "Attempting to download firmware %s\n", firmware); |
123 | 123 | ||
124 | /* Read current plug data */ | 124 | /* Read current plug data */ |
125 | err = hermes_read_pda(hw, pda, fw->pda_addr, fw->pda_size, 0); | 125 | err = hw->ops->read_pda(hw, pda, fw->pda_addr, fw->pda_size); |
126 | dev_dbg(dev, "Read PDA returned %d\n", err); | 126 | dev_dbg(dev, "Read PDA returned %d\n", err); |
127 | if (err) | 127 | if (err) |
128 | goto free; | 128 | goto free; |
@@ -149,7 +149,7 @@ orinoco_dl_firmware(struct orinoco_private *priv, | |||
149 | } | 149 | } |
150 | 150 | ||
151 | /* Enable aux port to allow programming */ | 151 | /* Enable aux port to allow programming */ |
152 | err = hermesi_program_init(hw, le32_to_cpu(hdr->entry_point)); | 152 | err = hw->ops->program_init(hw, le32_to_cpu(hdr->entry_point)); |
153 | dev_dbg(dev, "Program init returned %d\n", err); | 153 | dev_dbg(dev, "Program init returned %d\n", err); |
154 | if (err != 0) | 154 | if (err != 0) |
155 | goto abort; | 155 | goto abort; |
@@ -177,7 +177,7 @@ orinoco_dl_firmware(struct orinoco_private *priv, | |||
177 | goto abort; | 177 | goto abort; |
178 | 178 | ||
179 | /* Tell card we've finished */ | 179 | /* Tell card we've finished */ |
180 | err = hermesi_program_end(hw); | 180 | err = hw->ops->program_end(hw); |
181 | dev_dbg(dev, "Program end returned %d\n", err); | 181 | dev_dbg(dev, "Program end returned %d\n", err); |
182 | if (err != 0) | 182 | if (err != 0) |
183 | goto abort; | 183 | goto abort; |
@@ -224,7 +224,7 @@ symbol_dl_image(struct orinoco_private *priv, const struct fw_info *fw, | |||
224 | if (!pda) | 224 | if (!pda) |
225 | return -ENOMEM; | 225 | return -ENOMEM; |
226 | 226 | ||
227 | ret = hermes_read_pda(hw, pda, fw->pda_addr, fw->pda_size, 1); | 227 | ret = hw->ops->read_pda(hw, pda, fw->pda_addr, fw->pda_size); |
228 | if (ret) | 228 | if (ret) |
229 | goto free; | 229 | goto free; |
230 | } | 230 | } |
@@ -260,7 +260,7 @@ symbol_dl_image(struct orinoco_private *priv, const struct fw_info *fw, | |||
260 | } | 260 | } |
261 | 261 | ||
262 | /* Reset hermes chip and make sure it responds */ | 262 | /* Reset hermes chip and make sure it responds */ |
263 | ret = hermes_init(hw); | 263 | ret = hw->ops->init(hw); |
264 | 264 | ||
265 | /* hermes_reset() should return 0 with the secondary firmware */ | 265 | /* hermes_reset() should return 0 with the secondary firmware */ |
266 | if (secondary && ret != 0) | 266 | if (secondary && ret != 0) |