.. | .. |
---|
30 | 30 | #define FME_PR_STS 0x10 |
---|
31 | 31 | #define FME_PR_DATA 0x18 |
---|
32 | 32 | #define FME_PR_ERR 0x20 |
---|
33 | | -#define FME_PR_INTFC_ID_H 0xA8 |
---|
34 | | -#define FME_PR_INTFC_ID_L 0xB0 |
---|
| 33 | +#define FME_PR_INTFC_ID_L 0xA8 |
---|
| 34 | +#define FME_PR_INTFC_ID_H 0xB0 |
---|
35 | 35 | |
---|
36 | 36 | /* FME PR Control Register Bitfield */ |
---|
37 | 37 | #define FME_PR_CTRL_PR_RST BIT_ULL(0) /* Reset PR engine */ |
---|
.. | .. |
---|
201 | 201 | } |
---|
202 | 202 | |
---|
203 | 203 | if (count < 4) { |
---|
204 | | - dev_err(dev, "Invaild PR bitstream size\n"); |
---|
| 204 | + dev_err(dev, "Invalid PR bitstream size\n"); |
---|
205 | 205 | return -EINVAL; |
---|
206 | 206 | } |
---|
207 | 207 | |
---|
.. | .. |
---|
287 | 287 | struct fme_mgr_priv *priv; |
---|
288 | 288 | struct fpga_manager *mgr; |
---|
289 | 289 | struct resource *res; |
---|
290 | | - int ret; |
---|
291 | 290 | |
---|
292 | 291 | priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); |
---|
293 | 292 | if (!priv) |
---|
.. | .. |
---|
309 | 308 | |
---|
310 | 309 | fme_mgr_get_compat_id(priv->ioaddr, compat_id); |
---|
311 | 310 | |
---|
312 | | - mgr = fpga_mgr_create(dev, "DFL FME FPGA Manager", |
---|
313 | | - &fme_mgr_ops, priv); |
---|
| 311 | + mgr = devm_fpga_mgr_create(dev, "DFL FME FPGA Manager", |
---|
| 312 | + &fme_mgr_ops, priv); |
---|
314 | 313 | if (!mgr) |
---|
315 | 314 | return -ENOMEM; |
---|
316 | 315 | |
---|
317 | 316 | mgr->compat_id = compat_id; |
---|
318 | 317 | platform_set_drvdata(pdev, mgr); |
---|
319 | 318 | |
---|
320 | | - ret = fpga_mgr_register(mgr); |
---|
321 | | - if (ret) |
---|
322 | | - fpga_mgr_free(mgr); |
---|
323 | | - |
---|
324 | | - return ret; |
---|
| 319 | + return fpga_mgr_register(mgr); |
---|
325 | 320 | } |
---|
326 | 321 | |
---|
327 | 322 | static int fme_mgr_remove(struct platform_device *pdev) |
---|