From cb496872b3a3ed0a84478b597c8101a38fc2a257 Mon Sep 17 00:00:00 2001
From: "bernard.xiong" <bernard.xiong@gmail.com>
Date: Tue, 25 Dec 2012 01:44:23 +0000
Subject: [PATCH] return RT_EOK if the device interface not exist.

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2519 bbd45198-f89e-11dd-88c7-29a3b14d5316
---
 src/device.c | 60 ++++++++++++++--------------------------------------
 1 file changed, 16 insertions(+), 44 deletions(-)

diff --git a/src/device.c b/src/device.c
index e55e21930..4e4647878 100644
--- a/src/device.c
+++ b/src/device.c
@@ -13,6 +13,7 @@
  * 2010-05-04     Bernard      add rt_device_init implementation
  * 2012-10-20     Bernard      add device check in register function, 
  *                             provided by Rob <rdent@iinet.net.au>
+ * 2012-12-25     Bernard      return RT_EOK if the device interface not exist.
  */
 
 #include <rtthread.h>
@@ -163,17 +164,15 @@ RTM_EXPORT(rt_device_find);
 rt_err_t rt_device_init(rt_device_t dev)
 {
     rt_err_t result = RT_EOK;
-    rt_err_t (*init)(rt_device_t dev);
 
     RT_ASSERT(dev != RT_NULL);
 
     /* get device init handler */
-    init = dev->init;
-    if (init != RT_NULL)
+    if (dev->init != RT_NULL)
     {
         if (!(dev->flag & RT_DEVICE_FLAG_ACTIVATED))
         {
-            result = init(dev);
+            result = dev->init(dev);
             if (result != RT_EOK)
             {
                 rt_kprintf("To initialize device:%s failed. The error code is %d\n",
@@ -185,8 +184,6 @@ rt_err_t rt_device_init(rt_device_t dev)
             }
         }
     }
-    else
-        result = -RT_ENOSYS;
 
     return result;
 }
@@ -201,13 +198,10 @@ rt_err_t rt_device_init(rt_device_t dev)
  */
 rt_err_t rt_device_open(rt_device_t dev, rt_uint16_t oflag)
 {
-    rt_err_t result;
-    rt_err_t (*open)(rt_device_t dev, rt_uint16_t oflag);
+    rt_err_t result = RT_EOK;
 
     RT_ASSERT(dev != RT_NULL);
 
-    result = RT_EOK;
-
     /* if device is not initialized, initialize it. */
     if (!(dev->flag & RT_DEVICE_FLAG_ACTIVATED))
     {
@@ -234,15 +228,9 @@ rt_err_t rt_device_open(rt_device_t dev, rt_uint16_t oflag)
     }
 
     /* call device open interface */
-    open = dev->open;
-    if (open != RT_NULL)
+    if (dev->open != RT_NULL)
     {
-        result = open(dev, oflag);
-    }
-    else
-    {
-        /* no this interface in device driver */
-        /* result = -RT_ENOSYS; not set errno */
+        result = dev->open(dev, oflag);
     }
 
     /* set open flag */
@@ -262,21 +250,14 @@ RTM_EXPORT(rt_device_open);
  */
 rt_err_t rt_device_close(rt_device_t dev)
 {
-    rt_err_t result;
-    rt_err_t (*close)(rt_device_t dev);
+    rt_err_t result = RT_EOK;
 
     RT_ASSERT(dev != RT_NULL);
 
     /* call device close interface */
-    close = dev->close;
-    if (close != RT_NULL)
+    if (dev->close != RT_NULL)
     {
-        result = close(dev);
-    }
-    else
-    {
-        /* no this interface in device driver */
-        /* result = -RT_ENOSYS; not set errno */
+        result = dev->close(dev);
     }
 
     /* set open flag */
@@ -304,15 +285,12 @@ rt_size_t rt_device_read(rt_device_t dev,
                          void       *buffer,
                          rt_size_t   size)
 {
-    rt_size_t (*read)(rt_device_t dev, rt_off_t pos, void *buffer, rt_size_t size);
-
     RT_ASSERT(dev != RT_NULL);
 
     /* call device read interface */
-    read = dev->read;
-    if (read != RT_NULL)
+    if (dev->read != RT_NULL)
     {
-        return read(dev, pos, buffer, size);
+        return dev->read(dev, pos, buffer, size);
     }
 
     /* set error code */
@@ -339,15 +317,12 @@ rt_size_t rt_device_write(rt_device_t dev,
                           const void *buffer,
                           rt_size_t   size)
 {
-    rt_size_t (*write)(rt_device_t dev, rt_off_t pos, const void *buffer, rt_size_t size);
-
     RT_ASSERT(dev != RT_NULL);
 
     /* call device write interface */
-    write = dev->write;
-    if (write != RT_NULL)
+    if (dev->write != RT_NULL)
     {
-        return write(dev, pos, buffer, size);
+        return dev->write(dev, pos, buffer, size);
     }
 
     /* set error code */
@@ -368,18 +343,15 @@ RTM_EXPORT(rt_device_write);
  */
 rt_err_t rt_device_control(rt_device_t dev, rt_uint8_t cmd, void *arg)
 {
-    rt_err_t (*control)(rt_device_t dev, rt_uint8_t cmd, void *arg);
-
     RT_ASSERT(dev != RT_NULL);
 
     /* call device write interface */
-    control = dev->control;
-    if (control != RT_NULL)
+    if (dev->control != RT_NULL)
     {
-        return control(dev, cmd, arg);
+        return dev->control(dev, cmd, arg);
     }
 
-    return -RT_ENOSYS;
+    return RT_EOK;
 }
 RTM_EXPORT(rt_device_control);
 
-- 
GitLab