staging: greybus: audio: remove redundant slot field

gb_audio_manager_module_descriptor's intf_id field maintains the
information about the interface on which module is connected hence
having an extra slot field is redundant.

Thus remove the slot field and its associated code.

Signed-off-by: Pankaj Bharadiya <pankaj.bharadiya@gmail.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Vaibhav Agarwal <vaibhav.sr@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/greybus/audio_codec.h b/drivers/staging/greybus/audio_codec.h
index ca027bd99ad70e36b0908004cfc20c3a875bd72d..62fd93939a1f2c98e698d3e6af1c90a0a11ce01e 100644 (file)
--- a/drivers/staging/greybus/audio_codec.h
+++ b/drivers/staging/greybus/audio_codec.h
@@ -158,7 +158,6 @@ struct gbaudio_module_info {
        int dev_id;     /* check if it should be bundle_id/hd_cport_id */
        int vid;
        int pid;
-       int slot;
        int type;
        int set_uevent;
        char vstr[NAME_SIZE];

diff --git a/drivers/staging/greybus/audio_manager.h b/drivers/staging/greybus/audio_manager.h
index 056088eb12febfa95024d31772ccb27e860a93a7..5ab8f5e0ed3fbb774d9e02a841a699f4b4ad54ef 100644 (file)
--- a/drivers/staging/greybus/audio_manager.h
+++ b/drivers/staging/greybus/audio_manager.h
@@ -18,7 +18,6 @@
 
 struct gb_audio_manager_module_descriptor {
        char name[GB_AUDIO_MANAGER_MODULE_NAME_LEN];
-       int slot;
        int vid;
        int pid;
        int intf_id;

diff --git a/drivers/staging/greybus/audio_manager_module.c b/drivers/staging/greybus/audio_manager_module.c
index 2bf40a90368d9d52fcb560a39593258eafec3c40..adc16977452d198bbfac63186427051083cc7a73 100644 (file)
--- a/drivers/staging/greybus/audio_manager_module.c
+++ b/drivers/staging/greybus/audio_manager_module.c
@@ -81,16 +81,6 @@ static ssize_t gb_audio_module_name_show(
 static struct gb_audio_manager_module_attribute gb_audio_module_name_attribute =
        __ATTR(name, 0664, gb_audio_module_name_show, NULL);
 
-static ssize_t gb_audio_module_slot_show(
-       struct gb_audio_manager_module *module,
-       struct gb_audio_manager_module_attribute *attr, char *buf)
-{
-       return sprintf(buf, "%d", module->desc.slot);
-}
-
-static struct gb_audio_manager_module_attribute gb_audio_module_slot_attribute =
-       __ATTR(slot, 0664, gb_audio_module_slot_show, NULL);
-
 static ssize_t gb_audio_module_vid_show(
        struct gb_audio_manager_module *module,
        struct gb_audio_manager_module_attribute *attr, char *buf)
@@ -146,7 +136,6 @@ static struct gb_audio_manager_module_attribute
 
 static struct attribute *gb_audio_module_default_attrs[] = {
        &gb_audio_module_name_attribute.attr,
-       &gb_audio_module_slot_attribute.attr,
        &gb_audio_module_vid_attribute.attr,
        &gb_audio_module_pid_attribute.attr,
        &gb_audio_module_intf_id_attribute.attr,
@@ -164,7 +153,6 @@ static struct kobj_type gb_audio_module_type = {
 static void send_add_uevent(struct gb_audio_manager_module *module)
 {
        char name_string[128];
-       char slot_string[64];
        char vid_string[64];
        char pid_string[64];
        char intf_id_string[64];
@@ -173,7 +161,6 @@ static void send_add_uevent(struct gb_audio_manager_module *module)
 
        char *envp[] = {
                name_string,
-               slot_string,
                vid_string,
                pid_string,
                intf_id_string,
@@ -183,7 +170,6 @@ static void send_add_uevent(struct gb_audio_manager_module *module)
        };
 
        snprintf(name_string, 128, "NAME=%s", module->desc.name);
-       snprintf(slot_string, 64, "SLOT=%d", module->desc.slot);
        snprintf(vid_string, 64, "VID=%d", module->desc.vid);
        snprintf(pid_string, 64, "PID=%d", module->desc.pid);
        snprintf(intf_id_string, 64, "INTF_ID=%d", module->desc.intf_id);
@@ -246,10 +232,9 @@ int gb_audio_manager_module_create(
 
 void gb_audio_manager_module_dump(struct gb_audio_manager_module *module)
 {
-       pr_info("audio module #%d name=%s slot=%d vid=%d pid=%d intf_id=%d i/p devices=0x%X o/p devices=0x%X\n",
+       pr_info("audio module #%d name=%s vid=%d pid=%d intf_id=%d i/p devices=0x%X o/p devices=0x%X\n",
                module->id,
                module->desc.name,
-               module->desc.slot,
                module->desc.vid,
                module->desc.pid,
                module->desc.intf_id,

diff --git a/drivers/staging/greybus/audio_manager_sysfs.c b/drivers/staging/greybus/audio_manager_sysfs.c
index c6d82f9d656b30f55267ba7e8455de784a4596e6..34ebd147052f448187210a6de739204c49e89579 100644 (file)
--- a/drivers/staging/greybus/audio_manager_sysfs.c
+++ b/drivers/staging/greybus/audio_manager_sysfs.c
@@ -20,10 +20,9 @@ static ssize_t manager_sysfs_add_store(
 
        int num = sscanf(buf,
                        "name=%" GB_AUDIO_MANAGER_MODULE_NAME_LEN_SSCANF "s "
-                       "slot=%d vid=%d pid=%d intf_id=%d i/p devices=0x%X"
-                       "o/p devices=0x%X",
-                       desc.name, &desc.slot, &desc.vid, &desc.pid,
-                       &desc.intf_id, &desc.ip_devices, &desc.op_devices);
+                       "vid=%d pid=%d intf_id=%d i/p devices=0x%X o/p devices=0x%X",
+                       desc.name, &desc.vid, &desc.pid, &desc.intf_id,
+                       &desc.ip_devices, &desc.op_devices);
 
        if (num != 7)
                return -EINVAL;

diff --git a/drivers/staging/greybus/audio_module.c b/drivers/staging/greybus/audio_module.c
index 45b2519322c312cd13360024650ac04327a4a77c..0269a1d3128508fcca81b3fc149f225a2dec7083 100644 (file)
--- a/drivers/staging/greybus/audio_module.c
+++ b/drivers/staging/greybus/audio_module.c
@@ -345,7 +345,6 @@ static int gb_audio_probe(struct gb_bundle *bundle,
        dev_dbg(dev, "Inform set_event:%d to above layer\n", 1);
        /* prepare for the audio manager */
        strlcpy(desc.name, gbmodule->name, GB_AUDIO_MANAGER_MODULE_NAME_LEN);
-       desc.slot = 1; /* todo */
        desc.vid = 2; /* todo */
        desc.pid = 3; /* todo */
        desc.intf_id = gbmodule->dev_id;