mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-03 07:38:10 +00:00
Code Issues Releases Wiki Activity

ISDN: 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 mISDN class code to use the
correct field.

Acked-by: Karsten Keil <isdn@linux-pingi.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2013-07-24 15:05:12 -07:00
parent 34da5e6770
commit d98259cbf9
1 changed files with 35 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
drivers/isdn/mISDN/core.c
View file

@ -37,8 +37,8 @@ static void mISDN_dev_release(struct device *dev)
/* nothing to do: the device is part of its parent's data structure */ /* nothing to do: the device is part of its parent's data structure */
} }
static ssize_t _show_id(struct device *dev, static ssize_t id_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct mISDNdevice *mdev = dev_to_mISDN(dev); struct mISDNdevice *mdev = dev_to_mISDN(dev);
@ -46,9 +46,10 @@ static ssize_t _show_id(struct device *dev,
return -ENODEV; return -ENODEV;
return sprintf(buf, "%d\n", mdev->id); return sprintf(buf, "%d\n", mdev->id);
} }
static DEVICE_ATTR_RO(id);
static ssize_t _show_nrbchan(struct device *dev, static ssize_t nrbchan_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct mISDNdevice *mdev = dev_to_mISDN(dev); struct mISDNdevice *mdev = dev_to_mISDN(dev);
@ -56,9 +57,10 @@ static ssize_t _show_nrbchan(struct device *dev,
return -ENODEV; return -ENODEV;
return sprintf(buf, "%d\n", mdev->nrbchan); return sprintf(buf, "%d\n", mdev->nrbchan);
} }
static DEVICE_ATTR_RO(nrbchan);
static ssize_t _show_d_protocols(struct device *dev, static ssize_t d_protocols_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct mISDNdevice *mdev = dev_to_mISDN(dev); struct mISDNdevice *mdev = dev_to_mISDN(dev);
@ -66,9 +68,10 @@ static ssize_t _show_d_protocols(struct device *dev,
return -ENODEV; return -ENODEV;
return sprintf(buf, "%d\n", mdev->Dprotocols); return sprintf(buf, "%d\n", mdev->Dprotocols);
} }
static DEVICE_ATTR_RO(d_protocols);
static ssize_t _show_b_protocols(struct device *dev, static ssize_t b_protocols_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct mISDNdevice *mdev = dev_to_mISDN(dev); struct mISDNdevice *mdev = dev_to_mISDN(dev);
@ -76,9 +79,10 @@ static ssize_t _show_b_protocols(struct device *dev,
return -ENODEV; return -ENODEV;
return sprintf(buf, "%d\n", mdev->Bprotocols | get_all_Bprotocols()); return sprintf(buf, "%d\n", mdev->Bprotocols | get_all_Bprotocols());
} }
static DEVICE_ATTR_RO(b_protocols);
static ssize_t _show_protocol(struct device *dev, static ssize_t protocol_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct mISDNdevice *mdev = dev_to_mISDN(dev); struct mISDNdevice *mdev = dev_to_mISDN(dev);
@ -86,17 +90,19 @@ static ssize_t _show_protocol(struct device *dev,
return -ENODEV; return -ENODEV;
return sprintf(buf, "%d\n", mdev->D.protocol); return sprintf(buf, "%d\n", mdev->D.protocol);
} }
static DEVICE_ATTR_RO(protocol);
static ssize_t _show_name(struct device *dev, static ssize_t name_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
strcpy(buf, dev_name(dev)); strcpy(buf, dev_name(dev));
return strlen(buf); return strlen(buf);
} }
static DEVICE_ATTR_RO(name);
#if 0 /* hangs */ #if 0 /* hangs */
static ssize_t _set_name(struct device *dev, struct device_attribute *attr, static ssize_t name_set(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
int err = 0; int err = 0;
char *out = kmalloc(count + 1, GFP_KERNEL); char *out = kmalloc(count + 1, GFP_KERNEL);
@ -113,10 +119,11 @@ static ssize_t _set_name(struct device *dev, struct device_attribute *attr,
return (err < 0) ? err : count; return (err < 0) ? err : count;
} }
static DEVICE_ATTR_RW(name);
#endif #endif
static ssize_t _show_channelmap(struct device *dev, static ssize_t channelmap_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct mISDNdevice *mdev = dev_to_mISDN(dev); struct mISDNdevice *mdev = dev_to_mISDN(dev);
char *bp = buf; char *bp = buf;
@ -127,18 +134,19 @@ static ssize_t _show_channelmap(struct device *dev,
return bp - buf; return bp - buf;
} }
static DEVICE_ATTR_RO(channelmap);
static struct device_attribute mISDN_dev_attrs[] = { static struct attribute *mISDN_attrs[] = {
__ATTR(id, S_IRUGO, _show_id, NULL), &dev_attr_id.attr,
__ATTR(d_protocols, S_IRUGO, _show_d_protocols, NULL), &dev_attr_d_protocols.attr,
__ATTR(b_protocols, S_IRUGO, _show_b_protocols, NULL), &dev_attr_b_protocols.attr,
__ATTR(protocol, S_IRUGO, _show_protocol, NULL), &dev_attr_protocol.attr,
__ATTR(channelmap, S_IRUGO, _show_channelmap, NULL), &dev_attr_channelmap.attr,
__ATTR(nrbchan, S_IRUGO, _show_nrbchan, NULL), &dev_attr_nrbchan.attr,
__ATTR(name, S_IRUGO, _show_name, NULL), &dev_attr_name.attr,
/* __ATTR(name, S_IRUGO | S_IWUSR, _show_name, _set_name), */ NULL,
{}
}; };
ATTRIBUTE_GROUPS(mISDN);
static int mISDN_uevent(struct device *dev, struct kobj_uevent_env *env) static int mISDN_uevent(struct device *dev, struct kobj_uevent_env *env)
{ {
@ -162,7 +170,7 @@ static struct class mISDN_class = {
.name = "mISDN", .name = "mISDN",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.dev_uevent = mISDN_uevent, .dev_uevent = mISDN_uevent,
.dev_attrs = mISDN_dev_attrs, .dev_groups = mISDN_groups,
.dev_release = mISDN_dev_release, .dev_release = mISDN_dev_release,
.class_release = mISDN_class_release, .class_release = mISDN_class_release,
}; };