[DM/FIXUP] remove OFW switch macros

The drivers will support OFW and name probe both.
We should make build OK when OFW is disable.

Signed-off-by: GuEe-GUI <[email protected]>

2 files changed, 11 insertions, 14 deletions

diff --git a/components/drivers/core/platform.c b/components/drivers/core/platform.c
index d8c6679a6d..c3a141654a 100644
--- a/components/drivers/core/platform.c
+++ b/components/drivers/core/platform.c
@@ -78,21 +78,21 @@ static rt_bool_t platform_match(rt_driver_t drv, rt_device_t dev)
 {
     struct rt_platform_driver *pdrv = rt_container_of(drv, struct rt_platform_driver, parent);
     struct rt_platform_device *pdev = rt_container_of(dev, struct rt_platform_device, parent);
-
-#ifdef RT_USING_OFW
     struct rt_ofw_node *np = dev->ofw_node;
 
     /* 1、match with ofw node */
     if (np)
     {
+    #ifdef RT_USING_OFW
         pdev->id = rt_ofw_node_match(np, pdrv->ids);
-
+    #else
+        pdev->id = RT_NULL;
+    #endif
         if (pdev->id)
         {
             return RT_TRUE;
         }
     }
-#endif
 
     /* 2、match with name */
     if (pdev->name && pdrv->name)
@@ -123,7 +123,13 @@ static rt_err_t platform_probe(rt_device_t dev)
 
     if (err && err != -RT_EEMPTY)
     {
-        LOG_E("Attach power domain error = %s in device %s", pdev->name, rt_strerror(err));
+        LOG_E("Attach power domain error = %s in device %s", rt_strerror(err),
+        #ifdef RT_USING_OFW
+            (pdev->name && pdev->name[0]) ? pdev->name : rt_ofw_node_full_name(np)
+        #else
+            pdev->name
+        #endif
+            );
 
         return err;
     }
diff --git a/components/drivers/include/drivers/platform.h b/components/drivers/include/drivers/platform.h
index 5dac6762b5..ba927fee7d 100644
--- a/components/drivers/include/drivers/platform.h
+++ b/components/drivers/include/drivers/platform.h
@@ -12,10 +12,7 @@
 #ifndef __PLATFORM_H__
 #define __PLATFORM_H__
 
-#ifdef RT_USING_OFW
 #include <drivers/ofw.h>
-#endif
-
 #include <drivers/core/driver.h>
 
 struct rt_platform_device
@@ -25,10 +22,7 @@ struct rt_platform_device
     int dev_id;
 
     const char *name;
-
-#ifdef RT_USING_OFW
     const struct rt_ofw_node_id *id;
-#endif
 
     void *priv;
 };
@@ -38,10 +32,7 @@ struct rt_platform_driver
     struct rt_driver parent;
 
     const char *name;
-
-#ifdef RT_USING_OFW
     const struct rt_ofw_node_id *ids;
-#endif
 
     rt_err_t (*probe)(struct rt_platform_device *pdev);
     rt_err_t (*remove)(struct rt_platform_device *pdev);