summaryrefslogtreecommitdiffstats
path: root/drivers/staging/comedi/comedi_fops.c
diff options
context:
space:
mode:
authorIan Abbott2013-04-04 15:59:07 +0200
committerGreg Kroah-Hartman2013-04-05 23:33:20 +0200
commit7a4e5a9f3c9f002b36fa91c1accae8f9b5c66cc8 (patch)
treedcafe93945721bc540329059c5d182b13bb52a97 /drivers/staging/comedi/comedi_fops.c
parentstaging: comedi: remove hardware_device from struct comedi_device_info (diff)
downloadkernel-qcow2-linux-7a4e5a9f3c9f002b36fa91c1accae8f9b5c66cc8.tar.gz
kernel-qcow2-linux-7a4e5a9f3c9f002b36fa91c1accae8f9b5c66cc8.tar.xz
kernel-qcow2-linux-7a4e5a9f3c9f002b36fa91c1accae8f9b5c66cc8.zip
staging: comedi: rename dev parameter of device attribute functions
Most of the comedi core uses the identifier `dev` to point to a `struct comedi_device`. The device sysfs attribute functions such as `show_max_read_buffer_kb()` use the parameter id `dev` to point to a `struct device`. Rename the parameter to `csdev` for "class device" for consistency with the functions that call `device_create()` to create these class devices (`comedi_alloc_board_minor()` and `comedi_alloc_subdevice_minor()`). Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/comedi_fops.c')
-rw-r--r--drivers/staging/comedi/comedi_fops.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index b73d8066cd15..f379335073a0 100644
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -272,10 +272,10 @@ static int resize_async_buffer(struct comedi_device *dev,
/* sysfs attribute files */
-static ssize_t show_max_read_buffer_kb(struct device *dev,
+static ssize_t show_max_read_buffer_kb(struct device *csdev,
struct device_attribute *attr, char *buf)
{
- struct comedi_file_info *info = dev_get_drvdata(dev);
+ struct comedi_file_info *info = dev_get_drvdata(csdev);
struct comedi_subdevice *s = comedi_read_subdevice(info);
unsigned int size = 0;
@@ -287,11 +287,11 @@ static ssize_t show_max_read_buffer_kb(struct device *dev,
return snprintf(buf, PAGE_SIZE, "%i\n", size);
}
-static ssize_t store_max_read_buffer_kb(struct device *dev,
+static ssize_t store_max_read_buffer_kb(struct device *csdev,
struct device_attribute *attr,
const char *buf, size_t count)
{
- struct comedi_file_info *info = dev_get_drvdata(dev);
+ struct comedi_file_info *info = dev_get_drvdata(csdev);
struct comedi_subdevice *s = comedi_read_subdevice(info);
unsigned int size;
int err;
@@ -313,10 +313,10 @@ static ssize_t store_max_read_buffer_kb(struct device *dev,
return err ? err : count;
}
-static ssize_t show_read_buffer_kb(struct device *dev,
+static ssize_t show_read_buffer_kb(struct device *csdev,
struct device_attribute *attr, char *buf)
{
- struct comedi_file_info *info = dev_get_drvdata(dev);
+ struct comedi_file_info *info = dev_get_drvdata(csdev);
struct comedi_subdevice *s = comedi_read_subdevice(info);
unsigned int size = 0;
@@ -328,11 +328,11 @@ static ssize_t show_read_buffer_kb(struct device *dev,
return snprintf(buf, PAGE_SIZE, "%i\n", size);
}
-static ssize_t store_read_buffer_kb(struct device *dev,
+static ssize_t store_read_buffer_kb(struct device *csdev,
struct device_attribute *attr,
const char *buf, size_t count)
{
- struct comedi_file_info *info = dev_get_drvdata(dev);
+ struct comedi_file_info *info = dev_get_drvdata(csdev);
struct comedi_subdevice *s = comedi_read_subdevice(info);
unsigned int size;
int err;
@@ -354,11 +354,11 @@ static ssize_t store_read_buffer_kb(struct device *dev,
return err ? err : count;
}
-static ssize_t show_max_write_buffer_kb(struct device *dev,
+static ssize_t show_max_write_buffer_kb(struct device *csdev,
struct device_attribute *attr,
char *buf)
{
- struct comedi_file_info *info = dev_get_drvdata(dev);
+ struct comedi_file_info *info = dev_get_drvdata(csdev);
struct comedi_subdevice *s = comedi_write_subdevice(info);
unsigned int size = 0;
@@ -370,11 +370,11 @@ static ssize_t show_max_write_buffer_kb(struct device *dev,
return snprintf(buf, PAGE_SIZE, "%i\n", size);
}
-static ssize_t store_max_write_buffer_kb(struct device *dev,
+static ssize_t store_max_write_buffer_kb(struct device *csdev,
struct device_attribute *attr,
const char *buf, size_t count)
{
- struct comedi_file_info *info = dev_get_drvdata(dev);
+ struct comedi_file_info *info = dev_get_drvdata(csdev);
struct comedi_subdevice *s = comedi_write_subdevice(info);
unsigned int size;
int err;
@@ -396,10 +396,10 @@ static ssize_t store_max_write_buffer_kb(struct device *dev,
return err ? err : count;
}
-static ssize_t show_write_buffer_kb(struct device *dev,
+static ssize_t show_write_buffer_kb(struct device *csdev,
struct device_attribute *attr, char *buf)
{
- struct comedi_file_info *info = dev_get_drvdata(dev);
+ struct comedi_file_info *info = dev_get_drvdata(csdev);
struct comedi_subdevice *s = comedi_write_subdevice(info);
unsigned int size = 0;
@@ -411,11 +411,11 @@ static ssize_t show_write_buffer_kb(struct device *dev,
return snprintf(buf, PAGE_SIZE, "%i\n", size);
}
-static ssize_t store_write_buffer_kb(struct device *dev,
+static ssize_t store_write_buffer_kb(struct device *csdev,
struct device_attribute *attr,
const char *buf, size_t count)
{
- struct comedi_file_info *info = dev_get_drvdata(dev);
+ struct comedi_file_info *info = dev_get_drvdata(csdev);
struct comedi_subdevice *s = comedi_write_subdevice(info);
unsigned int size;
int err;