History

PPS: convert class code to use dev_groups

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.

Greg Kroah-Hartman committed 13 years ago

Commit bd0eae41 parent e80b89a3 files · +37 −22Browse files

Unified · Split

3 files
  1. drivers/pps/pps.c +1 −1
  2. drivers/pps/sysfs.c +35 −20
  3. include/linux/pps_kernel.h +1 −1
drivers/pps/pps.c+1−1
@@ -406,7 +406,7 @@ static int __init pps_init(void) · 405 unmodified lines
406 pr_err("failed to allocate class\n");406 pr_err("failed to allocate class\n");
407 return PTR_ERR(pps_class);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 err = alloc_chrdev_region(&pps_devt, 0, PPS_MAX_SOURCES, "pps");411 err = alloc_chrdev_region(&pps_devt, 0, PPS_MAX_SOURCES, "pps");
412 if (err < 0) {412 if (err < 0) {
drivers/pps/sysfs.c+35−20
@@ -29,8 +29,8 @@ · 28 unmodified lines
29 * Attribute functions29 * Attribute functions
30 */30 */
31 31
32static ssize_t pps_show_assert(struct device *dev,32static ssize_t assert_show(struct device *dev, struct device_attribute *attr,
33 struct device_attribute *attr, char *buf)33 char *buf)
34{34{
35 struct pps_device *pps = dev_get_drvdata(dev);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 (long long) pps->assert_tu.sec, pps->assert_tu.nsec,41 (long long) pps->assert_tu.sec, pps->assert_tu.nsec,
42 pps->assert_sequence);42 pps->assert_sequence);
43}43}
44static DEVICE_ATTR_RO(assert);
44 45
45static ssize_t pps_show_clear(struct device *dev,46static ssize_t clear_show(struct device *dev, struct device_attribute *attr,
46 struct device_attribute *attr, char *buf)47 char *buf)
47{48{
48 struct pps_device *pps = dev_get_drvdata(dev);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 (long long) pps->clear_tu.sec, pps->clear_tu.nsec,55 (long long) pps->clear_tu.sec, pps->clear_tu.nsec,
55 pps->clear_sequence);56 pps->clear_sequence);
56}57}
58static DEVICE_ATTR_RO(clear);
57 59
58static ssize_t pps_show_mode(struct device *dev,60static ssize_t mode_show(struct device *dev, struct device_attribute *attr,
59 struct device_attribute *attr, char *buf)61 char *buf)
60{62{
61 struct pps_device *pps = dev_get_drvdata(dev);63 struct pps_device *pps = dev_get_drvdata(dev);
62 64
63 return sprintf(buf, "%4x\n", pps->info.mode);65 return sprintf(buf, "%4x\n", pps->info.mode);
64}66}
67static DEVICE_ATTR_RO(mode);
65 68
66static ssize_t pps_show_echo(struct device *dev,69static ssize_t echo_show(struct device *dev, struct device_attribute *attr,
67 struct device_attribute *attr, char *buf)70 char *buf)
68{71{
69 struct pps_device *pps = dev_get_drvdata(dev);72 struct pps_device *pps = dev_get_drvdata(dev);
70 73
71 return sprintf(buf, "%d\n", !!pps->info.echo);74 return sprintf(buf, "%d\n", !!pps->info.echo);
72}75}
76static DEVICE_ATTR_RO(echo);
73 77
74static ssize_t pps_show_name(struct device *dev,78static ssize_t name_show(struct device *dev, struct device_attribute *attr,
75 struct device_attribute *attr, char *buf)79 char *buf)
76{80{
77 struct pps_device *pps = dev_get_drvdata(dev);81 struct pps_device *pps = dev_get_drvdata(dev);
78 82
79 return sprintf(buf, "%s\n", pps->info.name);83 return sprintf(buf, "%s\n", pps->info.name);
80}84}
85static DEVICE_ATTR_RO(name);
81 86
82static ssize_t pps_show_path(struct device *dev,87static ssize_t path_show(struct device *dev, struct device_attribute *attr,
83 struct device_attribute *attr, char *buf)88 char *buf)
84{89{
85 struct pps_device *pps = dev_get_drvdata(dev);90 struct pps_device *pps = dev_get_drvdata(dev);
86 91
87 return sprintf(buf, "%s\n", pps->info.path);92 return sprintf(buf, "%s\n", pps->info.path);
88}93}
94static DEVICE_ATTR_RO(path);
95
96static 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
106static const struct attribute_group pps_group = {
107 .attrs = pps_attrs,
108};
89 109
90struct device_attribute pps_attrs[] = {110const struct attribute_group *pps_groups[] = {
91 __ATTR(assert, S_IRUGO, pps_show_assert, NULL),111 &pps_group,
92 __ATTR(clear, S_IRUGO, pps_show_clear, NULL),112 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,
98};113};
include/linux/pps_kernel.h+1−1
@@ -80,7 +80,7 @@ struct pps_device { · 79 unmodified lines
80 * Global variables80 * Global variables
81 */81 */
82 82
83extern struct device_attribute pps_attrs[];83extern const struct attribute_group *pps_groups[];
84 84
85/*85/*
86 * Internal functions.86 * Internal functions.

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t