extcon: rename enable to initialized

Change-Id: I9febfb6a57267bd42812c165d52de29aaa7dd3d2

diff --git a/src/extcon/extcon.c b/src/extcon/extcon.c
index 8a93315..564fe88 100644 (file)
--- a/src/extcon/extcon.c
+++ b/src/extcon/extcon.c
@@ -80,7 +80,7 @@ int extcon_get_status(const char *name)
        if (!dev)
                return -ENOENT;
 
-       if (!dev->enabled)
+       if (!dev->initialized)
                return -ENODEV;
 
        return dev->status;
@@ -120,7 +120,7 @@ static int extcon_update(const char *name, const char *index, const char *value)
 
        dev->status = status;
 
-       if (dev->enabled == false && strncmp(name, "USB", strlen("USB")) == 0) {
+       if (dev->initialized == false && strncmp(name, "USB", strlen("USB")) == 0) {
                if (status > 0) {
                        snprintf(buf, BUF_MAX, "usb-client");
                        ret_dbus = gdbus_call_sync_with_reply_int(DEVICEMANAGER_BUS_NAME,
@@ -156,13 +156,13 @@ int extcon_enable_device(const char *name)
        if (!dev)
                return -ENODEV;
 
-       if (dev->enabled) {
-               _I("Extcon(%s) already enabled.", name);
+       if (dev->initialized) {
+               _I("Extcon(%s) already initialized.", name);
                return 0;
        }
 
        dev->init(NULL);
-       dev->enabled = true;
+       dev->initialized = true;
 
        if (strncmp(name, "USB", strlen("USB")) == 0) {
                ret = extcon_update("USB", NULL, "0");
@@ -173,7 +173,7 @@ int extcon_enable_device(const char *name)
                if (ret != 0)
                        _E("Failed to connect USB.");
        }
-       _I("Extcon(%s) enabled.", name);
+       _I("Extcon(%s) initialized.", name);
 
        return 0;
 }
@@ -197,15 +197,15 @@ int extcon_disable_device(const char *name)
        if (ret_dbus < 0)
                _E("Failed to launch USB restricted popup: %d", ret_dbus);
 
-       if (!dev->enabled) {
-               _I("Extcon(%s) already disabled.", name);
+       if (!dev->initialized) {
+               _I("Extcon(%s) already deinitialized.", name);
                return 0;
        }
 
        dev->exit(NULL);
-       dev->enabled = false;
+       dev->initialized = false;
 
-       _I("Extcon(%s) disabled.", name);
+       _I("Extcon(%s) deinitialized.", name);
 
        return 0;
 }
@@ -500,7 +500,7 @@ static void extcon_deferred_init(void)
                _I("Extcon(%s) init.", dev->name);
                if (dev->init)
                        dev->init(NULL);
-               dev->enabled = true;
+               dev->initialized = true;
        }
 
        event_handler_state_changed((void *)&state);
@@ -553,7 +553,7 @@ static void extcon_exit(void *data)
                _I("Extcon(%s) deinit.", dev->name);
                if (dev->exit)
                        dev->exit(data);
-               dev->enabled = false;
+               dev->initialized = false;
        }
        extcon_dev_available = false;
 }

diff --git a/src/extcon/extcon.h b/src/extcon/extcon.h
index e4a4826..4747d0c 100644 (file)
--- a/src/extcon/extcon.h
+++ b/src/extcon/extcon.h
@@ -40,7 +40,7 @@
 struct extcon_ops {
        const char *name;
        int status;
-       int enabled;
+       int initialized;
        void (*init)(void *data);
        void (*exit)(void *data);
        int (*update)(const char *index, int status);