diff options
| author | Viresh Kumar <viresh.kumar@linaro.org> | 2015-04-06 15:49:36 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2015-04-06 12:47:06 +0200 |
| commit | 88e6d37c448062b86211e89d23348d952fd166c0 (patch) | |
| tree | f7d2bb683a8349159a759b2e78821504f95a94c3 /drivers/staging/greybus/bundle.c | |
| parent | 9f5f30e712430912f4cff65e97dd36f9b3bdbe4e (diff) | |
| download | linux-88e6d37c448062b86211e89d23348d952fd166c0.tar.bz2 | |
greybus: bundle: s/class_type/class
Alex suggested to name it class instead of class type.
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'drivers/staging/greybus/bundle.c')
| -rw-r--r-- | drivers/staging/greybus/bundle.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/staging/greybus/bundle.c b/drivers/staging/greybus/bundle.c index ce7db9734dad..3f1aa6490e48 100644 --- a/drivers/staging/greybus/bundle.c +++ b/drivers/staging/greybus/bundle.c @@ -22,18 +22,18 @@ static ssize_t device_id_show(struct device *dev, struct device_attribute *attr, } static DEVICE_ATTR_RO(device_id); -static ssize_t class_type_show(struct device *dev, struct device_attribute *attr, - char *buf) +static ssize_t class_show(struct device *dev, struct device_attribute *attr, + char *buf) { struct gb_bundle *bundle = to_gb_bundle(dev); - return sprintf(buf, "%d\n", bundle->class_type); + return sprintf(buf, "%d\n", bundle->class); } -static DEVICE_ATTR_RO(class_type); +static DEVICE_ATTR_RO(class); static struct attribute *bundle_attrs[] = { &dev_attr_device_id.attr, - &dev_attr_class_type.attr, + &dev_attr_class.attr, NULL, }; @@ -66,8 +66,8 @@ static int gb_bundle_match_one_id(struct gb_bundle *bundle, (id->unique_id != bundle->intf->unique_id)) return 0; - if ((id->match_flags & GREYBUS_ID_MATCH_CLASS_TYPE) && - (id->class_type != bundle->class_type)) + if ((id->match_flags & GREYBUS_ID_MATCH_CLASS) && + (id->class != bundle->class)) return 0; return 1; @@ -80,7 +80,7 @@ gb_bundle_match_id(struct gb_bundle *bundle, if (id == NULL) return NULL; - for (; id->vendor || id->product || id->unique_id || id->class_type || + for (; id->vendor || id->product || id->unique_id || id->class || id->driver_info; id++) { if (gb_bundle_match_one_id(bundle, id)) return id; @@ -129,7 +129,7 @@ void gb_bundle_bind_protocols(void) * pointer if a failure occurs due to memory exhaustion. */ struct gb_bundle *gb_bundle_create(struct gb_interface *intf, u8 bundle_id, - u8 class_type) + u8 class) { struct gb_bundle *bundle; int retval; @@ -140,7 +140,7 @@ struct gb_bundle *gb_bundle_create(struct gb_interface *intf, u8 bundle_id, bundle->intf = intf; bundle->id = bundle_id; - bundle->class_type = class_type; + bundle->class = class; INIT_LIST_HEAD(&bundle->connections); /* Invalid device id to start with */ |