summaryrefslogtreecommitdiff
path: root/drivers/staging/greybus/ap.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <greg@kroah.com>2014-12-19 14:56:31 -0800
committerGreg Kroah-Hartman <greg@kroah.com>2014-12-19 15:35:44 -0800
commit4ab9b3c24b009fdc55465977153c5deffd31b0c0 (patch)
treef09ab0b4fa144eca8edb1aa1ef19acf7d15715a1 /drivers/staging/greybus/ap.c
parenta93938a23d4d0210d06ea106a132bcab491d3885 (diff)
greybus: interface: s/gb_interface_block/gb_interface/g
Rename struct gb_interface_block to struct gb_interface Lots of renaming, and variable renames as well (gb_ib->intf), but all should be sane with regards to the new naming scheme we are using. Reviewed-by: Alex Elder <elder@linaro.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Diffstat (limited to 'drivers/staging/greybus/ap.c')
-rw-r--r--drivers/staging/greybus/ap.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/greybus/ap.c b/drivers/staging/greybus/ap.c
index a5ac2bba26ba..f9c63e43acd7 100644
--- a/drivers/staging/greybus/ap.c
+++ b/drivers/staging/greybus/ap.c
@@ -124,7 +124,7 @@ static void svc_handshake(struct svc_function_handshake *handshake,
static void svc_management(struct svc_function_unipro_management *management,
int payload_length, struct greybus_host_device *hd)
{
- struct gb_interface_block *gb_ib;
+ struct gb_interface *intf;
int ret;
if (payload_length != sizeof(*management)) {
@@ -139,18 +139,18 @@ static void svc_management(struct svc_function_unipro_management *management,
hd->device_id = management->ap_id.device_id;
break;
case SVC_MANAGEMENT_LINK_UP:
- gb_ib = gb_ib_find(hd, management->link_up.module_id);
- if (!gb_ib) {
+ intf = gb_interface_find(hd, management->link_up.module_id);
+ if (!intf) {
dev_err(hd->parent, "Module ID %d not found\n",
management->link_up.module_id);
return;
}
- ret = gb_bundle_init(gb_ib,
+ ret = gb_bundle_init(intf,
management->link_up.interface_id,
management->link_up.device_id);
if (ret)
- dev_err(hd->parent, "error %d initializing "
- "interface block %hhu bundle %hhu\n",
+ dev_err(hd->parent,
+ "error %d initializing interface %hhu bundle %hhu\n",
ret, management->link_up.module_id,
management->link_up.interface_id);
break;