openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

greybus: expose full 32 bits of vid/pid to userspace 

Now that userspace is ready for all 32 bits of the vid/pid, take off our
mask and send the full values.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2016-02-26 21:54:38 -08:00
parent fb37f137b7
commit 611924dd72
2 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,9 +112,8 @@ static int greybus_uevent(struct device *dev, struct kobj_uevent_env *env)
if (intf) {
if (add_uevent_var(env, "INTERFACE=%u", intf->interface_id))
return -ENOMEM;
if (add_uevent_var(env, "GREYBUS_ID=%04x/%04x",
(u16)(intf->vendor_id & 0xffff),
(u16)(intf->product_id & 0xffff)))
if (add_uevent_var(env, "GREYBUS_ID=%08x/%08x",
intf->vendor_id, intf->product_id))
return -ENOMEM;
}

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

@ -23,33 +23,12 @@ static DEVICE_ATTR_RO(field)
gb_interface_attr(ddbl1_manufacturer_id, "0x%08x");
gb_interface_attr(ddbl1_product_id, "0x%08x");
gb_interface_attr(interface_id, "%u");
gb_interface_attr(vendor_id, "0x%08x");
gb_interface_attr(product_id, "0x%08x");
gb_interface_attr(vendor_string, "%s");
gb_interface_attr(product_string, "%s");
gb_interface_attr(serial_number, "0x%016llx");
static ssize_t vendor_id_show(struct device *dev,
struct device_attribute *attr,
char *buf)
{
struct gb_interface *intf = to_gb_interface(dev);
/* clear the upper 16-bits to keep userspace "simple" */
return scnprintf(buf, PAGE_SIZE, "0x%04x\n",
(0x0000FFFF & intf->vendor_id));
}
static DEVICE_ATTR_RO(vendor_id);
static ssize_t product_id_show(struct device *dev, struct device_attribute *attr,
char *buf)
{
struct gb_interface *intf = to_gb_interface(dev);
/* clear the upper 16-bits to keep userspace "simple" */
return scnprintf(buf, PAGE_SIZE, "0x%04x\n",
(0x0000FFFF & intf->product_id));
}
static DEVICE_ATTR_RO(product_id);
static ssize_t version_show(struct device *dev, struct device_attribute *attr,
char *buf)
{