Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-07 22:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PPS: convert class code to use dev_groups

Browse Source 
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.

Cc: Rodolfo Giometti <giometti@enneenne.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2013-07-24 15:05:19 -07:00
parent e80b89a5f1
commit bd0eae4e1c
3 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/pps/pps.c
View File

@ -406,7 +406,7 @@ static int __init pps_init(void)
pr_err("failed to allocate class\n"); pr_err("failed to allocate class\n");
return PTR_ERR(pps_class); return PTR_ERR(pps_class);
} }
pps_class->dev_attrs = pps_attrs; pps_class->dev_groups = pps_groups;
err = alloc_chrdev_region(&pps_devt, 0, PPS_MAX_SOURCES, "pps"); err = alloc_chrdev_region(&pps_devt, 0, PPS_MAX_SOURCES, "pps");
if (err < 0) { if (err < 0) {

55
drivers/pps/sysfs.c
View File

@ -29,8 +29,8 @@
* Attribute functions * Attribute functions
*/ */
static ssize_t pps_show_assert(struct device *dev, static ssize_t assert_show(struct device *dev, struct device_attribute *attr,
struct device_attribute *attr, char *buf) char *buf)
{ {
struct pps_device *pps = dev_get_drvdata(dev); struct pps_device *pps = dev_get_drvdata(dev);
@ -41,9 +41,10 @@ static ssize_t pps_show_assert(struct device *dev,
(long long) pps->assert_tu.sec, pps->assert_tu.nsec, (long long) pps->assert_tu.sec, pps->assert_tu.nsec,
pps->assert_sequence); pps->assert_sequence);
} }
static DEVICE_ATTR_RO(assert);
static ssize_t pps_show_clear(struct device *dev, static ssize_t clear_show(struct device *dev, struct device_attribute *attr,
struct device_attribute *attr, char *buf) char *buf)
{ {
struct pps_device *pps = dev_get_drvdata(dev); struct pps_device *pps = dev_get_drvdata(dev);
@ -54,45 +55,59 @@ static ssize_t pps_show_clear(struct device *dev,
(long long) pps->clear_tu.sec, pps->clear_tu.nsec, (long long) pps->clear_tu.sec, pps->clear_tu.nsec,
pps->clear_sequence); pps->clear_sequence);
} }
static DEVICE_ATTR_RO(clear);
static ssize_t pps_show_mode(struct device *dev, static ssize_t mode_show(struct device *dev, struct device_attribute *attr,
struct device_attribute *attr, char *buf) char *buf)
{ {
struct pps_device *pps = dev_get_drvdata(dev); struct pps_device *pps = dev_get_drvdata(dev);
return sprintf(buf, "%4x\n", pps->info.mode); return sprintf(buf, "%4x\n", pps->info.mode);
} }
static DEVICE_ATTR_RO(mode);
static ssize_t pps_show_echo(struct device *dev, static ssize_t echo_show(struct device *dev, struct device_attribute *attr,
struct device_attribute *attr, char *buf) char *buf)
{ {
struct pps_device *pps = dev_get_drvdata(dev); struct pps_device *pps = dev_get_drvdata(dev);
return sprintf(buf, "%d\n", !!pps->info.echo); return sprintf(buf, "%d\n", !!pps->info.echo);
} }
static DEVICE_ATTR_RO(echo);
static ssize_t pps_show_name(struct device *dev, static ssize_t name_show(struct device *dev, struct device_attribute *attr,
struct device_attribute *attr, char *buf) char *buf)
{ {
struct pps_device *pps = dev_get_drvdata(dev); struct pps_device *pps = dev_get_drvdata(dev);
return sprintf(buf, "%s\n", pps->info.name); return sprintf(buf, "%s\n", pps->info.name);
} }
static DEVICE_ATTR_RO(name);
static ssize_t pps_show_path(struct device *dev, static ssize_t path_show(struct device *dev, struct device_attribute *attr,
struct device_attribute *attr, char *buf) char *buf)
{ {
struct pps_device *pps = dev_get_drvdata(dev); struct pps_device *pps = dev_get_drvdata(dev);
return sprintf(buf, "%s\n", pps->info.path); return sprintf(buf, "%s\n", pps->info.path);
} }
static DEVICE_ATTR_RO(path);
struct device_attribute pps_attrs[] = { static struct attribute *pps_attrs[] = {
__ATTR(assert, S_IRUGO, pps_show_assert, NULL), &dev_attr_assert.attr,
__ATTR(clear, S_IRUGO, pps_show_clear, NULL), &dev_attr_clear.attr,
__ATTR(mode, S_IRUGO, pps_show_mode, NULL), &dev_attr_mode.attr,
__ATTR(echo, S_IRUGO, pps_show_echo, NULL), &dev_attr_echo.attr,
__ATTR(name, S_IRUGO, pps_show_name, NULL), &dev_attr_name.attr,
__ATTR(path, S_IRUGO, pps_show_path, NULL), &dev_attr_path.attr,
__ATTR_NULL, NULL,
};
static const struct attribute_group pps_group = {
.attrs = pps_attrs,
};
const struct attribute_group *pps_groups[] = {
&pps_group,
NULL,
}; };

2
include/linux/pps_kernel.h
View File

@ -80,7 +80,7 @@ struct pps_device {
* Global variables * Global variables
*/ */
extern struct device_attribute pps_attrs[]; extern const struct attribute_group *pps_groups[];
/* /*
* Internal functions. * Internal functions.