Message ID | 20220527185651.465204-1-joetalbott@gmail.com (mailing list archive) |
---|---|
State | Changes Requested |
Headers | show |
Series | [1/1] iio: Prefer octal over symbolic permissions. | expand |
On Fri, 27 May 2022 14:56:52 -0400 Joe Simmons-Talbott <joetalbott@gmail.com> wrote: > As reported by checkpatch.pl use ocatl permissions rather than symbolic > permissions. > > Signed-off-by: Joe Simmons-Talbott <joetalbott@gmail.com> Hi Joe, Why the resend? Given change of description, I'm guessing this is v2 because of feedback on a similar patch elsewhere. If so, please put the version number in the patch log and provide a changelog below the --- Hmm. I guess I don't really mind cleaning this up though it is some churn in core code which is usually something we try to avoid for fairly trivial style reasons. One request inline (though I suspect it applies in several places, I just haven't checked ;) Thanks, Jonathan > --- > drivers/iio/industrialio-buffer.c | 12 ++++++------ > drivers/iio/industrialio-core.c | 10 +++++----- > drivers/iio/industrialio-trigger.c | 4 ++-- > 3 files changed, 13 insertions(+), 13 deletions(-) > > diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c > index b078eb2f3c9d..c27f74a3c0f3 100644 > --- a/drivers/iio/industrialio-buffer.c > +++ b/drivers/iio/industrialio-buffer.c > @@ -1391,17 +1391,17 @@ static ssize_t direction_show(struct device *dev, > } > } > > -static DEVICE_ATTR(length, S_IRUGO | S_IWUSR, iio_buffer_read_length, > +static DEVICE_ATTR(length, 0644, iio_buffer_read_length, > iio_buffer_write_length); > static struct device_attribute dev_attr_length_ro = __ATTR(length, > - S_IRUGO, iio_buffer_read_length, NULL); > -static DEVICE_ATTR(enable, S_IRUGO | S_IWUSR, > + 0444, iio_buffer_read_length, NULL); > +static DEVICE_ATTR(enable, 0644, > iio_buffer_show_enable, iio_buffer_store_enable); > -static DEVICE_ATTR(watermark, S_IRUGO | S_IWUSR, > +static DEVICE_ATTR(watermark, 0644, > iio_buffer_show_watermark, iio_buffer_store_watermark); > static struct device_attribute dev_attr_watermark_ro = __ATTR(watermark, > - S_IRUGO, iio_buffer_show_watermark, NULL); > -static DEVICE_ATTR(data_available, S_IRUGO, > + 0444, iio_buffer_show_watermark, NULL); > +static DEVICE_ATTR(data_available, 0444, > iio_dma_show_data_available, NULL); a side effect of this change a slight shortening of how long the above two lines will be if combined into one. It's now sub 80 chars I think, so please make them a single line. Also check for similar cases elsewhere. > static DEVICE_ATTR_RO(direction); > > diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c > index e1ed44dec2ab..35de348d686e 100644 > --- a/drivers/iio/industrialio-core.c > +++ b/drivers/iio/industrialio-core.c > @@ -1114,12 +1114,12 @@ int __iio_device_attr_init(struct device_attribute *dev_attr, > dev_attr->attr.name = name; > > if (readfunc) { > - dev_attr->attr.mode |= S_IRUGO; > + dev_attr->attr.mode |= 0444; > dev_attr->show = readfunc; > } > > if (writefunc) { > - dev_attr->attr.mode |= S_IWUSR; > + dev_attr->attr.mode |= 0200; > dev_attr->store = writefunc; > } > > @@ -1401,7 +1401,7 @@ static ssize_t iio_show_dev_name(struct device *dev, > return sysfs_emit(buf, "%s\n", indio_dev->name); > } > > -static DEVICE_ATTR(name, S_IRUGO, iio_show_dev_name, NULL); > +static DEVICE_ATTR(name, 0444, iio_show_dev_name, NULL); > > static ssize_t iio_show_dev_label(struct device *dev, > struct device_attribute *attr, > @@ -1411,7 +1411,7 @@ static ssize_t iio_show_dev_label(struct device *dev, > return sysfs_emit(buf, "%s\n", indio_dev->label); > } > > -static DEVICE_ATTR(label, S_IRUGO, iio_show_dev_label, NULL); > +static DEVICE_ATTR(label, 0444, iio_show_dev_label, NULL); > > static ssize_t iio_show_timestamp_clock(struct device *dev, > struct device_attribute *attr, > @@ -1509,7 +1509,7 @@ int iio_device_register_sysfs_group(struct iio_dev *indio_dev, > return 0; > } > > -static DEVICE_ATTR(current_timestamp_clock, S_IRUGO | S_IWUSR, > +static DEVICE_ATTR(current_timestamp_clock, 0644, > iio_show_timestamp_clock, iio_store_timestamp_clock); > > static int iio_device_register_sysfs(struct iio_dev *indio_dev) > diff --git a/drivers/iio/industrialio-trigger.c b/drivers/iio/industrialio-trigger.c > index f504ed351b3e..e22a35634f2c 100644 > --- a/drivers/iio/industrialio-trigger.c > +++ b/drivers/iio/industrialio-trigger.c > @@ -54,7 +54,7 @@ static ssize_t iio_trigger_read_name(struct device *dev, > return sysfs_emit(buf, "%s\n", trig->name); > } > > -static DEVICE_ATTR(name, S_IRUGO, iio_trigger_read_name, NULL); > +static DEVICE_ATTR(name, 0444, iio_trigger_read_name, NULL); > > static struct attribute *iio_trig_dev_attrs[] = { > &dev_attr_name.attr, > @@ -494,7 +494,7 @@ static ssize_t iio_trigger_write_current(struct device *dev, > return ret; > } > > -static DEVICE_ATTR(current_trigger, S_IRUGO | S_IWUSR, > +static DEVICE_ATTR(current_trigger, 0644, > iio_trigger_read_current, > iio_trigger_write_current); >
On Sat, 2022-05-28 at 18:34 +0100, Jonathan Cameron wrote: > On Fri, 27 May 2022 14:56:52 -0400 > Joe Simmons-Talbott <joetalbott@gmail.com> wrote: > > As reported by checkpatch.pl use ocatl permissions rather than symbolic > > permissions. [] > Why the resend? Given change of description, I'm guessing this is v2 > because of feedback on a similar patch elsewhere. If so, please > put the version number in the patch log and provide a changelog > below the --- > > Hmm. I guess I don't really mind cleaning this up though it is > some churn in core code which is usually something we try to avoid > for fairly trivial style reasons. > > One request inline (though I suspect it applies in several places, > I just haven't checked ;) [] > > diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c [] > > @@ -1391,17 +1391,17 @@ static ssize_t direction_show(struct device *dev, > > } > > } > > > > -static DEVICE_ATTR(length, S_IRUGO | S_IWUSR, iio_buffer_read_length, > > +static DEVICE_ATTR(length, 0644, iio_buffer_read_length, > > iio_buffer_write_length); > > static struct device_attribute dev_attr_length_ro = __ATTR(length, > > - S_IRUGO, iio_buffer_read_length, NULL); > > -static DEVICE_ATTR(enable, S_IRUGO | S_IWUSR, > > + 0444, iio_buffer_read_length, NULL); > > +static DEVICE_ATTR(enable, 0644, > > iio_buffer_show_enable, iio_buffer_store_enable); > > -static DEVICE_ATTR(watermark, S_IRUGO | S_IWUSR, > > +static DEVICE_ATTR(watermark, 0644, > > iio_buffer_show_watermark, iio_buffer_store_watermark); > > static struct device_attribute dev_attr_watermark_ro = __ATTR(watermark, > > - S_IRUGO, iio_buffer_show_watermark, NULL); > > -static DEVICE_ATTR(data_available, S_IRUGO, > > + 0444, iio_buffer_show_watermark, NULL); > > +static DEVICE_ATTR(data_available, 0444, > > iio_dma_show_data_available, NULL); > > a side effect of this change a slight shortening of how long the above > two lines will be if combined into one. It's now sub 80 chars > I think, so please make them a single line. Also check for similar > cases elsewhere. another possibility it to rename the function to <var>_show and change static DEVICE_ATTR(foo, 0444, <var>, NULL) to static DEVICE_ATTR_RO(<var>) and also use DEVICE_ATTR_RW with appropriate function renaming where feasible.
On Sat, May 28, 2022 at 1:25 PM Jonathan Cameron <jic23@kernel.org> wrote: > > On Fri, 27 May 2022 14:56:52 -0400 > Joe Simmons-Talbott <joetalbott@gmail.com> wrote: > > > As reported by checkpatch.pl use ocatl permissions rather than symbolic > > permissions. > > > > Signed-off-by: Joe Simmons-Talbott <joetalbott@gmail.com> > > Hi Joe, > > Why the resend? Given change of description, I'm guessing this is v2 > because of feedback on a similar patch elsewhere. If so, please > put the version number in the patch log and provide a changelog > below the --- I sent the patch again because I neglected to include linux-kernel and you in the original patch's recipients. I wasn't sure if I should include the v2 but will in the future. Should I use v3 for my updated patch? Thanks, Joe > > > Hmm. I guess I don't really mind cleaning this up though it is > some churn in core code which is usually something we try to avoid > for fairly trivial style reasons. > > One request inline (though I suspect it applies in several places, > I just haven't checked ;) > > Thanks, > > Jonathan > > > --- > > drivers/iio/industrialio-buffer.c | 12 ++++++------ > > drivers/iio/industrialio-core.c | 10 +++++----- > > drivers/iio/industrialio-trigger.c | 4 ++-- > > 3 files changed, 13 insertions(+), 13 deletions(-) > > > > diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c > > index b078eb2f3c9d..c27f74a3c0f3 100644 > > --- a/drivers/iio/industrialio-buffer.c > > +++ b/drivers/iio/industrialio-buffer.c > > @@ -1391,17 +1391,17 @@ static ssize_t direction_show(struct device *dev, > > } > > } > > > > -static DEVICE_ATTR(length, S_IRUGO | S_IWUSR, iio_buffer_read_length, > > +static DEVICE_ATTR(length, 0644, iio_buffer_read_length, > > iio_buffer_write_length); > > static struct device_attribute dev_attr_length_ro = __ATTR(length, > > - S_IRUGO, iio_buffer_read_length, NULL); > > -static DEVICE_ATTR(enable, S_IRUGO | S_IWUSR, > > + 0444, iio_buffer_read_length, NULL); > > +static DEVICE_ATTR(enable, 0644, > > iio_buffer_show_enable, iio_buffer_store_enable); > > -static DEVICE_ATTR(watermark, S_IRUGO | S_IWUSR, > > +static DEVICE_ATTR(watermark, 0644, > > iio_buffer_show_watermark, iio_buffer_store_watermark); > > static struct device_attribute dev_attr_watermark_ro = __ATTR(watermark, > > - S_IRUGO, iio_buffer_show_watermark, NULL); > > -static DEVICE_ATTR(data_available, S_IRUGO, > > + 0444, iio_buffer_show_watermark, NULL); > > +static DEVICE_ATTR(data_available, 0444, > > iio_dma_show_data_available, NULL); > > a side effect of this change a slight shortening of how long the above > two lines will be if combined into one. It's now sub 80 chars > I think, so please make them a single line. Also check for similar > cases elsewhere. > > > > static DEVICE_ATTR_RO(direction); > > > > diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c > > index e1ed44dec2ab..35de348d686e 100644 > > --- a/drivers/iio/industrialio-core.c > > +++ b/drivers/iio/industrialio-core.c > > @@ -1114,12 +1114,12 @@ int __iio_device_attr_init(struct device_attribute *dev_attr, > > dev_attr->attr.name = name; > > > > if (readfunc) { > > - dev_attr->attr.mode |= S_IRUGO; > > + dev_attr->attr.mode |= 0444; > > dev_attr->show = readfunc; > > } > > > > if (writefunc) { > > - dev_attr->attr.mode |= S_IWUSR; > > + dev_attr->attr.mode |= 0200; > > dev_attr->store = writefunc; > > } > > > > @@ -1401,7 +1401,7 @@ static ssize_t iio_show_dev_name(struct device *dev, > > return sysfs_emit(buf, "%s\n", indio_dev->name); > > } > > > > -static DEVICE_ATTR(name, S_IRUGO, iio_show_dev_name, NULL); > > +static DEVICE_ATTR(name, 0444, iio_show_dev_name, NULL); > > > > static ssize_t iio_show_dev_label(struct device *dev, > > struct device_attribute *attr, > > @@ -1411,7 +1411,7 @@ static ssize_t iio_show_dev_label(struct device *dev, > > return sysfs_emit(buf, "%s\n", indio_dev->label); > > } > > > > -static DEVICE_ATTR(label, S_IRUGO, iio_show_dev_label, NULL); > > +static DEVICE_ATTR(label, 0444, iio_show_dev_label, NULL); > > > > static ssize_t iio_show_timestamp_clock(struct device *dev, > > struct device_attribute *attr, > > @@ -1509,7 +1509,7 @@ int iio_device_register_sysfs_group(struct iio_dev *indio_dev, > > return 0; > > } > > > > -static DEVICE_ATTR(current_timestamp_clock, S_IRUGO | S_IWUSR, > > +static DEVICE_ATTR(current_timestamp_clock, 0644, > > iio_show_timestamp_clock, iio_store_timestamp_clock); > > > > static int iio_device_register_sysfs(struct iio_dev *indio_dev) > > diff --git a/drivers/iio/industrialio-trigger.c b/drivers/iio/industrialio-trigger.c > > index f504ed351b3e..e22a35634f2c 100644 > > --- a/drivers/iio/industrialio-trigger.c > > +++ b/drivers/iio/industrialio-trigger.c > > @@ -54,7 +54,7 @@ static ssize_t iio_trigger_read_name(struct device *dev, > > return sysfs_emit(buf, "%s\n", trig->name); > > } > > > > -static DEVICE_ATTR(name, S_IRUGO, iio_trigger_read_name, NULL); > > +static DEVICE_ATTR(name, 0444, iio_trigger_read_name, NULL); > > > > static struct attribute *iio_trig_dev_attrs[] = { > > &dev_attr_name.attr, > > @@ -494,7 +494,7 @@ static ssize_t iio_trigger_write_current(struct device *dev, > > return ret; > > } > > > > -static DEVICE_ATTR(current_trigger, S_IRUGO | S_IWUSR, > > +static DEVICE_ATTR(current_trigger, 0644, > > iio_trigger_read_current, > > iio_trigger_write_current); > > >
On Sun, 29 May 2022 10:08:21 -0400 Joe Talbott <joetalbott@gmail.com> wrote: > On Sat, May 28, 2022 at 1:25 PM Jonathan Cameron <jic23@kernel.org> wrote: > > > > On Fri, 27 May 2022 14:56:52 -0400 > > Joe Simmons-Talbott <joetalbott@gmail.com> wrote: > > > > > As reported by checkpatch.pl use ocatl permissions rather than symbolic > > > permissions. > > > > > > Signed-off-by: Joe Simmons-Talbott <joetalbott@gmail.com> > > > > Hi Joe, > > > > Why the resend? Given change of description, I'm guessing this is v2 > > because of feedback on a similar patch elsewhere. If so, please > > put the version number in the patch log and provide a changelog > > below the --- > > > I sent the patch again because I neglected to include linux-kernel and > you in the > original patch's recipients. I wasn't sure if I should include the v2 > but will in the future. For that case, common choice is [RESEND PATCH .... with a brief note in the cover letter that you missed some to/cc > Should I use v3 for my updated patch? v2 is fine given v2 doesn't yet exist - v3 also fine though... Jonathan > > Thanks, > Joe > > > > > > > Hmm. I guess I don't really mind cleaning this up though it is > > some churn in core code which is usually something we try to avoid > > for fairly trivial style reasons. > > > > One request inline (though I suspect it applies in several places, > > I just haven't checked ;) > > > > Thanks, > > > > Jonathan > > > > > --- > > > drivers/iio/industrialio-buffer.c | 12 ++++++------ > > > drivers/iio/industrialio-core.c | 10 +++++----- > > > drivers/iio/industrialio-trigger.c | 4 ++-- > > > 3 files changed, 13 insertions(+), 13 deletions(-) > > > > > > diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c > > > index b078eb2f3c9d..c27f74a3c0f3 100644 > > > --- a/drivers/iio/industrialio-buffer.c > > > +++ b/drivers/iio/industrialio-buffer.c > > > @@ -1391,17 +1391,17 @@ static ssize_t direction_show(struct device *dev, > > > } > > > } > > > > > > -static DEVICE_ATTR(length, S_IRUGO | S_IWUSR, iio_buffer_read_length, > > > +static DEVICE_ATTR(length, 0644, iio_buffer_read_length, > > > iio_buffer_write_length); > > > static struct device_attribute dev_attr_length_ro = __ATTR(length, > > > - S_IRUGO, iio_buffer_read_length, NULL); > > > -static DEVICE_ATTR(enable, S_IRUGO | S_IWUSR, > > > + 0444, iio_buffer_read_length, NULL); > > > +static DEVICE_ATTR(enable, 0644, > > > iio_buffer_show_enable, iio_buffer_store_enable); > > > -static DEVICE_ATTR(watermark, S_IRUGO | S_IWUSR, > > > +static DEVICE_ATTR(watermark, 0644, > > > iio_buffer_show_watermark, iio_buffer_store_watermark); > > > static struct device_attribute dev_attr_watermark_ro = __ATTR(watermark, > > > - S_IRUGO, iio_buffer_show_watermark, NULL); > > > -static DEVICE_ATTR(data_available, S_IRUGO, > > > + 0444, iio_buffer_show_watermark, NULL); > > > +static DEVICE_ATTR(data_available, 0444, > > > iio_dma_show_data_available, NULL); > > > > a side effect of this change a slight shortening of how long the above > > two lines will be if combined into one. It's now sub 80 chars > > I think, so please make them a single line. Also check for similar > > cases elsewhere. > > > > > > > static DEVICE_ATTR_RO(direction); > > > > > > diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c > > > index e1ed44dec2ab..35de348d686e 100644 > > > --- a/drivers/iio/industrialio-core.c > > > +++ b/drivers/iio/industrialio-core.c > > > @@ -1114,12 +1114,12 @@ int __iio_device_attr_init(struct device_attribute *dev_attr, > > > dev_attr->attr.name = name; > > > > > > if (readfunc) { > > > - dev_attr->attr.mode |= S_IRUGO; > > > + dev_attr->attr.mode |= 0444; > > > dev_attr->show = readfunc; > > > } > > > > > > if (writefunc) { > > > - dev_attr->attr.mode |= S_IWUSR; > > > + dev_attr->attr.mode |= 0200; > > > dev_attr->store = writefunc; > > > } > > > > > > @@ -1401,7 +1401,7 @@ static ssize_t iio_show_dev_name(struct device *dev, > > > return sysfs_emit(buf, "%s\n", indio_dev->name); > > > } > > > > > > -static DEVICE_ATTR(name, S_IRUGO, iio_show_dev_name, NULL); > > > +static DEVICE_ATTR(name, 0444, iio_show_dev_name, NULL); > > > > > > static ssize_t iio_show_dev_label(struct device *dev, > > > struct device_attribute *attr, > > > @@ -1411,7 +1411,7 @@ static ssize_t iio_show_dev_label(struct device *dev, > > > return sysfs_emit(buf, "%s\n", indio_dev->label); > > > } > > > > > > -static DEVICE_ATTR(label, S_IRUGO, iio_show_dev_label, NULL); > > > +static DEVICE_ATTR(label, 0444, iio_show_dev_label, NULL); > > > > > > static ssize_t iio_show_timestamp_clock(struct device *dev, > > > struct device_attribute *attr, > > > @@ -1509,7 +1509,7 @@ int iio_device_register_sysfs_group(struct iio_dev *indio_dev, > > > return 0; > > > } > > > > > > -static DEVICE_ATTR(current_timestamp_clock, S_IRUGO | S_IWUSR, > > > +static DEVICE_ATTR(current_timestamp_clock, 0644, > > > iio_show_timestamp_clock, iio_store_timestamp_clock); > > > > > > static int iio_device_register_sysfs(struct iio_dev *indio_dev) > > > diff --git a/drivers/iio/industrialio-trigger.c b/drivers/iio/industrialio-trigger.c > > > index f504ed351b3e..e22a35634f2c 100644 > > > --- a/drivers/iio/industrialio-trigger.c > > > +++ b/drivers/iio/industrialio-trigger.c > > > @@ -54,7 +54,7 @@ static ssize_t iio_trigger_read_name(struct device *dev, > > > return sysfs_emit(buf, "%s\n", trig->name); > > > } > > > > > > -static DEVICE_ATTR(name, S_IRUGO, iio_trigger_read_name, NULL); > > > +static DEVICE_ATTR(name, 0444, iio_trigger_read_name, NULL); > > > > > > static struct attribute *iio_trig_dev_attrs[] = { > > > &dev_attr_name.attr, > > > @@ -494,7 +494,7 @@ static ssize_t iio_trigger_write_current(struct device *dev, > > > return ret; > > > } > > > > > > -static DEVICE_ATTR(current_trigger, S_IRUGO | S_IWUSR, > > > +static DEVICE_ATTR(current_trigger, 0644, > > > iio_trigger_read_current, > > > iio_trigger_write_current); > > > > >
On Tue, May 31, 2022 at 10:56:47AM +0100, Jonathan Cameron wrote: > On Sun, 29 May 2022 10:08:21 -0400 > Joe Talbott <joetalbott@gmail.com> wrote: > > > On Sat, May 28, 2022 at 1:25 PM Jonathan Cameron <jic23@kernel.org> wrote: > > > > > > On Fri, 27 May 2022 14:56:52 -0400 > > > Joe Simmons-Talbott <joetalbott@gmail.com> wrote: > > > > > > > As reported by checkpatch.pl use ocatl permissions rather than symbolic > > > > permissions. > > > > > > > > Signed-off-by: Joe Simmons-Talbott <joetalbott@gmail.com> > > > > > > Hi Joe, > > > > > > Why the resend? Given change of description, I'm guessing this is v2 > > > because of feedback on a similar patch elsewhere. If so, please > > > put the version number in the patch log and provide a changelog > > > below the --- > > > > > > I sent the patch again because I neglected to include linux-kernel and > > you in the > > original patch's recipients. I wasn't sure if I should include the v2 > > but will in the future. > > For that case, common choice is [RESEND PATCH .... > with a brief note in the cover letter that you missed some to/cc > > > Should I use v3 for my updated patch? > v2 is fine given v2 doesn't yet exist - v3 also fine though... Thanks for the info. I've resubmitted the patch as: [PATCH v2] iio: Use octal permissions and DEVICE_ATTR_{RO,RW}. Thanks, Joe > > Jonathan > > > > > Thanks, > > Joe > > > > > > > > > > > Hmm. I guess I don't really mind cleaning this up though it is > > > some churn in core code which is usually something we try to avoid > > > for fairly trivial style reasons. > > > > > > One request inline (though I suspect it applies in several places, > > > I just haven't checked ;) > > > > > > Thanks, > > > > > > Jonathan > > > > > > > --- > > > > drivers/iio/industrialio-buffer.c | 12 ++++++------ > > > > drivers/iio/industrialio-core.c | 10 +++++----- > > > > drivers/iio/industrialio-trigger.c | 4 ++-- > > > > 3 files changed, 13 insertions(+), 13 deletions(-) > > > > > > > > diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c > > > > index b078eb2f3c9d..c27f74a3c0f3 100644 > > > > --- a/drivers/iio/industrialio-buffer.c > > > > +++ b/drivers/iio/industrialio-buffer.c > > > > @@ -1391,17 +1391,17 @@ static ssize_t direction_show(struct device *dev, > > > > } > > > > } > > > > > > > > -static DEVICE_ATTR(length, S_IRUGO | S_IWUSR, iio_buffer_read_length, > > > > +static DEVICE_ATTR(length, 0644, iio_buffer_read_length, > > > > iio_buffer_write_length); > > > > static struct device_attribute dev_attr_length_ro = __ATTR(length, > > > > - S_IRUGO, iio_buffer_read_length, NULL); > > > > -static DEVICE_ATTR(enable, S_IRUGO | S_IWUSR, > > > > + 0444, iio_buffer_read_length, NULL); > > > > +static DEVICE_ATTR(enable, 0644, > > > > iio_buffer_show_enable, iio_buffer_store_enable); > > > > -static DEVICE_ATTR(watermark, S_IRUGO | S_IWUSR, > > > > +static DEVICE_ATTR(watermark, 0644, > > > > iio_buffer_show_watermark, iio_buffer_store_watermark); > > > > static struct device_attribute dev_attr_watermark_ro = __ATTR(watermark, > > > > - S_IRUGO, iio_buffer_show_watermark, NULL); > > > > -static DEVICE_ATTR(data_available, S_IRUGO, > > > > + 0444, iio_buffer_show_watermark, NULL); > > > > +static DEVICE_ATTR(data_available, 0444, > > > > iio_dma_show_data_available, NULL); > > > > > > a side effect of this change a slight shortening of how long the above > > > two lines will be if combined into one. It's now sub 80 chars > > > I think, so please make them a single line. Also check for similar > > > cases elsewhere. > > > > > > > > > > static DEVICE_ATTR_RO(direction); > > > > > > > > diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c > > > > index e1ed44dec2ab..35de348d686e 100644 > > > > --- a/drivers/iio/industrialio-core.c > > > > +++ b/drivers/iio/industrialio-core.c > > > > @@ -1114,12 +1114,12 @@ int __iio_device_attr_init(struct device_attribute *dev_attr, > > > > dev_attr->attr.name = name; > > > > > > > > if (readfunc) { > > > > - dev_attr->attr.mode |= S_IRUGO; > > > > + dev_attr->attr.mode |= 0444; > > > > dev_attr->show = readfunc; > > > > } > > > > > > > > if (writefunc) { > > > > - dev_attr->attr.mode |= S_IWUSR; > > > > + dev_attr->attr.mode |= 0200; > > > > dev_attr->store = writefunc; > > > > } > > > > > > > > @@ -1401,7 +1401,7 @@ static ssize_t iio_show_dev_name(struct device *dev, > > > > return sysfs_emit(buf, "%s\n", indio_dev->name); > > > > } > > > > > > > > -static DEVICE_ATTR(name, S_IRUGO, iio_show_dev_name, NULL); > > > > +static DEVICE_ATTR(name, 0444, iio_show_dev_name, NULL); > > > > > > > > static ssize_t iio_show_dev_label(struct device *dev, > > > > struct device_attribute *attr, > > > > @@ -1411,7 +1411,7 @@ static ssize_t iio_show_dev_label(struct device *dev, > > > > return sysfs_emit(buf, "%s\n", indio_dev->label); > > > > } > > > > > > > > -static DEVICE_ATTR(label, S_IRUGO, iio_show_dev_label, NULL); > > > > +static DEVICE_ATTR(label, 0444, iio_show_dev_label, NULL); > > > > > > > > static ssize_t iio_show_timestamp_clock(struct device *dev, > > > > struct device_attribute *attr, > > > > @@ -1509,7 +1509,7 @@ int iio_device_register_sysfs_group(struct iio_dev *indio_dev, > > > > return 0; > > > > } > > > > > > > > -static DEVICE_ATTR(current_timestamp_clock, S_IRUGO | S_IWUSR, > > > > +static DEVICE_ATTR(current_timestamp_clock, 0644, > > > > iio_show_timestamp_clock, iio_store_timestamp_clock); > > > > > > > > static int iio_device_register_sysfs(struct iio_dev *indio_dev) > > > > diff --git a/drivers/iio/industrialio-trigger.c b/drivers/iio/industrialio-trigger.c > > > > index f504ed351b3e..e22a35634f2c 100644 > > > > --- a/drivers/iio/industrialio-trigger.c > > > > +++ b/drivers/iio/industrialio-trigger.c > > > > @@ -54,7 +54,7 @@ static ssize_t iio_trigger_read_name(struct device *dev, > > > > return sysfs_emit(buf, "%s\n", trig->name); > > > > } > > > > > > > > -static DEVICE_ATTR(name, S_IRUGO, iio_trigger_read_name, NULL); > > > > +static DEVICE_ATTR(name, 0444, iio_trigger_read_name, NULL); > > > > > > > > static struct attribute *iio_trig_dev_attrs[] = { > > > > &dev_attr_name.attr, > > > > @@ -494,7 +494,7 @@ static ssize_t iio_trigger_write_current(struct device *dev, > > > > return ret; > > > > } > > > > > > > > -static DEVICE_ATTR(current_trigger, S_IRUGO | S_IWUSR, > > > > +static DEVICE_ATTR(current_trigger, 0644, > > > > iio_trigger_read_current, > > > > iio_trigger_write_current); > > > > > > > >
diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c index b078eb2f3c9d..c27f74a3c0f3 100644 --- a/drivers/iio/industrialio-buffer.c +++ b/drivers/iio/industrialio-buffer.c @@ -1391,17 +1391,17 @@ static ssize_t direction_show(struct device *dev, } } -static DEVICE_ATTR(length, S_IRUGO | S_IWUSR, iio_buffer_read_length, +static DEVICE_ATTR(length, 0644, iio_buffer_read_length, iio_buffer_write_length); static struct device_attribute dev_attr_length_ro = __ATTR(length, - S_IRUGO, iio_buffer_read_length, NULL); -static DEVICE_ATTR(enable, S_IRUGO | S_IWUSR, + 0444, iio_buffer_read_length, NULL); +static DEVICE_ATTR(enable, 0644, iio_buffer_show_enable, iio_buffer_store_enable); -static DEVICE_ATTR(watermark, S_IRUGO | S_IWUSR, +static DEVICE_ATTR(watermark, 0644, iio_buffer_show_watermark, iio_buffer_store_watermark); static struct device_attribute dev_attr_watermark_ro = __ATTR(watermark, - S_IRUGO, iio_buffer_show_watermark, NULL); -static DEVICE_ATTR(data_available, S_IRUGO, + 0444, iio_buffer_show_watermark, NULL); +static DEVICE_ATTR(data_available, 0444, iio_dma_show_data_available, NULL); static DEVICE_ATTR_RO(direction); diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c index e1ed44dec2ab..35de348d686e 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c @@ -1114,12 +1114,12 @@ int __iio_device_attr_init(struct device_attribute *dev_attr, dev_attr->attr.name = name; if (readfunc) { - dev_attr->attr.mode |= S_IRUGO; + dev_attr->attr.mode |= 0444; dev_attr->show = readfunc; } if (writefunc) { - dev_attr->attr.mode |= S_IWUSR; + dev_attr->attr.mode |= 0200; dev_attr->store = writefunc; } @@ -1401,7 +1401,7 @@ static ssize_t iio_show_dev_name(struct device *dev, return sysfs_emit(buf, "%s\n", indio_dev->name); } -static DEVICE_ATTR(name, S_IRUGO, iio_show_dev_name, NULL); +static DEVICE_ATTR(name, 0444, iio_show_dev_name, NULL); static ssize_t iio_show_dev_label(struct device *dev, struct device_attribute *attr, @@ -1411,7 +1411,7 @@ static ssize_t iio_show_dev_label(struct device *dev, return sysfs_emit(buf, "%s\n", indio_dev->label); } -static DEVICE_ATTR(label, S_IRUGO, iio_show_dev_label, NULL); +static DEVICE_ATTR(label, 0444, iio_show_dev_label, NULL); static ssize_t iio_show_timestamp_clock(struct device *dev, struct device_attribute *attr, @@ -1509,7 +1509,7 @@ int iio_device_register_sysfs_group(struct iio_dev *indio_dev, return 0; } -static DEVICE_ATTR(current_timestamp_clock, S_IRUGO | S_IWUSR, +static DEVICE_ATTR(current_timestamp_clock, 0644, iio_show_timestamp_clock, iio_store_timestamp_clock); static int iio_device_register_sysfs(struct iio_dev *indio_dev) diff --git a/drivers/iio/industrialio-trigger.c b/drivers/iio/industrialio-trigger.c index f504ed351b3e..e22a35634f2c 100644 --- a/drivers/iio/industrialio-trigger.c +++ b/drivers/iio/industrialio-trigger.c @@ -54,7 +54,7 @@ static ssize_t iio_trigger_read_name(struct device *dev, return sysfs_emit(buf, "%s\n", trig->name); } -static DEVICE_ATTR(name, S_IRUGO, iio_trigger_read_name, NULL); +static DEVICE_ATTR(name, 0444, iio_trigger_read_name, NULL); static struct attribute *iio_trig_dev_attrs[] = { &dev_attr_name.attr, @@ -494,7 +494,7 @@ static ssize_t iio_trigger_write_current(struct device *dev, return ret; } -static DEVICE_ATTR(current_trigger, S_IRUGO | S_IWUSR, +static DEVICE_ATTR(current_trigger, 0644, iio_trigger_read_current, iio_trigger_write_current);
As reported by checkpatch.pl use ocatl permissions rather than symbolic permissions. Signed-off-by: Joe Simmons-Talbott <joetalbott@gmail.com> --- drivers/iio/industrialio-buffer.c | 12 ++++++------ drivers/iio/industrialio-core.c | 10 +++++----- drivers/iio/industrialio-trigger.c | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-)