redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

greybus: interface: rename vendor and product attributes 

Rename vendor and product attributes vendor_id and product_id.

Signed-off-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
hifive-unleashed-5.1
Johan Hovold 2015-11-25 15:58:56 +01:00 committed by Greg Kroah-Hartman
parent fda3412566
commit 9f59263a89
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/greybus/core.c
View File

@ -33,11 +33,11 @@ static int greybus_match_one_id(struct gb_bundle *bundle,
const struct greybus_bundle_id *id)
{
if ((id->match_flags & GREYBUS_ID_MATCH_VENDOR) &&
(id->vendor != bundle->intf->vendor))
(id->vendor != bundle->intf->vendor_id))
return 0;
if ((id->match_flags & GREYBUS_ID_MATCH_PRODUCT) &&
(id->product != bundle->intf->product))
(id->product != bundle->intf->product_id))
return 0;
if ((id->match_flags & GREYBUS_ID_MATCH_CLASS) &&

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

@ -41,7 +41,7 @@ static int download_firmware(struct gb_firmware *firmware, u8 stage)
snprintf(firmware_name, sizeof(firmware_name),
"ara:%08x:%08x:%08x:%08x:%02x.tftf",
intf->unipro_mfg_id, intf->unipro_prod_id,
intf->vendor, intf->product, stage);
intf->vendor_id, intf->product_id, stage);
return request_firmware(&firmware->fw, firmware_name,
&connection->bundle->dev);

8
drivers/staging/greybus/interface.c
View File

@ -21,15 +21,15 @@ static ssize_t field##_show(struct device *dev, \
static DEVICE_ATTR_RO(field)
gb_interface_attr(device_id, d);
gb_interface_attr(vendor, x);
gb_interface_attr(product, x);
gb_interface_attr(vendor_id, x);
gb_interface_attr(product_id, x);
gb_interface_attr(vendor_string, s);
gb_interface_attr(product_string, s);
static struct attribute *interface_attrs[] = {
&dev_attr_device_id.attr,
&dev_attr_vendor.attr,
&dev_attr_product.attr,
&dev_attr_vendor_id.attr,
&dev_attr_product_id.attr,
&dev_attr_vendor_string.attr,
&dev_attr_product_string.attr,
NULL,

4
drivers/staging/greybus/interface.h
View File

@ -28,8 +28,8 @@ struct gb_interface {
/* Information taken from the hotplug event */
u32 unipro_mfg_id;
u32 unipro_prod_id;
u32 vendor;
u32 product;
u32 vendor_id;
u32 product_id;
struct gb_module *module;
struct gb_host_device *hd;

4
drivers/staging/greybus/svc.c
View File

@ -460,8 +460,8 @@ static void svc_process_hotplug(struct work_struct *work)
intf->unipro_mfg_id = le32_to_cpu(hotplug->data.unipro_mfg_id);
intf->unipro_prod_id = le32_to_cpu(hotplug->data.unipro_prod_id);
intf->vendor = le32_to_cpu(hotplug->data.ara_vend_id);
intf->product = le32_to_cpu(hotplug->data.ara_prod_id);
intf->vendor_id = le32_to_cpu(hotplug->data.ara_vend_id);
intf->product_id = le32_to_cpu(hotplug->data.ara_prod_id);
/*
* Create a device id for the interface: