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

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.orgSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a2809664
...@@ -78,10 +78,8 @@ MODULE_PARM_DESC(extra_config, "Extra Configuration settings 1=APU,2=PPM,3=SPU,8 ...@@ -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. * To set the channel, write the value at the index of the channel.
* Read and compare against the corresponding value to verify the change. * Read and compare against the corresponding value to verify the change.
*/ */
static const u8 ds2482_chan_wr[8] = static const u8 ds2482_chan_wr[8] = { 0xF0, 0xE1, 0xD2, 0xC3, 0xB4, 0xA5, 0x96, 0x87 };
{ 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_rd[8] =
{ 0xB8, 0xB1, 0xAA, 0xA3, 0x9C, 0x95, 0x8E, 0x87 };
/* /*
......
...@@ -304,6 +304,7 @@ static void ds_reset_device(struct ds_device *dev) ...@@ -304,6 +304,7 @@ static void ds_reset_device(struct ds_device *dev)
if (dev->spu_sleep) { if (dev->spu_sleep) {
/* lower 4 bits are 0, see ds_set_pullup */ /* lower 4 bits are 0, see ds_set_pullup */
u8 del = dev->spu_sleep>>4; u8 del = dev->spu_sleep>>4;
if (ds_send_control(dev, COMM_SET_DURATION | COMM_IM, del)) if (ds_send_control(dev, COMM_SET_DURATION | COMM_IM, del))
dev_err(&dev->udev->dev, dev_err(&dev->udev->dev,
"%s: Error setting duration\n", __func__); "%s: Error setting duration\n", __func__);
...@@ -731,7 +732,8 @@ static void ds9490r_search(void *data, struct w1_master *master, ...@@ -731,7 +732,8 @@ static void ds9490r_search(void *data, struct w1_master *master,
break; break;
if (st.data_in_buffer_status) { 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. * they fail crc and will be discarded anyway.
* That has only been seen when status in buffer * That has only been seen when status in buffer
* is 0 and bulk is read anyway, so don't read * 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, ...@@ -743,8 +745,10 @@ static void ds9490r_search(void *data, struct w1_master *master,
break; break;
for (i = 0; i < err/8; ++i) { for (i = 0; i < err/8; ++i) {
found_ids[found++] = buf[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) { if (found == search_limit) {
master->search_id = buf[i]; master->search_id = buf[i];
break; break;
...@@ -760,7 +764,8 @@ static void ds9490r_search(void *data, struct w1_master *master, ...@@ -760,7 +764,8 @@ static void ds9490r_search(void *data, struct w1_master *master,
if (found <= search_limit) { if (found <= search_limit) {
master->search_id = 0; master->search_id = 0;
} else if (!test_bit(W1_WARN_MAX_COUNT, &master->flags)) { } 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 * but it will start where it left off next search
* until all ids are identified and then it will start * until all ids are identified and then it will start
* over. A continued search will report the previous * over. A continued search will report the previous
......
...@@ -39,8 +39,7 @@ ...@@ -39,8 +39,7 @@
#define MATROX_GET_DATA 0x2B #define MATROX_GET_DATA 0x2B
#define MATROX_CURSOR_CTL 0x06 #define MATROX_CURSOR_CTL 0x06
struct matrox_device struct matrox_device {
{
void __iomem *base_addr; void __iomem *base_addr;
void __iomem *port_index; void __iomem *port_index;
void __iomem *port_data; void __iomem *port_data;
......
...@@ -27,11 +27,11 @@ static ssize_t w1_f12_read_state( ...@@ -27,11 +27,11 @@ static ssize_t w1_f12_read_state(
struct bin_attribute *bin_attr, struct bin_attribute *bin_attr,
char *buf, loff_t off, size_t count) char *buf, loff_t off, size_t count)
{ {
u8 w1_buf[6]={W1_F12_FUNC_READ_STATUS, 7, 0, 0, 0, 0}; u8 w1_buf[6] = {W1_F12_FUNC_READ_STATUS, 7, 0, 0, 0, 0};
struct w1_slave *sl = kobj_to_w1_slave(kobj); struct w1_slave *sl = kobj_to_w1_slave(kobj);
u16 crc=0; u16 crc = 0;
int i; int i;
ssize_t rtnval=1; ssize_t rtnval = 1;
if (off != 0) if (off != 0)
return 0; return 0;
...@@ -47,12 +47,12 @@ static ssize_t w1_f12_read_state( ...@@ -47,12 +47,12 @@ static ssize_t w1_f12_read_state(
w1_write_block(sl->master, w1_buf, 3); w1_write_block(sl->master, w1_buf, 3);
w1_read_block(sl->master, w1_buf+3, 3); w1_read_block(sl->master, w1_buf+3, 3);
for (i=0; i<6; i++) for (i = 0; i < 6; i++)
crc=crc16_byte(crc, w1_buf[i]); crc = crc16_byte(crc, w1_buf[i]);
if (crc==0xb001) /* good read? */ if (crc == 0xb001) /* good read? */
*buf=((w1_buf[3]>>5)&3)|0x30; *buf = ((w1_buf[3]>>5)&3)|0x30;
else else
rtnval=-EIO; rtnval = -EIO;
mutex_unlock(&sl->master->bus_mutex); mutex_unlock(&sl->master->bus_mutex);
...@@ -65,10 +65,10 @@ static ssize_t w1_f12_write_output( ...@@ -65,10 +65,10 @@ static ssize_t w1_f12_write_output(
char *buf, loff_t off, size_t count) char *buf, loff_t off, size_t count)
{ {
struct w1_slave *sl = kobj_to_w1_slave(kobj); struct w1_slave *sl = kobj_to_w1_slave(kobj);
u8 w1_buf[6]={W1_F12_FUNC_WRITE_STATUS, 7, 0, 0, 0, 0}; u8 w1_buf[6] = {W1_F12_FUNC_WRITE_STATUS, 7, 0, 0, 0, 0};
u16 crc=0; u16 crc = 0;
int i; int i;
ssize_t rtnval=1; ssize_t rtnval = 1;
if (count != 1 || off != 0) if (count != 1 || off != 0)
return -EFAULT; return -EFAULT;
...@@ -83,12 +83,12 @@ static ssize_t w1_f12_write_output( ...@@ -83,12 +83,12 @@ static ssize_t w1_f12_write_output(
w1_buf[3] = (((*buf)&3)<<5)|0x1F; w1_buf[3] = (((*buf)&3)<<5)|0x1F;
w1_write_block(sl->master, w1_buf, 4); w1_write_block(sl->master, w1_buf, 4);
w1_read_block(sl->master, w1_buf+4, 2); w1_read_block(sl->master, w1_buf+4, 2);
for (i=0; i<6; i++) for (i = 0; i < 6; i++)
crc=crc16_byte(crc, w1_buf[i]); crc = crc16_byte(crc, w1_buf[i]);
if (crc==0xb001) /* good read? */ if (crc == 0xb001) /* good read? */
w1_write_8(sl->master, 0xFF); w1_write_8(sl->master, 0xFF);
else else
rtnval=-EIO; rtnval = -EIO;
mutex_unlock(&sl->master->bus_mutex); mutex_unlock(&sl->master->bus_mutex);
return rtnval; return rtnval;
...@@ -133,6 +133,7 @@ static int w1_f12_add_slave(struct w1_slave *sl) ...@@ -133,6 +133,7 @@ static int w1_f12_add_slave(struct w1_slave *sl)
static void w1_f12_remove_slave(struct w1_slave *sl) static void w1_f12_remove_slave(struct w1_slave *sl)
{ {
int i; int i;
for (i = NB_SYSFS_BIN_FILES - 1; i >= 0; --i) for (i = NB_SYSFS_BIN_FILES - 1; i >= 0; --i)
sysfs_remove_bin_file(&sl->dev.kobj, sysfs_remove_bin_file(&sl->dev.kobj,
&(w1_f12_sysfs_bin_files[i])); &(w1_f12_sysfs_bin_files[i]));
......
...@@ -35,12 +35,12 @@ ...@@ -35,12 +35,12 @@
#define W1_F29_SUCCESS_CONFIRM_BYTE 0xAA #define W1_F29_SUCCESS_CONFIRM_BYTE 0xAA
static int _read_reg(struct w1_slave *sl, u8 address, unsigned char* buf) static int _read_reg(struct w1_slave *sl, u8 address, unsigned char *buf)
{ {
u8 wrbuf[3]; 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); sl, (unsigned int)address, buf);
if (!buf) if (!buf)
return -EINVAL; return -EINVAL;
...@@ -292,7 +292,7 @@ static int w1_f29_disable_test_mode(struct w1_slave *sl) ...@@ -292,7 +292,7 @@ static int w1_f29_disable_test_mode(struct w1_slave *sl)
{ {
int res; int res;
u8 magic[10] = {0x96, }; u8 magic[10] = {0x96, };
u64 rn = le64_to_cpu(*((u64*)&sl->reg_num)); u64 rn = le64_to_cpu(*((u64 *)&sl->reg_num));
memcpy(&magic[1], &rn, 8); memcpy(&magic[1], &rn, 8);
magic[9] = 0x3C; magic[9] = 0x3C;
......
...@@ -99,8 +99,10 @@ static ssize_t output_write(struct file *filp, struct kobject *kobj, ...@@ -99,8 +99,10 @@ static ssize_t output_write(struct file *filp, struct kobject *kobj,
if (w1_reset_select_slave(sl)) if (w1_reset_select_slave(sl))
goto out; goto out;
/* according to the DS2413 datasheet the most significant 6 bits /*
should be set to "1"s, so do it now */ * according to the DS2413 datasheet the most significant 6 bits
* should be set to "1"s, so do it now
*/
*buf = *buf | 0xFC; *buf = *buf | 0xFC;
while (retries--) { while (retries--) {
......
...@@ -115,7 +115,7 @@ static ssize_t eeprom_read(struct file *filp, struct kobject *kobj, ...@@ -115,7 +115,7 @@ static ssize_t eeprom_read(struct file *filp, struct kobject *kobj,
} }
memcpy(buf, &data->memory[off], count); memcpy(buf, &data->memory[off], count);
#else /* CONFIG_W1_SLAVE_DS2433_CRC */ #else /* CONFIG_W1_SLAVE_DS2433_CRC */
/* read directly from the EEPROM */ /* read directly from the EEPROM */
if (w1_reset_select_slave(sl)) { if (w1_reset_select_slave(sl)) {
......
...@@ -91,6 +91,7 @@ static ssize_t w1_slave_read(struct file *filp, struct kobject *kobj, ...@@ -91,6 +91,7 @@ static ssize_t w1_slave_read(struct file *filp, struct kobject *kobj,
loff_t off, size_t count) loff_t off, size_t count)
{ {
struct device *dev = kobj_to_dev(kobj); struct device *dev = kobj_to_dev(kobj);
return w1_ds2780_io(dev, buf, off, count, 0); return w1_ds2780_io(dev, buf, off, count, 0);
} }
......
...@@ -88,6 +88,7 @@ static ssize_t w1_slave_read(struct file *filp, struct kobject *kobj, ...@@ -88,6 +88,7 @@ static ssize_t w1_slave_read(struct file *filp, struct kobject *kobj,
loff_t off, size_t count) loff_t off, size_t count)
{ {
struct device *dev = kobj_to_dev(kobj); struct device *dev = kobj_to_dev(kobj);
return w1_ds2781_io(dev, buf, off, count, 0); return w1_ds2781_io(dev, buf, off, count, 0);
} }
......
...@@ -198,8 +198,10 @@ static int w1_f1C_write(struct w1_slave *sl, int addr, int len, const u8 *data) ...@@ -198,8 +198,10 @@ static int w1_f1C_write(struct w1_slave *sl, int addr, int len, const u8 *data)
wrbuf[3] = es; wrbuf[3] = es;
for (i = 0; i < sizeof(wrbuf); ++i) { for (i = 0; i < sizeof(wrbuf); ++i) {
/* issue 10ms strong pullup (or delay) on the last byte /*
for writing the data from the scratchpad to EEPROM */ * issue 10ms strong pullup (or delay) on the last byte
* for writing the data from the scratchpad to EEPROM
*/
if (w1_strong_pullup && i == sizeof(wrbuf)-1) if (w1_strong_pullup && i == sizeof(wrbuf)-1)
w1_next_pullup(sl->master, tm); w1_next_pullup(sl->master, tm);
......
...@@ -59,7 +59,7 @@ MODULE_PARM_DESC(stretch, "Default I2C stretch value to be set when a DS28E17 is ...@@ -59,7 +59,7 @@ MODULE_PARM_DESC(stretch, "Default I2C stretch value to be set when a DS28E17 is
/* /*
* Maximum number of I2C bytes to transfer within one CRC16 protected onewire * Maximum number of I2C bytes to transfer within one CRC16 protected onewire
* command. * command.
* */ */
#define W1_F19_WRITE_DATA_LIMIT 255 #define W1_F19_WRITE_DATA_LIMIT 255
/* Maximum number of I2C bytes to read with one onewire command. */ /* Maximum number of I2C bytes to read with one onewire command. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment