The dev_attrs field of struct class is going away soon, dev_groups should be used instead. This converts the pps class code to use the correct field.
Showing the changes to drivers/pps (2 of 3 files). Show all
Unified · Split
| @@ -406,7 +406,7 @@ static int __init pps_init(void) · 405 unmodified lines | ||
| 406 | 406 | pr_err("failed to allocate class\n"); |
| 407 | 407 | return PTR_ERR(pps_class); |
| 408 | 408 | } |
| 409 | − pps_class->dev_attrs = pps_attrs; | |
| 409 | + pps_class->dev_groups = pps_groups; | |
| 410 | 410 | |
| 411 | 411 | err = alloc_chrdev_region(&pps_devt, 0, PPS_MAX_SOURCES, "pps"); |
| 412 | 412 | if (err < 0) { |
| @@ -29,8 +29,8 @@ · 28 unmodified lines | ||
| 29 | 29 | * Attribute functions |
| 30 | 30 | */ |
| 31 | 31 | |
| 32 | −static ssize_t pps_show_assert(struct device *dev, | |
| 33 | − struct device_attribute *attr, char *buf) | |
| 32 | +static ssize_t assert_show(struct device *dev, struct device_attribute *attr, | |
| 33 | + char *buf) | |
| 34 | 34 | { |
| 35 | 35 | struct pps_device *pps = dev_get_drvdata(dev); |
| 36 | 36 | |
| @@ -41,9 +41,10 @@ static ssize_t pps_show_assert(struct device *dev, · 4 unmodified lines | ||
| 41 | 41 | (long long) pps->assert_tu.sec, pps->assert_tu.nsec, |
| 42 | 42 | pps->assert_sequence); |
| 43 | 43 | } |
| 44 | +static DEVICE_ATTR_RO(assert); | |
| 44 | 45 | |
| 45 | −static ssize_t pps_show_clear(struct device *dev, | |
| 46 | − struct device_attribute *attr, char *buf) | |
| 46 | +static ssize_t clear_show(struct device *dev, struct device_attribute *attr, | |
| 47 | + char *buf) | |
| 47 | 48 | { |
| 48 | 49 | struct pps_device *pps = dev_get_drvdata(dev); |
| 49 | 50 | |
| @@ -54,45 +55,59 @@ static ssize_t pps_show_clear(struct device *dev, · 4 unmodified lines | ||
| 54 | 55 | (long long) pps->clear_tu.sec, pps->clear_tu.nsec, |
| 55 | 56 | pps->clear_sequence); |
| 56 | 57 | } |
| 58 | +static DEVICE_ATTR_RO(clear); | |
| 57 | 59 | |
| 58 | −static ssize_t pps_show_mode(struct device *dev, | |
| 59 | − struct device_attribute *attr, char *buf) | |
| 60 | +static ssize_t mode_show(struct device *dev, struct device_attribute *attr, | |
| 61 | + char *buf) | |
| 60 | 62 | { |
| 61 | 63 | struct pps_device *pps = dev_get_drvdata(dev); |
| 62 | 64 | |
| 63 | 65 | return sprintf(buf, "%4x\n", pps->info.mode); |
| 64 | 66 | } |
| 67 | +static DEVICE_ATTR_RO(mode); | |
| 65 | 68 | |
| 66 | −static ssize_t pps_show_echo(struct device *dev, | |
| 67 | − struct device_attribute *attr, char *buf) | |
| 69 | +static ssize_t echo_show(struct device *dev, struct device_attribute *attr, | |
| 70 | + char *buf) | |
| 68 | 71 | { |
| 69 | 72 | struct pps_device *pps = dev_get_drvdata(dev); |
| 70 | 73 | |
| 71 | 74 | return sprintf(buf, "%d\n", !!pps->info.echo); |
| 72 | 75 | } |
| 76 | +static DEVICE_ATTR_RO(echo); | |
| 73 | 77 | |
| 74 | −static ssize_t pps_show_name(struct device *dev, | |
| 75 | − struct device_attribute *attr, char *buf) | |
| 78 | +static ssize_t name_show(struct device *dev, struct device_attribute *attr, | |
| 79 | + char *buf) | |
| 76 | 80 | { |
| 77 | 81 | struct pps_device *pps = dev_get_drvdata(dev); |
| 78 | 82 | |
| 79 | 83 | return sprintf(buf, "%s\n", pps->info.name); |
| 80 | 84 | } |
| 85 | +static DEVICE_ATTR_RO(name); | |
| 81 | 86 | |
| 82 | −static ssize_t pps_show_path(struct device *dev, | |
| 83 | − struct device_attribute *attr, char *buf) | |
| 87 | +static ssize_t path_show(struct device *dev, struct device_attribute *attr, | |
| 88 | + char *buf) | |
| 84 | 89 | { |
| 85 | 90 | struct pps_device *pps = dev_get_drvdata(dev); |
| 86 | 91 | |
| 87 | 92 | return sprintf(buf, "%s\n", pps->info.path); |
| 88 | 93 | } |
| 94 | +static DEVICE_ATTR_RO(path); | |
| 95 | + | |
| 96 | +static struct attribute *pps_attrs[] = { | |
| 97 | + &dev_attr_assert.attr, | |
| 98 | + &dev_attr_clear.attr, | |
| 99 | + &dev_attr_mode.attr, | |
| 100 | + &dev_attr_echo.attr, | |
| 101 | + &dev_attr_name.attr, | |
| 102 | + &dev_attr_path.attr, | |
| 103 | + NULL, | |
| 104 | +}; | |
| 105 | + | |
| 106 | +static const struct attribute_group pps_group = { | |
| 107 | + .attrs = pps_attrs, | |
| 108 | +}; | |
| 89 | 109 | |
| 90 | −struct device_attribute pps_attrs[] = { | |
| 91 | − __ATTR(assert, S_IRUGO, pps_show_assert, NULL), | |
| 92 | − __ATTR(clear, S_IRUGO, pps_show_clear, NULL), | |
| 93 | − __ATTR(mode, S_IRUGO, pps_show_mode, NULL), | |
| 94 | − __ATTR(echo, S_IRUGO, pps_show_echo, NULL), | |
| 95 | − __ATTR(name, S_IRUGO, pps_show_name, NULL), | |
| 96 | − __ATTR(path, S_IRUGO, pps_show_path, NULL), | |
| 97 | − __ATTR_NULL, | |
| 110 | +const struct attribute_group *pps_groups[] = { | |
| 111 | + &pps_group, | |
| 112 | + NULL, | |
| 98 | 113 | }; |