Add proper data parameter to initalize functions

To send proper data as parameter, data parameter should be added
to function definition.
There was no way to deliver proper data to initialize function.

Change-Id: I60f6de040d51943cf4bf15a0eff9afdf69394691
Signed-off-by: Yunhee Seo <yuni.seo@samsung.com>

diff --git a/src/display/core.h b/src/display/core.h
index d3778404d737fe639052689c47554bc72478ce27..223e7a148487d1b242dadff9e10cb8650cf85c1c 100644 (file)
--- a/src/display/core.h
+++ b/src/display/core.h
@@ -116,7 +116,7 @@ int delete_condition(enum syscommon_deviced_display_state state);
 void set_brightness_changed_state(void);
 
 /* display-dbus.c */
-int init_pm_dbus(void);
+int init_pm_dbus(void *data);
 
 /* slave-logging.c */
 int save_pmlock(enum syscommon_deviced_display_state state, bool on, pid_t pid);

diff --git a/src/display/display-dbus.c b/src/display/display-dbus.c
index bbe6dab7e7e8570bbf674ceab6dd0e7121778b1f..563d727f5d2b82bd74786df6b6821d8614adc741 100644 (file)
--- a/src/display/display-dbus.c
+++ b/src/display/display-dbus.c
@@ -1561,7 +1561,7 @@ static struct syscommon_deviced_display_actor_ops display_gesture_actor = {
        .caps   = SYSCOMMON_DEVICED_DISPLAY_CAPA_LCDON,
 };
 
-int init_pm_dbus(void)
+int init_pm_dbus(void *data)
 {
        int ret;
 

diff --git a/src/display/display.c b/src/display/display.c
index dc0ca1f2a364a702344cba39b25d5402253cb4f9..d04bb3c4b9ba9c38da751e7cfaf77235806fef17 100644 (file)
--- a/src/display/display.c
+++ b/src/display/display.c
@@ -656,7 +656,7 @@ static void display_init(void *data)
                _W("Failed to init: input devices poll init error");
 
        _I("Dbus init.");
-       ret = init_pm_dbus();
+       ret = init_pm_dbus(NULL);
        if (ret != 0)
                _W("Failed to init: dbus initialization error");
 

diff --git a/src/input/input-dbus.c b/src/input/input-dbus.c
index 65e9d59946c9db274f9a75c3c9058cfcf4dc2d6d..ec67dc8f55165eda9bb12c72d91a4b19ab278795 100644 (file)
--- a/src/input/input-dbus.c
+++ b/src/input/input-dbus.c
@@ -175,7 +175,7 @@ static const dbus_interface_u dbus_interface = {
        .nr_methods = ARRAY_SIZE(dbus_methods),
 };
 
-int input_dbus_init(void)
+int input_dbus_init(void *data)
 {
        int ret = 0;
 

diff --git a/src/input/input-dbus.h b/src/input/input-dbus.h
index 54ada46503916d300aff0a95f5dcf8e918b05dd0..30ccf6de4ed24ff2c9c079a688dcac871432769a 100644 (file)
--- a/src/input/input-dbus.h
+++ b/src/input/input-dbus.h
@@ -19,6 +19,6 @@
 #ifndef __INPUT_DBUS_H__
 #define __INPUT_DBUS_H__
 
-int input_dbus_init(void);
+int input_dbus_init(void *data);
 
 #endif //__INPUT_DBUS_H__
\ No newline at end of file

diff --git a/src/input/input.c b/src/input/input.c
index 9053975287dfbddb34e010194b5936f45cc9cd13..b17cced9b5ced72315590c98c99d2c0f5ea00502 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -299,7 +299,7 @@ static void input_init(void *data)
                input_devman_exit();
        }
 
-       ret = input_dbus_init();
+       ret = input_dbus_init(NULL);
        if (ret < 0)
                _E("Failed to init input device dbus interface(%d)", ret);
 

diff --git a/src/power/power-dbus.c b/src/power/power-dbus.c
index 78199d6e8792dbb169cfa8aeae6d700e3780b85c..501bef4e00c5b0cbc92bd7a97301a7bc56cd1e47 100644 (file)
--- a/src/power/power-dbus.c
+++ b/src/power/power-dbus.c
@@ -392,7 +392,7 @@ static const dbus_interface_u dbus_interface = {
        .nr_methods = ARRAY_SIZE(dbus_methods),
 };
 
-void power_dbus_init(void)
+void power_dbus_init(void *data)
 {
        int retval;
 

diff --git a/src/power/power-dbus.h b/src/power/power-dbus.h
index 4e343617a6fa9b0a0bd3f290996d79d1ee6e6d71..13691acfadca23801410099bfdd2b2d9a02ae615 100644 (file)
--- a/src/power/power-dbus.h
+++ b/src/power/power-dbus.h
@@ -19,6 +19,6 @@
 #ifndef __POWER_DBUS_H__
 #define __POWER_DBUS_H__
 
-void power_dbus_init(void);
+void power_dbus_init(void *data);
 
 #endif //__POWER_DBUS_H__

diff --git a/src/power/power-off.c b/src/power/power-off.c
index ad6bb777c09bdeace53a6278e8fdf030f626e394..e2dde9cd093aae90967f9921817910a5d4be7e29 100644 (file)
--- a/src/power/power-off.c
+++ b/src/power/power-off.c
@@ -478,7 +478,7 @@ out:
        return done;
 }
 
-void power_off_init(void)
+void power_off_init(void *data)
 {
        int ret_val;
 

diff --git a/src/power/power-off.h b/src/power/power-off.h
index bdef8920002719d2afbc2d27e2a854cd65cd1f94..1610d4f924c749c1b5ae9fdff074a036b31941d1 100644 (file)
--- a/src/power/power-off.h
+++ b/src/power/power-off.h
@@ -31,7 +31,7 @@
 #define POWEROFF_OPTPATH_REBOOT       "/run/"POWER_REBOOT
 #define POWEROFF_OPTPATH_EXIT         "/run/deviced-shutdown-exit"
 
-void power_off_init(void);
+void power_off_init(void *data);
 int poweroff_check_revived(void);
 void poweroff_request_shutdown(int state);
 void poweroff_prepare(uint64_t state);

diff --git a/src/power/power.c b/src/power/power.c
index d2dc0e29827fd734bc356ddd1d34aeb3615ef4a9..3735ce5a8767de831f2d29658c40c9dcd683f1aa 100644 (file)
--- a/src/power/power.c
+++ b/src/power/power.c
@@ -877,8 +877,8 @@ void power_state_init(void *data)
        syscommon_notifier_subscribe_notify(DEVICED_NOTIFIER_DELAYED_INIT, delayed_init_callback);
        syscommon_notifier_subscribe_notify(DEVICED_NOTIFIER_REQUEST_TRANSITION_STATE, transition_request_callback);
 
-       power_dbus_init();
-       power_off_init();
+       power_dbus_init(NULL);
+       power_off_init(NULL);
        power_suspend_init();
        power_event_lock_init();
 

diff --git a/src/usb-gadget/usb-dbus.c b/src/usb-gadget/usb-dbus.c
index 9803b98152a190ac18a0e55daaf512b81ca53184..1bb8021e5aa8f4a725ac09b0083460b94dd2b136 100644 (file)
--- a/src/usb-gadget/usb-dbus.c
+++ b/src/usb-gadget/usb-dbus.c
@@ -163,7 +163,7 @@ static const dbus_interface_u dbus_interface = {
 };
 
 
-int usb_dbus_init(void)
+int usb_dbus_init(void *data)
 {
        int ret;
 

diff --git a/src/usb-gadget/usb-gadget.c b/src/usb-gadget/usb-gadget.c
index 635f7c295e32a3048b75519f20d5a739776ca462..1f8c76dbb54ed287f9acf6e15d09a5bae1bfc11e 100644 (file)
--- a/src/usb-gadget/usb-gadget.c
+++ b/src/usb-gadget/usb-gadget.c
@@ -310,7 +310,7 @@ static void usb_init(void *data)
        if (ret < 0)
                _E("Failed to register udev event(%d) for USB", ret);
 
-       ret = usb_dbus_init();
+       ret = usb_dbus_init(NULL);
        if (ret < 0)
                _E("Failed to init dbus(%d) for USB", ret);
 

diff --git a/src/usb-gadget/usb-gadget.h b/src/usb-gadget/usb-gadget.h
index f686acbb7fba81a5ed35d5061133123fed896f47..fb7449af34ee7a979b4a0c60c90d3307463d255c 100644 (file)
--- a/src/usb-gadget/usb-gadget.h
+++ b/src/usb-gadget/usb-gadget.h
@@ -26,7 +26,7 @@
 #define USB_GADGET_FUNC_INVALID   UINT_MAX
 #define SET_USB_INVALID        INT_MAX
 
-int usb_dbus_init(void);
+int usb_dbus_init(void *data);
 
 void usb_state_load_custom_mode(void);