greybus: s/bundle_cport_id/intf_cport_id

This isn't unique just for the bundle but the complete interface. Its
wrong to call it bundle_cport_id. Lets name it intf_cport_id to make
things clear.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

diff --git a/drivers/staging/greybus/audio-pcm.c b/drivers/staging/greybus/audio-pcm.c
index c1b6aa551ce123c037860042e0588c418a2facea..4d2f0ab132eef66b8b02b8eeb95556607edc21f5 100644 (file)
--- a/drivers/staging/greybus/audio-pcm.c
+++ b/drivers/staging/greybus/audio-pcm.c
@@ -52,7 +52,7 @@ static void gb_pcm_work(struct work_struct *work)
                if (snd_dev->cport_active) {
                        ret = gb_i2s_mgmt_deactivate_cport(
                                snd_dev->mgmt_connection,
-                               snd_dev->i2s_tx_connection->bundle_cport_id);
+                               snd_dev->i2s_tx_connection->intf_cport_id);
                        if (ret) /* XXX Do what else with failure? */
                                pr_err("deactivate_cport failed: %d\n", ret);
 
@@ -62,7 +62,7 @@ static void gb_pcm_work(struct work_struct *work)
                return;
        } else if (!snd_dev->cport_active) {
                ret = gb_i2s_mgmt_activate_cport(snd_dev->mgmt_connection,
-                               snd_dev->i2s_tx_connection->bundle_cport_id);
+                               snd_dev->i2s_tx_connection->intf_cport_id);
                if (ret)
                        pr_err("activate_cport failed: %d\n", ret);
 

diff --git a/drivers/staging/greybus/connection.c b/drivers/staging/greybus/connection.c
index e87521ec526d98b0d4230cade56f49e2c7375611..6f0d3e98f800476fc085f14116ae73ae97291392 100644 (file)
--- a/drivers/staging/greybus/connection.c
+++ b/drivers/staging/greybus/connection.c
@@ -184,7 +184,7 @@ struct gb_connection *gb_connection_create(struct gb_bundle *bundle,
        }
 
        connection->bundle = bundle;
-       connection->bundle_cport_id = cport_id;
+       connection->intf_cport_id = cport_id;
        connection->state = GB_CONNECTION_STATE_DISABLED;
 
        connection->dev.parent = &bundle->dev;

diff --git a/drivers/staging/greybus/connection.h b/drivers/staging/greybus/connection.h
index 8992b75394a58c6a103156e97e7f6f379f16bde8..d39d476d64927ab66999bbde083ff3dbcb80eec3 100644 (file)
--- a/drivers/staging/greybus/connection.h
+++ b/drivers/staging/greybus/connection.h
@@ -25,7 +25,7 @@ struct gb_connection {
        struct gb_bundle                *bundle;
        struct device                   dev;
        u16                             hd_cport_id;
-       u16                             bundle_cport_id;
+       u16                             intf_cport_id;
 
        struct list_head                hd_links;
        struct list_head                bundle_links;