iio: Avoid multiple line dereference for mask
PATCH 1/1 iio: Avoid multiple line dereference for mask
Add a mask variable to hold dereferences that span multiple lines. Found with checkpatch.pl.
--- drivers/iio/industrialio-core.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
drivers/iio/industrialio-core.c +9 -10
@@ -1291,6 +1291,7 @@ static int iio_device_add_channel_sysfs(struct iio_dev *indio_dev,struct iio_dev_opaque *iio_dev_opaque =to_iio_dev_opaque (indio_dev);int ret, attrcount =0 ;const struct iio_chan_spec_ext_info *ext_info; +long *mask;if (chan->channel <0 )return 0 ;
@@ -1301,10 +1302,9 @@ static int iio_device_add_channel_sysfs(struct iio_dev *indio_dev,return ret; attrcount += ret; + mask = &chan->info_mask_separate_available; ret =iio_device_add_info_mask_type_avail (indio_dev, chan, -IIO_SEPARATE , - &chan-> - info_mask_separate_available); +IIO_SEPARATE , mask);if (ret <0 )return ret; attrcount += ret;
@@ -1316,10 +1316,9 @@ static int iio_device_add_channel_sysfs(struct iio_dev *indio_dev,return ret; attrcount += ret; + mask = &chan->info_mask_shared_by_type_available; ret =iio_device_add_info_mask_type_avail (indio_dev, chan, -IIO_SHARED_BY_TYPE , - &chan-> - info_mask_shared_by_type_available); +IIO_SHARED_BY_TYPE , mask);if (ret <0 )return ret; attrcount += ret;
@@ -1331,9 +1330,9 @@ static int iio_device_add_channel_sysfs(struct iio_dev *indio_dev,return ret; attrcount += ret; + mask = &chan->info_mask_shared_by_dir_available; ret =iio_device_add_info_mask_type_avail (indio_dev, chan, -IIO_SHARED_BY_DIR , - &chan->info_mask_shared_by_dir_available); +IIO_SHARED_BY_DIR , mask);if (ret <0 )return ret; attrcount += ret;
@@ -1345,9 +1344,9 @@ static int iio_device_add_channel_sysfs(struct iio_dev *indio_dev,return ret; attrcount += ret; + mask = &chan->info_mask_shared_by_all_available; ret =iio_device_add_info_mask_type_avail (indio_dev, chan, -IIO_SHARED_BY_ALL , - &chan->info_mask_shared_by_all_available); +IIO_SHARED_BY_ALL , mask);if (ret <0 )return ret; attrcount += ret;
Signature · 1 line
2.37.2
Quoted 2 lines · Joe Simmons-Talbott
Add a mask variable to hold dereferences that span multiple lines. Found with checkpatch.pl.
[]
drivers/iio/industrialio-core.c
Quoted 1 line
drivers/iio/industrialio-core.c +0
-0
[]
drivers/iio/industrialio-core.c static int iio_device_add_channel_sysfs(struct iio_dev *indio_dev, · line 1307
Quoted 10 lines
drivers/iio/industrialio-core.c +2
-3@@ -1301,10 +1302,9 @@ static int iio_device_add_channel_sysfs(struct iio_dev *indio_dev,return ret; attrcount += ret; + mask = &chan->info_mask_separate_available; ret =iio_device_add_info_mask_type_avail (indio_dev, chan, -IIO_SEPARATE , - &chan-> - info_mask_separate_available); +IIO_SEPARATE , mask);
The issue is the conflict between using 30+ character identifiers and 80 column lines. Perhaps it's better just to use a longer line instead of a temporary.
ret = iio_device_add_info_mask_type_avail(indio_dev, chan, IIO_SEPARATE, &chan->info_mask_separate_available);
[]
drivers/iio/industrialio-core.c static int iio_device_add_channel_sysfs(struct iio_dev *indio_dev, · line 1321
Quoted 10 lines
drivers/iio/industrialio-core.c +2
-3@@ -1316,10 +1316,9 @@ static int iio_device_add_channel_sysfs(struct iio_dev *indio_dev,return ret; attrcount += ret; + mask = &chan->info_mask_shared_by_type_available; ret =iio_device_add_info_mask_type_avail (indio_dev, chan, -IIO_SHARED_BY_TYPE , - &chan-> - info_mask_shared_by_type_available); +IIO_SHARED_BY_TYPE , mask);
ret = iio_device_add_info_mask_type_avail(indio_dev, chan, IIO_SHARED_BY_TYPE, &chan->info_mask_shared_by_type_available);
etc...
Jonathan Cameron
maintainerQuoted 20 lines · On Thu, 18 Aug 2022 20:08:27 -0400 Joe Perches <[email protected]> wrote:
Quoted 2 lines · Joe Simmons-Talbott
Add a mask variable to hold dereferences that span multiple lines. Found with checkpatch.pl.
[]
drivers/iio/industrialio-core.c
Quoted 1 line
drivers/iio/industrialio-core.c +0
-0[]
drivers/iio/industrialio-core.c static int iio_device_add_channel_sysfs(struct iio_dev *indio_dev, · line 1307
Quoted 10 lines
drivers/iio/industrialio-core.c +2
-3@@ -1301,10 +1302,9 @@ static int iio_device_add_channel_sysfs(struct iio_dev *indio_dev,return ret; attrcount += ret; + mask = &chan->info_mask_separate_available; ret =iio_device_add_info_mask_type_avail (indio_dev, chan, -IIO_SEPARATE , - &chan-> - info_mask_separate_available); +IIO_SEPARATE , mask);The issue is the conflict between using 30+ character identifiers and 80 column lines. Perhaps it's better just to use a longer line instead of a temporary.
Quoted 2 lines
ret = iio_device_add_info_mask_type_avail(indio_dev, chan, IIO_SEPARATE, &chan->info_mask_separate_available);
Agreed. Looks nicer to me this way and still under the wider 100 char limit which is appropriate when readability is improved.
Some unfortunately long identifiers, that I think got there via evolution. We should consider shortening them that's a job for a separate patch.
Quoted 19 lines
[]
drivers/iio/industrialio-core.c static int iio_device_add_channel_sysfs(struct iio_dev *indio_dev, · line 1321
Quoted 10 lines
drivers/iio/industrialio-core.c +2
-3@@ -1316,10 +1316,9 @@ static int iio_device_add_channel_sysfs(struct iio_dev *indio_dev,return ret; attrcount += ret; + mask = &chan->info_mask_shared_by_type_available; ret =iio_device_add_info_mask_type_avail (indio_dev, chan, -IIO_SHARED_BY_TYPE , - &chan-> - info_mask_shared_by_type_available); +IIO_SHARED_BY_TYPE , mask);ret = iio_device_add_info_mask_type_avail(indio_dev, chan, IIO_SHARED_BY_TYPE, &chan->info_mask_shared_by_type_available);etc...