Hi James, On Sat, Jan 26, 2019 at 08:48:20PM +0000, Jonathan Cameron wrote: > On Sat, 26 Jan 2019 15:37:53 -0200 > Felipe Cardoso Resende <felipecardoso.fcr@xxxxxxxxx> wrote: > > > Remove warning found by checkpatch.pl by including SPDX Identifier > > > > Signed-off-by: Felipe Cardoso Resende <felipecardoso.fcr@xxxxxxxxx> > > However much checkpatch moans about this they all need careful individual > checking and I always prefer to get input from someone who either wrote > the code or works for the company with the copyright. I see your point. I took it for granted as the license was explicit in the beginning of each file. > > It's particularly fun as one of these is currently inconsistent > within the file. I've raised it with Analog and they have promised to clean > these up. There is also one that has been done already (and indeed moved > out of staging). If we apply this I'll just drop that one. I noticed one of them was different from the others, but not that it was inconsistent within itself. > > Obviously if they are happy with your change that is great but I will need > an Ack from one of the current Analog team. That's alright. I'll wait for an input from them and update this patch if necessary. Thanks, Felipe > > Thanks, > > Jonathan > > > --- > > drivers/staging/iio/adc/ad7192.c | 3 +-- > > drivers/staging/iio/adc/ad7192.h | 5 ++--- > > drivers/staging/iio/adc/ad7280a.c | 3 +-- > > drivers/staging/iio/adc/ad7280a.h | 5 ++--- > > drivers/staging/iio/adc/ad7606.c | 3 +-- > > drivers/staging/iio/adc/ad7606.h | 5 ++--- > > drivers/staging/iio/adc/ad7606_par.c | 3 +-- > > drivers/staging/iio/adc/ad7606_spi.c | 3 +-- > > drivers/staging/iio/adc/ad7780.c | 3 +-- > > drivers/staging/iio/adc/ad7816.c | 3 +-- > > 10 files changed, 13 insertions(+), 23 deletions(-) > > > > diff --git a/drivers/staging/iio/adc/ad7192.c b/drivers/staging/iio/adc/ad7192.c > > index acdbc07fd259..b01d4cd6bb82 100644 > > --- a/drivers/staging/iio/adc/ad7192.c > > +++ b/drivers/staging/iio/adc/ad7192.c > > @@ -1,9 +1,8 @@ > > +// SPDX-License-Identifier: GPL-2.0-only > > /* > > * AD7190 AD7192 AD7193 AD7195 SPI ADC driver > > * > > * Copyright 2011-2015 Analog Devices Inc. > > - * > > - * Licensed under the GPL-2. > > */ > > > > #include <linux/interrupt.h> > > diff --git a/drivers/staging/iio/adc/ad7192.h b/drivers/staging/iio/adc/ad7192.h > > index 7433a43c2611..2a5a55fdd825 100644 > > --- a/drivers/staging/iio/adc/ad7192.h > > +++ b/drivers/staging/iio/adc/ad7192.h > > @@ -1,9 +1,8 @@ > > -/* > > +/* SPDX-License-Identifier: GPL-2.0-only > > + * > > * AD7190 AD7192 AD7195 SPI ADC driver > > * > > * Copyright 2011 Analog Devices Inc. > > - * > > - * Licensed under the GPL-2. > > */ > > #ifndef IIO_ADC_AD7192_H_ > > #define IIO_ADC_AD7192_H_ > > diff --git a/drivers/staging/iio/adc/ad7280a.c b/drivers/staging/iio/adc/ad7280a.c > > index 14f6a3ced060..c10fdce511a6 100644 > > --- a/drivers/staging/iio/adc/ad7280a.c > > +++ b/drivers/staging/iio/adc/ad7280a.c > > @@ -1,9 +1,8 @@ > > +// SPDX-License-Identifier: GPL-2.0-only > > /* > > * AD7280A Lithium Ion Battery Monitoring System > > * > > * Copyright 2011 Analog Devices Inc. > > - * > > - * Licensed under the GPL-2. > > */ > > > > #include <linux/crc8.h> > > diff --git a/drivers/staging/iio/adc/ad7280a.h b/drivers/staging/iio/adc/ad7280a.h > > index ccfb90d20e71..400d47ab3744 100644 > > --- a/drivers/staging/iio/adc/ad7280a.h > > +++ b/drivers/staging/iio/adc/ad7280a.h > > @@ -1,9 +1,8 @@ > > -/* > > +/* SPDX-License-Identifier: GPL-2.0-only > > + * > > * AD7280A Lithium Ion Battery Monitoring System > > * > > * Copyright 2011 Analog Devices Inc. > > - * > > - * Licensed under the GPL-2. > > */ > > > > #ifndef IIO_ADC_AD7280_H_ > > diff --git a/drivers/staging/iio/adc/ad7606.c b/drivers/staging/iio/adc/ad7606.c > > index 7308fa8fbb4c..b4a28cddfc91 100644 > > --- a/drivers/staging/iio/adc/ad7606.c > > +++ b/drivers/staging/iio/adc/ad7606.c > > This one isn't even there any more. Please be careful to check you have > the right tree to work against, particularly when doing mass changes > like this. In this particular case it's iio.git and right now the > only near up to date version is the testing branch (coincidence of where > we are in the cycle). > > > @@ -1,9 +1,8 @@ > > +// SPDX-License-Identifier: GPL-2.0-only > > /* > > * AD7606 SPI ADC driver > > * > > * Copyright 2011 Analog Devices Inc. > > - * > > - * Licensed under the GPL-2. > > */ > > > > #include <linux/interrupt.h> > > diff --git a/drivers/staging/iio/adc/ad7606.h b/drivers/staging/iio/adc/ad7606.h > > index 86188054b60b..3a57bc5539b6 100644 > > --- a/drivers/staging/iio/adc/ad7606.h > > +++ b/drivers/staging/iio/adc/ad7606.h > > @@ -1,9 +1,8 @@ > > -/* > > +/* SPDX-License-Identifier: GPL-2.0-only > > + * > > * AD7606 ADC driver > > * > > * Copyright 2011 Analog Devices Inc. > > - * > > - * Licensed under the GPL-2. > > */ > > > > #ifndef IIO_ADC_AD7606_H_ > > diff --git a/drivers/staging/iio/adc/ad7606_par.c b/drivers/staging/iio/adc/ad7606_par.c > > index 8bd86e727b02..ec2280f07b78 100644 > > --- a/drivers/staging/iio/adc/ad7606_par.c > > +++ b/drivers/staging/iio/adc/ad7606_par.c > > @@ -1,9 +1,8 @@ > > +// SPDX-License-Identifier: GPL-2.0-only > > /* > > * AD7606 Parallel Interface ADC driver > > * > > * Copyright 2011 Analog Devices Inc. > > - * > > - * Licensed under the GPL-2. > > */ > > > > #include <linux/module.h> > > diff --git a/drivers/staging/iio/adc/ad7606_spi.c b/drivers/staging/iio/adc/ad7606_spi.c > > index b76ca5a8c059..0b848da3ac08 100644 > > --- a/drivers/staging/iio/adc/ad7606_spi.c > > +++ b/drivers/staging/iio/adc/ad7606_spi.c > > @@ -1,9 +1,8 @@ > > +// SPDX-License-Identifier: GPL-2.0-only > > /* > > * AD7606 SPI ADC driver > > * > > * Copyright 2011 Analog Devices Inc. > > - * > > - * Licensed under the GPL-2. > > */ > > > > #include <linux/module.h> > > diff --git a/drivers/staging/iio/adc/ad7780.c b/drivers/staging/iio/adc/ad7780.c > > index c4a85789c2db..88caa6617c74 100644 > > --- a/drivers/staging/iio/adc/ad7780.c > > +++ b/drivers/staging/iio/adc/ad7780.c > > @@ -1,9 +1,8 @@ > > +// SPDX-License-Identifier: GPL-2.0-only > > /* > > * AD7170/AD7171 and AD7780/AD7781 SPI ADC driver > > * > > * Copyright 2011 Analog Devices Inc. > > - * > > - * Licensed under the GPL-2. > > */ > > > > #include <linux/interrupt.h> > > diff --git a/drivers/staging/iio/adc/ad7816.c b/drivers/staging/iio/adc/ad7816.c > > index 5209651a1b25..0ac6b3f32d13 100644 > > --- a/drivers/staging/iio/adc/ad7816.c > > +++ b/drivers/staging/iio/adc/ad7816.c > > @@ -1,9 +1,8 @@ > > +// SPDX-License-Identifier: GPL-2.0-or-later > > /* > > * AD7816 digital temperature sensor driver supporting AD7816/7/8 > > * > > * Copyright 2010 Analog Devices Inc. > > - * > > - * Licensed under the GPL-2 or later. > > This one is inconsistent as the module driver marking is GPL V2 only. > Hence we should confirm this with Analog. > > > */ > > > > #include <linux/interrupt.h> >
