iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

greybus: s/bundle_cport_id/intf_cport_id

Browse Source 
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>
This commit is contained in:
Viresh Kumar 2015-06-04 10:18:01 +05:30 committed by Greg Kroah-Hartman
parent 4cfabf09db
commit d7353ceada
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/greybus/audio-pcm.c
View File

@ -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);

2
drivers/staging/greybus/connection.c
View File

@ -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;

2
drivers/staging/greybus/connection.h
View File

@ -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;