iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dma: convert dma_devclass 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 dma dma_devclass code to use
the correct field.

Cc: Dan Williams <djbw@fb.com>
Acked-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2013-07-24 15:05:08 -07:00
parent c817a67ecb
commit 58b267d3e3
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/dma/dmaengine.c
View File

@ -87,7 +87,8 @@ static struct dma_chan *dev_to_dma_chan(struct device *dev)
return chan_dev->chan; return chan_dev->chan;
} }
static ssize_t show_memcpy_count(struct device *dev, struct device_attribute *attr, char *buf) static ssize_t memcpy_count_show(struct device *dev,
struct device_attribute *attr, char *buf)
{ {
struct dma_chan *chan; struct dma_chan *chan;
unsigned long count = 0; unsigned long count = 0;
@ -106,9 +107,10 @@ static ssize_t show_memcpy_count(struct device *dev, struct device_attribute *at
return err; return err;
} }
static DEVICE_ATTR_RO(memcpy_count);
static ssize_t show_bytes_transferred(struct device *dev, struct device_attribute *attr, static ssize_t bytes_transferred_show(struct device *dev,
char *buf) struct device_attribute *attr, char *buf)
{ {
struct dma_chan *chan; struct dma_chan *chan;
unsigned long count = 0; unsigned long count = 0;
@ -127,8 +129,10 @@ static ssize_t show_bytes_transferred(struct device *dev, struct device_attribut
return err; return err;
} }
static DEVICE_ATTR_RO(bytes_transferred);
static ssize_t show_in_use(struct device *dev, struct device_attribute *attr, char *buf) static ssize_t in_use_show(struct device *dev, struct device_attribute *attr,
char *buf)
{ {
struct dma_chan *chan; struct dma_chan *chan;
int err; int err;
@ -143,13 +147,15 @@ static ssize_t show_in_use(struct device *dev, struct device_attribute *attr, ch
return err; return err;
} }
static DEVICE_ATTR_RO(in_use);
static struct device_attribute dma_attrs[] = { static struct attribute *dma_dev_attrs[] = {
__ATTR(memcpy_count, S_IRUGO, show_memcpy_count, NULL), &dev_attr_memcpy_count.attr,
__ATTR(bytes_transferred, S_IRUGO, show_bytes_transferred, NULL), &dev_attr_bytes_transferred.attr,
__ATTR(in_use, S_IRUGO, show_in_use, NULL), &dev_attr_in_use.attr,
__ATTR_NULL NULL,
}; };
ATTRIBUTE_GROUPS(dma_dev);
static void chan_dev_release(struct device *dev) static void chan_dev_release(struct device *dev)
{ {
@ -167,7 +173,7 @@ static void chan_dev_release(struct device *dev)
static struct class dma_devclass = { static struct class dma_devclass = {
.name = "dma", .name = "dma",
.dev_attrs = dma_attrs, .dev_groups = dma_dev_groups,
.dev_release = chan_dev_release, .dev_release = chan_dev_release,
}; };