hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/drivers/fpga/dfl-fme-mgr.c
....@@ -30,8 +30,8 @@
3030 #define FME_PR_STS 0x10
3131 #define FME_PR_DATA 0x18
3232 #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
3535
3636 /* FME PR Control Register Bitfield */
3737 #define FME_PR_CTRL_PR_RST BIT_ULL(0) /* Reset PR engine */
....@@ -201,7 +201,7 @@
201201 }
202202
203203 if (count < 4) {
204
- dev_err(dev, "Invaild PR bitstream size\n");
204
+ dev_err(dev, "Invalid PR bitstream size\n");
205205 return -EINVAL;
206206 }
207207
....@@ -287,7 +287,6 @@
287287 struct fme_mgr_priv *priv;
288288 struct fpga_manager *mgr;
289289 struct resource *res;
290
- int ret;
291290
292291 priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
293292 if (!priv)
....@@ -309,19 +308,15 @@
309308
310309 fme_mgr_get_compat_id(priv->ioaddr, compat_id);
311310
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);
314313 if (!mgr)
315314 return -ENOMEM;
316315
317316 mgr->compat_id = compat_id;
318317 platform_set_drvdata(pdev, mgr);
319318
320
- ret = fpga_mgr_register(mgr);
321
- if (ret)
322
- fpga_mgr_free(mgr);
323
-
324
- return ret;
319
+ return fpga_mgr_register(mgr);
325320 }
326321
327322 static int fme_mgr_remove(struct platform_device *pdev)