commit 6d63ff7a2d40b8865eb00857cdb910944c17f0b2
author Matt Porter <mporter@linaro.org> Fri Sep 26 20:49:48 2014 -0500
committer Greg Kroah-Hartman <greg@kroah.com> Mon Sep 29 17:54:08 2014 -0700
tree 5d21c31bc187cf2dc7192c13f308889bd955d1ce
parent dce745af21884c9e27665a333d3b4fc9fcf643e7

greybus: update descriptor module_id->module to match spec

Greybus spec was updated to change the name of the Module ID descriptor
to simply Module descriptor. Change everything accordingly.

Signed-off-by: Matt Porter <mporter@linaro.org>
Reviewed-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

drivers/staging/greybus/sysfs.c

diff --git a/drivers/staging/greybus/sysfs.c b/drivers/staging/greybus/sysfs.c
index 792a238..8cedd4b 100644
--- a/drivers/staging/greybus/sysfs.c
+++ b/drivers/staging/greybus/sysfs.c
@@ -74,7 +74,7 @@
 				     char *buf)				\
 {									\
 	struct greybus_module *gmod = to_greybus_module(dev);		\
-	return sprintf(buf, "%x\n", gmod->module_id.field);		\
+	return sprintf(buf, "%x\n", gmod->module.field);		\
 }									\
 static DEVICE_ATTR_RO(module_##field)
 
@@ -89,7 +89,7 @@
 	struct greybus_module *gmod = to_greybus_module(dev);
 
 	return sprintf(buf, "%s",
-		       greybus_string(gmod, gmod->module_id.vendor_stringid));
+		       greybus_string(gmod, gmod->module.vendor_stringid));
 }
 static DEVICE_ATTR_RO(module_vendor_string);
 
@@ -100,7 +100,7 @@
 	struct greybus_module *gmod = to_greybus_module(dev);
 
 	return sprintf(buf, "%s",
-		       greybus_string(gmod, gmod->module_id.product_stringid));
+		       greybus_string(gmod, gmod->module.product_stringid));
 }
 static DEVICE_ATTR_RO(module_product_string);
 
@@ -119,17 +119,17 @@
 	struct greybus_module *gmod = to_greybus_module(kobj_to_dev(kobj));
 
 	if ((a == &dev_attr_module_vendor_string.attr) &&
-	    (gmod->module_id.vendor_stringid))
+	    (gmod->module.vendor_stringid))
 		return a->mode;
 	if ((a == &dev_attr_module_product_string.attr) &&
-	    (gmod->module_id.product_stringid))
+	    (gmod->module.product_stringid))
 		return a->mode;
 
 	// FIXME - make this a dynamic structure to "know" if it really is here
 	// or not easier?
-	if (gmod->module_id.vendor ||
-	    gmod->module_id.product ||
-	    gmod->module_id.version)
+	if (gmod->module.vendor ||
+	    gmod->module.product ||
+	    gmod->module.version)
 		return a->mode;
 	return 0;
 }