Commit ad9c36be authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Greg Kroah-Hartman
Browse files

w1: minor white-space and code style fixes 



Correct several coding convention violations around white-spaces:

  ERROR: spaces required around that '=' (ctx:VxV)
  WARNING: Missing a blank line after declarations
  ERROR: "foo* bar" should be "foo *bar"
  ERROR: "(foo*)" should be "(foo *)"
  WARNING: Block comments use * on subsequent lines
  WARNING: Block comments use a trailing */ on a separate line
  WARNING: please, no space before tabs
  WARNING: Missing a blank line after declarations
  ERROR: open brace '{' following struct go on the same line
  ERROR: that open brace { should be on the previous line

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20230415104304.104134-4-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a2809664

drivers/w1/masters/ds2482.c

+2 −4
Original line number Diff line number Diff line
@@ -78,10 +78,8 @@ MODULE_PARM_DESC(extra_config, "Extra Configuration settings 1=APU,2=PPM,3=SPU,8 
 * To set the channel, write the value at the index of the channel.

 * Read and compare against the corresponding value to verify the change.

 */

static const u8 ds2482_chan_wr[8] =

	{ 0xF0, 0xE1, 0xD2, 0xC3, 0xB4, 0xA5, 0x96, 0x87 };

static const u8 ds2482_chan_rd[8] =

	{ 0xB8, 0xB1, 0xAA, 0xA3, 0x9C, 0x95, 0x8E, 0x87 };

static const u8 ds2482_chan_wr[8] = { 0xF0, 0xE1, 0xD2, 0xC3, 0xB4, 0xA5, 0x96, 0x87 };

static const u8 ds2482_chan_rd[8] = { 0xB8, 0xB1, 0xAA, 0xA3, 0x9C, 0x95, 0x8E, 0x87 };





/*

drivers/w1/masters/ds2490.c

+9 −4
Original line number Diff line number Diff line
@@ -304,6 +304,7 @@ static void ds_reset_device(struct ds_device *dev) 
	if (dev->spu_sleep) {

		/* lower 4 bits are 0, see ds_set_pullup */

		u8 del = dev->spu_sleep>>4;



		if (ds_send_control(dev, COMM_SET_DURATION | COMM_IM, del))

			dev_err(&dev->udev->dev,

				"%s: Error setting duration\n", __func__);
@@ -731,7 +732,8 @@ static void ds9490r_search(void *data, struct w1_master *master, 
			break;



		if (st.data_in_buffer_status) {

			/* Bulk in can receive partial ids, but when it does

			/*

			 * Bulk in can receive partial ids, but when it does

			 * they fail crc and will be discarded anyway.

			 * That has only been seen when status in buffer

			 * is 0 and bulk is read anyway, so don't read
@@ -743,8 +745,10 @@ static void ds9490r_search(void *data, struct w1_master *master, 
				break;

			for (i = 0; i < err/8; ++i) {

				found_ids[found++] = buf[i];

				/* can't know if there will be a discrepancy

				 * value after until the next id */

				/*

				 * can't know if there will be a discrepancy

				 * value after until the next id

				 */

				if (found == search_limit) {

					master->search_id = buf[i];

					break;
@@ -760,7 +764,8 @@ static void ds9490r_search(void *data, struct w1_master *master, 
	if (found <= search_limit) {

		master->search_id = 0;

	} else if (!test_bit(W1_WARN_MAX_COUNT, &master->flags)) {

		/* Only max_slave_count will be scanned in a search,

		/*

		 * Only max_slave_count will be scanned in a search,

		 * but it will start where it left off next search

		 * until all ids are identified and then it will start

		 * over.  A continued search will report the previous

drivers/w1/masters/matrox_w1.c

+1 −2
Original line number Diff line number Diff line
@@ -39,8 +39,7 @@ 
#define MATROX_GET_DATA			0x2B

#define MATROX_CURSOR_CTL		0x06



struct matrox_device

{

struct matrox_device {

	void __iomem *base_addr;

	void __iomem *port_index;

	void __iomem *port_data;

drivers/w1/slaves/w1_ds2406.c

+16 −15
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ static int w1_f12_add_slave(struct w1_slave *sl) 
static void w1_f12_remove_slave(struct w1_slave *sl)

{

	int i;



	for (i = NB_SYSFS_BIN_FILES - 1; i >= 0; --i)

		sysfs_remove_bin_file(&sl->dev.kobj,

			&(w1_f12_sysfs_bin_files[i]));

drivers/w1/slaves/w1_ds2408.c

+5 −5
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ 
static int _read_reg(struct w1_slave *sl, u8 address, unsigned char *buf)

{

	u8 wrbuf[3];

	dev_dbg(&sl->dev,

			"Reading with slave: %p, reg addr: %0#4x, buff addr: %p",



	dev_dbg(&sl->dev, "Reading with slave: %p, reg addr: %0#4x, buff addr: %p",

		sl, (unsigned int)address, buf);



	if (!buf)