From d7353ceadaf96a60b4163177ec9f8202655f1ace Mon Sep 17 00:00:00 2001 From: Viresh Kumar Date: Thu, 4 Jun 2015 10:18:01 +0530 Subject: [PATCH] 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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/greybus/audio-pcm.c | 4 ++-- drivers/staging/greybus/connection.c | 2 +- drivers/staging/greybus/connection.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/greybus/audio-pcm.c b/drivers/staging/greybus/audio-pcm.c index c1b6aa551ce1..4d2f0ab132ee 100644 --- 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 e87521ec526d..6f0d3e98f800 100644 --- 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 8992b75394a5..d39d476d6492 100644 --- 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; -- 2.20.1