[FIX] Driver: netlink build depend on config 60/17360/2
authorAlexander Aksenov <a.aksenov@samsung.com>
Thu, 6 Mar 2014 13:31:27 +0000 (17:31 +0400)
committerAlexander Aksenov <a.aksenov@samsung.com>
Thu, 6 Mar 2014 14:57:44 +0000 (18:57 +0400)
Change-Id: I713049317fe12817eec65687a231d6d1da198e3e
Signed-off-by: Alexander Aksenov <a.aksenov@samsung.com>
driver/Kbuild
driver/swap_driver_module.c
driver/us_interaction.h

index 855ddca..bfee065 100644 (file)
@@ -5,5 +5,8 @@ obj-m := swap_driver.o
 swap_driver-y := swap_driver_module.o \
                      device_driver.o \
                      driver_to_buffer.o \
-                     swap_debugfs.o \
-                     us_interaction.o
+                     swap_debugfs.o
+
+ifeq ($(CONFIG_CONNECTOR),y)
+       swap_driver-y += us_interaction.o
+endif
index 0d93ef8..4c702ab 100644 (file)
@@ -43,7 +43,7 @@ static int __init swap_driver_init(void)
 
        ret = us_interaction_create();
        if (ret)
-               goto interact_create_fail;
+               print_err("Cannot initialize netlink socket\n");
 
        print_msg("Driver module initialized\n");
 
@@ -51,7 +51,6 @@ static int __init swap_driver_init(void)
 
 dev_init_fail:
        swap_debugfs_exit();
-interact_create_fail:
        swap_device_exit();
 
        return ret;
index f84137c..d6fb591 100644 (file)
 #ifndef __US_INTERACTION_H__
 #define __US_INTERACTION_H__
 
+#ifdef CONFIG_CONNECTOR
+
 int us_interaction_create(void);
 void us_interaction_destroy(void);
 int us_interaction_send_msg(const void *data, size_t size);
 
+#else /* CONFIG_CONNECTOR */
+
+static inline int us_interaction_create(void)
+{
+       return -EPERM;
+}
+
+static inline void us_interaction_destroy(void)
+{
+}
+
+static inline int us_interaction_send_msg(const void *data, size_t size)
+{
+       return -EPERM;
+}
+
+#endif /* CONFIG_CONNECTOR */
+
 #endif /* __US_INTERACTION_H__ */