Skip to contentSkip to conversation

tsl2x7x_core: remove paragraph about writing to the FSF's mailing address

PATCH In review Enric Balletbo i Serra 2 participants 4 messages May 4, 2017 – May 7, 2017

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 tsl2x7x_core: remove paragraph about writing to the FSF's mailing address

Do not include the paragraph about writing to the Free Software Foundation's mailing address from the sample GPL notice. The FSF has changed addresses in the past, and may do so again. Linux already includes a copy of the GPL.

---
 drivers/staging/iio/light/tsl2x7x_core.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/staging/iio/light/tsl2x7x_core.c +0 -4
index ea15bc1c300c..b35ff63f7f60 100644
@@ -13,10 +13,6 @@
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA        02110-1301, USA.
  */
 
 #include <linux/kernel.h>
Signature · 1 line
2.11.0
#1 lore raw

PATCH 2/2 tsl2x7x_core: use octal permission representation

Fix the output from checkpatch.pl like:
Symbolic permissions 'S_IRUSR' are not preferred. Consider using octal permissions '0400'.

Also fix the alignment DEVICE_ATTR variables as should match open parenthesis.

---
 drivers/staging/iio/light/tsl2x7x_core.c | 42 +++++++++++++++++---------------
 1 file changed, 22 insertions(+), 20 deletions(-)
drivers/staging/iio/light/tsl2x7x_core.c +22 -20
index b35ff63f7f60..41b8f5332737 100644
@@ -1494,35 +1494,37 @@ static int tsl2x7x_write_raw(struct iio_dev *indio_dev,
 	return 0;
 }
 
-static DEVICE_ATTR(power_state, S_IRUGO | S_IWUSR,
-		tsl2x7x_power_state_show, tsl2x7x_power_state_store);
+static DEVICE_ATTR(power_state, 0644, tsl2x7x_power_state_show,
+		   tsl2x7x_power_state_store);
 
-static DEVICE_ATTR(in_proximity0_calibscale_available, S_IRUGO,
-		tsl2x7x_prox_gain_available_show, NULL);
+static DEVICE_ATTR(in_proximity0_calibscale_available, 0444,
+		   tsl2x7x_prox_gain_available_show, NULL);
 
-static DEVICE_ATTR(in_illuminance0_calibscale_available, S_IRUGO,
-		tsl2x7x_gain_available_show, NULL);
+static DEVICE_ATTR(in_illuminance0_calibscale_available, 0444,
+		   tsl2x7x_gain_available_show, NULL);
 
-static DEVICE_ATTR(in_illuminance0_integration_time, S_IRUGO | S_IWUSR,
-		tsl2x7x_als_time_show, tsl2x7x_als_time_store);
+static DEVICE_ATTR(in_illuminance0_integration_time, 0644,
+		   tsl2x7x_als_time_show, tsl2x7x_als_time_store);
 
-static DEVICE_ATTR(in_illuminance0_target_input, S_IRUGO | S_IWUSR,
-		tsl2x7x_als_cal_target_show, tsl2x7x_als_cal_target_store);
+static DEVICE_ATTR(in_illuminance0_target_input, 0644,
+		   tsl2x7x_als_cal_target_show, tsl2x7x_als_cal_target_store);
 
-static DEVICE_ATTR(in_illuminance0_calibrate, S_IWUSR, NULL,
-		tsl2x7x_do_calibrate);
+static DEVICE_ATTR(in_illuminance0_calibrate, 0200, NULL,
+		   tsl2x7x_do_calibrate);
 
-static DEVICE_ATTR(in_proximity0_calibrate, S_IWUSR, NULL,
-		tsl2x7x_do_prox_calibrate);
+static DEVICE_ATTR(in_proximity0_calibrate, 0200, NULL,
+		   tsl2x7x_do_prox_calibrate);
 
-static DEVICE_ATTR(in_illuminance0_lux_table, S_IRUGO | S_IWUSR,
-		tsl2x7x_luxtable_show, tsl2x7x_luxtable_store);
+static DEVICE_ATTR(in_illuminance0_lux_table, 0644, tsl2x7x_luxtable_show,
+		   tsl2x7x_luxtable_store);
 
-static DEVICE_ATTR(in_intensity0_thresh_period, S_IRUGO | S_IWUSR,
-		tsl2x7x_als_persistence_show, tsl2x7x_als_persistence_store);
+static DEVICE_ATTR(in_intensity0_thresh_period, 0644,
+		   tsl2x7x_als_persistence_show,
+		   tsl2x7x_als_persistence_store);
 
-static DEVICE_ATTR(in_proximity0_thresh_period, S_IRUGO | S_IWUSR,
-		tsl2x7x_prox_persistence_show, tsl2x7x_prox_persistence_store);
+static DEVICE_ATTR(in_proximity0_thresh_period, 0644,
+		   tsl2x7x_prox_persistence_show,
+		   tsl2x7x_prox_persistence_store);
 
 /* Use the default register values to identify the Taos device */
 static int tsl2x7x_device_id(unsigned char *id, int target)
Signature · 1 line
2.11.0
maintainer
#2 lore raw

Re: [PATCH 2/2] tsl2x7x_core: use octal permission representation

Quoted 8 lines · Enric Balletbo i Serra

Fix the output from checkpatch.pl like:
Symbolic permissions 'S_IRUSR' are not preferred. Consider using octal permissions '0400'.

Also fix the alignment DEVICE_ATTR variables as should match open parenthesis.

I already have a patch in place doing this from a couple of weeks ago (Paulo Cretaro - April 25th)

Thanks

Jonathan

Quoted 67 lines
---
 drivers/staging/iio/light/tsl2x7x_core.c | 42 +++++++++++++++++---------------
 1 file changed, 22 insertions(+), 20 deletions(-)
drivers/staging/iio/light/tsl2x7x_core.c +22 -20
index b35ff63f7f60..41b8f5332737 100644
@@ -1494,35 +1494,37 @@ static int tsl2x7x_write_raw(struct iio_dev *indio_dev,
 	return 0;
 }
 
-static DEVICE_ATTR(power_state, S_IRUGO | S_IWUSR,
-		tsl2x7x_power_state_show, tsl2x7x_power_state_store);
+static DEVICE_ATTR(power_state, 0644, tsl2x7x_power_state_show,
+		   tsl2x7x_power_state_store);
 
-static DEVICE_ATTR(in_proximity0_calibscale_available, S_IRUGO,
-		tsl2x7x_prox_gain_available_show, NULL);
+static DEVICE_ATTR(in_proximity0_calibscale_available, 0444,
+		   tsl2x7x_prox_gain_available_show, NULL);
 
-static DEVICE_ATTR(in_illuminance0_calibscale_available, S_IRUGO,
-		tsl2x7x_gain_available_show, NULL);
+static DEVICE_ATTR(in_illuminance0_calibscale_available, 0444,
+		   tsl2x7x_gain_available_show, NULL);
 
-static DEVICE_ATTR(in_illuminance0_integration_time, S_IRUGO | S_IWUSR,
-		tsl2x7x_als_time_show, tsl2x7x_als_time_store);
+static DEVICE_ATTR(in_illuminance0_integration_time, 0644,
+		   tsl2x7x_als_time_show, tsl2x7x_als_time_store);
 
-static DEVICE_ATTR(in_illuminance0_target_input, S_IRUGO | S_IWUSR,
-		tsl2x7x_als_cal_target_show, tsl2x7x_als_cal_target_store);
+static DEVICE_ATTR(in_illuminance0_target_input, 0644,
+		   tsl2x7x_als_cal_target_show, tsl2x7x_als_cal_target_store);
 
-static DEVICE_ATTR(in_illuminance0_calibrate, S_IWUSR, NULL,
-		tsl2x7x_do_calibrate);
+static DEVICE_ATTR(in_illuminance0_calibrate, 0200, NULL,
+		   tsl2x7x_do_calibrate);
 
-static DEVICE_ATTR(in_proximity0_calibrate, S_IWUSR, NULL,
-		tsl2x7x_do_prox_calibrate);
+static DEVICE_ATTR(in_proximity0_calibrate, 0200, NULL,
+		   tsl2x7x_do_prox_calibrate);
 
-static DEVICE_ATTR(in_illuminance0_lux_table, S_IRUGO | S_IWUSR,
-		tsl2x7x_luxtable_show, tsl2x7x_luxtable_store);
+static DEVICE_ATTR(in_illuminance0_lux_table, 0644, tsl2x7x_luxtable_show,
+		   tsl2x7x_luxtable_store);
 
-static DEVICE_ATTR(in_intensity0_thresh_period, S_IRUGO | S_IWUSR,
-		tsl2x7x_als_persistence_show, tsl2x7x_als_persistence_store);
+static DEVICE_ATTR(in_intensity0_thresh_period, 0644,
+		   tsl2x7x_als_persistence_show,
+		   tsl2x7x_als_persistence_store);
 
-static DEVICE_ATTR(in_proximity0_thresh_period, S_IRUGO | S_IWUSR,
-		tsl2x7x_prox_persistence_show, tsl2x7x_prox_persistence_store);
+static DEVICE_ATTR(in_proximity0_thresh_period, 0644,
+		   tsl2x7x_prox_persistence_show,
+		   tsl2x7x_prox_persistence_store);
 
 /* Use the default register values to identify the Taos device */
 static int tsl2x7x_device_id(unsigned char *id, int target)
maintainer
#3 lore raw
In reply to Enric Balletbo i Serra
Quoted 6 lines · Enric Balletbo i Serra

Do not include the paragraph about writing to the Free Software Foundation's mailing address from the sample GPL notice. The FSF has changed addresses in the past, and may do so again. Linux already includes a copy of the GPL.

Applied to the togreg branch of iio.git and pushed out as testing for the autobuilders to play with it.

I dealt with the fact this crossed with a file rename patch and the file is now called tsl2x7x.c

Jonathan

Quoted 20 lines
---
 drivers/staging/iio/light/tsl2x7x_core.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/staging/iio/light/tsl2x7x_core.c +0 -4
index ea15bc1c300c..b35ff63f7f60 100644
@@ -13,10 +13,6 @@
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA        02110-1301, USA.
  */
 
 #include <linux/kernel.h>