diff options
| author | Greg Kroah-Hartman <greg@kroah.com> | 2014-12-11 22:10:53 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2014-12-12 00:53:59 (GMT) |
| commit | 708c126695611f2028aaa152398c75a03aeb1344 (patch) | |
| tree | bc19a33d239662da88b7b8318e26b6db1085a11d | |
| parent | 3763f960a497fed19666dfd3366e28d6bc12b2c2 (diff) | |
| download | linux-708c126695611f2028aaa152398c75a03aeb1344.tar.xz | |
greybus: module versions: remove them
We removed the module version from the spec, so remove them from the
code as well. It's still in the manifest as we need to sync with gbsim
/ firmware when we do that, which will happen sometime in the next
weeks.
Reviewed-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
| -rw-r--r-- | drivers/staging/greybus/manifest.c | 1 | ||||
| -rw-r--r-- | drivers/staging/greybus/module.h | 1 | ||||
| -rw-r--r-- | drivers/staging/greybus/sysfs.c | 2 |
3 files changed, 0 insertions, 4 deletions
diff --git a/drivers/staging/greybus/manifest.c b/drivers/staging/greybus/manifest.c index 28abd2a..57cd594 100644 --- a/drivers/staging/greybus/manifest.c +++ b/drivers/staging/greybus/manifest.c @@ -273,7 +273,6 @@ static bool gb_manifest_parse_module(struct gb_module *gmod, gmod->vendor = le16_to_cpu(desc_module->vendor); gmod->product = le16_to_cpu(desc_module->product); - gmod->version = le16_to_cpu(desc_module->version); gmod->unique_id = le64_to_cpu(desc_module->unique_id); /* Release the module descriptor, now that we're done with it */ diff --git a/drivers/staging/greybus/module.h b/drivers/staging/greybus/module.h index 9e5358b..facc8ba 100644 --- a/drivers/staging/greybus/module.h +++ b/drivers/staging/greybus/module.h @@ -23,7 +23,6 @@ struct gb_module { /* Information taken from the manifest module descriptor */ u16 vendor; u16 product; - u16 version; char *vendor_string; char *product_string; u64 unique_id; diff --git a/drivers/staging/greybus/sysfs.c b/drivers/staging/greybus/sysfs.c index 44b0c70..f9d56e1 100644 --- a/drivers/staging/greybus/sysfs.c +++ b/drivers/staging/greybus/sysfs.c @@ -32,7 +32,6 @@ static DEVICE_ATTR_RO(module_##field) gb_module_attr(vendor, x); gb_module_attr(product, x); -gb_module_attr(version, x); gb_module_attr(unique_id, llX); gb_module_attr(vendor_string, s); gb_module_attr(product_string, s); @@ -40,7 +39,6 @@ gb_module_attr(product_string, s); static struct attribute *module_attrs[] = { &dev_attr_module_vendor.attr, &dev_attr_module_product.attr, - &dev_attr_module_version.attr, &dev_attr_module_unique_id.attr, &dev_attr_module_vendor_string.attr, &dev_attr_module_product_string.attr, |