sw:drv: detect memops later

Like this we will bet the device registered properly, which means that the dev_err() messages will be printed correctly. Signed-off-by: Federico Vaga <federico.vaga@cern.ch>

sw:drv: detect memops later
Like this we will bet the device registered properly, which means that the dev_err() messages will be printed correctly. Signed-off-by: Federico Vaga <federico.vaga@cern.ch>
c6aa871a · Federico Vaga · 4f5e52a1 · c6aa871a
Commit c6aa871a authored Jul 27, 2018 by Federico Vaga
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

mockturtle-core.c software/kernel/mockturtle-core.c +5 -4

No files found.
--- a/software/kernel/mockturtle-core.c
+++ b/software/kernel/mockturtle-core.c
@@ -537,10 +537,6 @@ int trtl_probe(struct platform_device *pdev)
 	trtl->base_hmq  = trtl->base_core + TRTL_ADDR_OFFSET_HMQ;
 	trtl->base_cfg = trtl->base_core + TRTL_ADDR_OFFSET_CONFIG_ROM;

-	err = trtl_memops_detect(trtl);
-	if (err)
-		return err;
-
 	/* Register the device */
 	err = dev_set_name(&trtl->dev, "trtl-%04x", pdev->id);
 	if (err)
@@ -556,6 +552,10 @@ int trtl_probe(struct platform_device *pdev)
 	if (err)
 		goto out_reg;

+	err = trtl_memops_detect(trtl);
+	if (err)
+		goto out_mops;
+
 	err = trtl_config_rom_dump(trtl);
 	if (err)
 		goto out_rom;
@@ -625,6 +625,7 @@ out_cpu:
 out_rom:
 	sysfs_remove_bin_file(&trtl->dev.kobj, &trtl_config_rom_sysfs);
 out_cfg:
+out_mops:
 	device_unregister(&trtl->dev);
 out_reg:
 	trtl_minor_put(&trtl->dev);