Re: [PATCH] iio:meter:ade7759: Removing use of deprecated macros

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



nOn Thu, 30 Mar 2017, Chen Guanqiao wrote:

> Removing use of deprecated macros(S_IRUGO, SIWUGO, S_IXUGO), and replaced with 4 gidit octal.

digit
 
> Signed-off-by: Chen Guanqiao <chen.chenchacha@xxxxxxxxxxx>
> ---
>  drivers/staging/iio/meter/ade7759.c | 26 ++++++++++++++------------
>  1 file changed, 14 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/staging/iio/meter/ade7759.c b/drivers/staging/iio/meter/ade7759.c
> index 0b65f1847510..dbd106f28cb7 100644
> --- a/drivers/staging/iio/meter/ade7759.c
> +++ b/drivers/staging/iio/meter/ade7759.c
> @@ -279,49 +279,51 @@ static int ade7759_reset(struct device *dev)
>  }
> 
>  static IIO_DEV_ATTR_AENERGY(ade7759_read_40bit, ADE7759_AENERGY);
> -static IIO_DEV_ATTR_CFDEN(S_IWUSR | S_IRUGO,
> +static IIO_DEV_ATTR_CFDEN(0644,
> 		ade7759_read_16bit,
> 		ade7759_write_16bit,
> 		ADE7759_CFDEN);
> -static IIO_DEV_ATTR_CFNUM(S_IWUSR | S_IRUGO,
> +static IIO_DEV_ATTR_CFNUM(0644,
> 		ade7759_read_8bit,
> 		ade7759_write_8bit,
> 		ADE7759_CFNUM);
>  static IIO_DEV_ATTR_CHKSUM(ade7759_read_8bit, ADE7759_CHKSUM);
> -static IIO_DEV_ATTR_PHCAL(S_IWUSR | S_IRUGO,
> +static IIO_DEV_ATTR_PHCAL(0644,
> 		ade7759_read_16bit,
> 		ade7759_write_16bit,
> 		ADE7759_PHCAL);
> -static IIO_DEV_ATTR_APOS(S_IWUSR | S_IRUGO,
> +static IIO_DEV_ATTR_APOS(0644,
> 		ade7759_read_16bit,
> 		ade7759_write_16bit,
> 		ADE7759_APOS);
> -static IIO_DEV_ATTR_SAGCYC(S_IWUSR | S_IRUGO,
> +static IIO_DEV_ATTR_SAGCYC(0644,
> 		ade7759_read_8bit,
> 		ade7759_write_8bit,
> 		ADE7759_SAGCYC);
> -static IIO_DEV_ATTR_SAGLVL(S_IWUSR | S_IRUGO,
> +static IIO_DEV_ATTR_SAGLVL(0644,
> 		ade7759_read_8bit,
> 		ade7759_write_8bit,
> 		ADE7759_SAGLVL);
> -static IIO_DEV_ATTR_LINECYC(S_IWUSR | S_IRUGO,
> +static IIO_DEV_ATTR_LINECYC(0644,
> 		ade7759_read_8bit,
> 		ade7759_write_8bit,
> 		ADE7759_LINECYC);
>  static IIO_DEV_ATTR_LENERGY(ade7759_read_40bit, ADE7759_LENERGY);
> -static IIO_DEV_ATTR_PGA_GAIN(S_IWUSR | S_IRUGO,
> +static IIO_DEV_ATTR_PGA_GAIN(0644,
> 		ade7759_read_8bit,
> 		ade7759_write_8bit,
> 		ADE7759_GAIN);
> -static IIO_DEV_ATTR_ACTIVE_POWER_GAIN(S_IWUSR | S_IRUGO,
> +static IIO_DEV_ATTR_ACTIVE_POWER_GAIN(0644,
> 		ade7759_read_16bit,
> 		ade7759_write_16bit,
> 		ADE7759_APGAIN);
> -static IIO_DEV_ATTR_CH_OFF(1, S_IWUSR | S_IRUGO,
> +static IIO_DEV_ATTR_CH_OFF(
> +		1, 0644,
> 		ade7759_read_8bit,
> 		ade7759_write_8bit,
> 		ADE7759_CH1OS);
> -static IIO_DEV_ATTR_CH_OFF(2, S_IWUSR | S_IRUGO,
> +static IIO_DEV_ATTR_CH_OFF(
> +		2, 0644,
> 		ade7759_read_8bit,
> 		ade7759_write_8bit,
> 		ADE7759_CH2OS);
> @@ -458,7 +460,7 @@ static IIO_DEV_ATTR_TEMP_RAW(ade7759_read_8bit);
>  static IIO_CONST_ATTR(in_temp_offset, "70 C");
>  static IIO_CONST_ATTR(in_temp_scale, "1 C");
> 
> -static IIO_DEV_ATTR_SAMP_FREQ(S_IWUSR | S_IRUGO,
> +static IIO_DEV_ATTR_SAMP_FREQ(0644,
> 		ade7759_read_frequency,
> 		ade7759_write_frequency);
> 
> --
> 2.11.0
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

-- 

Peter Meerwald-Stadler
Mobile: +43 664 24 44 418
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Input]     [Linux Kernel]     [Linux SCSI]     [X.org]

  Powered by Linux