From: Johan Hovold Date: Tue, 19 Jul 2016 13:24:49 +0000 (+0200) Subject: greybus: interface: amend interface registration message X-Git-Tag: v4.9.8~1233^2~378^2~21^2~141 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c80a982fc1f8b2b1546c4b2acc08ffd543f6f6c5;p=platform%2Fkernel%2Flinux-rpi3.git greybus: interface: amend interface registration message Amend the interface registration message with the detected interface type, and only print the Ara VID/PID and DDBL1 attributes for the types for which they exist. Also drop the now redundant message about a detected dummy interface from the activate operation helper. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/greybus/interface.c b/drivers/staging/greybus/interface.c index c27b18b..22b7342 100644 --- a/drivers/staging/greybus/interface.c +++ b/drivers/staging/greybus/interface.c @@ -829,7 +829,6 @@ static int gb_interface_activate_operation(struct gb_interface *intf) switch (type) { case GB_SVC_INTF_TYPE_DUMMY: - dev_info(&intf->dev, "dummy interface detected\n"); /* FIXME: handle as an error for now */ return -ENODEV; case GB_SVC_INTF_TYPE_UNIPRO: @@ -1131,10 +1130,20 @@ int gb_interface_add(struct gb_interface *intf) trace_gb_interface_add(intf); - dev_info(&intf->dev, "Interface added: VID=0x%08x, PID=0x%08x\n", - intf->vendor_id, intf->product_id); - dev_info(&intf->dev, "DDBL1 Manufacturer=0x%08x, Product=0x%08x\n", - intf->ddbl1_manufacturer_id, intf->ddbl1_product_id); + dev_info(&intf->dev, "Interface added (%s)\n", + gb_interface_type_string(intf)); + + switch (intf->type) { + case GB_SVC_INTF_TYPE_GREYBUS: + dev_info(&intf->dev, "Ara VID=0x%08x, PID=0x%08x\n", + intf->vendor_id, intf->product_id); + /* fall-through */ + case GB_SVC_INTF_TYPE_UNIPRO: + dev_info(&intf->dev, "DDBL1 Manufacturer=0x%08x, Product=0x%08x\n", + intf->ddbl1_manufacturer_id, + intf->ddbl1_product_id); + break; + } return 0; }