From: Ian Abbott Date: Thu, 4 Apr 2013 13:59:07 +0000 (+0100) Subject: staging: comedi: rename dev parameter of device attribute functions X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7a4e5a9f3c9f002b36fa91c1accae8f9b5c66cc8;p=linux-beck.git 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 Reviewed-by: H Hartley Sweeten Signed-off-by: Greg Kroah-Hartman --- 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;