Skip to content

Commit caf57e8

Browse files
committed
soundwire: bus: use consistent tests for return values
We use different styles to check the return values of IO related routines. The majority of the cases use 'if (ret < 0)', align the remaining cases for consistency. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
1 parent e7f5fd3 commit caf57e8

1 file changed

Lines changed: 13 additions & 13 deletions

File tree

drivers/soundwire/bus.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ int sdw_bus_master_add(struct sdw_bus *bus, struct device *parent,
4444
}
4545

4646
ret = sdw_get_id(bus);
47-
if (ret) {
47+
if (ret < 0) {
4848
dev_err(parent, "Failed to get bus id\n");
4949
return ret;
5050
}
5151

5252
ret = sdw_master_device_add(bus, parent, fwnode);
53-
if (ret) {
53+
if (ret < 0) {
5454
dev_err(parent, "Failed to add master device at link %d\n",
5555
bus->link_id);
5656
return ret;
@@ -121,7 +121,7 @@ int sdw_bus_master_add(struct sdw_bus *bus, struct device *parent,
121121
else
122122
ret = -ENOTSUPP; /* No ACPI/DT so error out */
123123

124-
if (ret) {
124+
if (ret < 0) {
125125
dev_err(bus->dev, "Finding slaves failed:%d\n", ret);
126126
return ret;
127127
}
@@ -422,7 +422,7 @@ sdw_bread_no_pm(struct sdw_bus *bus, u16 dev_num, u32 addr)
422422

423423
ret = sdw_fill_msg(&msg, NULL, addr, 1, dev_num,
424424
SDW_MSG_FLAG_READ, &buf);
425-
if (ret)
425+
if (ret < 0)
426426
return ret;
427427

428428
ret = sdw_transfer(bus, &msg);
@@ -440,7 +440,7 @@ sdw_bwrite_no_pm(struct sdw_bus *bus, u16 dev_num, u32 addr, u8 value)
440440

441441
ret = sdw_fill_msg(&msg, NULL, addr, 1, dev_num,
442442
SDW_MSG_FLAG_WRITE, &value);
443-
if (ret)
443+
if (ret < 0)
444444
return ret;
445445

446446
return sdw_transfer(bus, &msg);
@@ -454,7 +454,7 @@ int sdw_bread_no_pm_unlocked(struct sdw_bus *bus, u16 dev_num, u32 addr)
454454

455455
ret = sdw_fill_msg(&msg, NULL, addr, 1, dev_num,
456456
SDW_MSG_FLAG_READ, &buf);
457-
if (ret)
457+
if (ret < 0)
458458
return ret;
459459

460460
ret = sdw_transfer_unlocked(bus, &msg);
@@ -472,7 +472,7 @@ int sdw_bwrite_no_pm_unlocked(struct sdw_bus *bus, u16 dev_num, u32 addr, u8 val
472472

473473
ret = sdw_fill_msg(&msg, NULL, addr, 1, dev_num,
474474
SDW_MSG_FLAG_WRITE, &value);
475-
if (ret)
475+
if (ret < 0)
476476
return ret;
477477

478478
return sdw_transfer_unlocked(bus, &msg);
@@ -749,7 +749,7 @@ static int sdw_program_device_num(struct sdw_bus *bus)
749749
* dev_num
750750
*/
751751
ret = sdw_assign_device_num(slave);
752-
if (ret) {
752+
if (ret < 0) {
753753
dev_err(bus->dev,
754754
"Assign dev_num failed:%d\n",
755755
ret);
@@ -886,7 +886,7 @@ static int sdw_slave_clk_stop_prepare(struct sdw_slave *slave,
886886

887887
ret = sdw_write_no_pm(slave, SDW_SCP_SYSTEMCTRL, val);
888888

889-
if (ret != 0)
889+
if (ret < 0)
890890
dev_err(&slave->dev,
891891
"Clock Stop prepare failed for slave: %d", ret);
892892

@@ -1749,7 +1749,7 @@ int sdw_handle_slave_status(struct sdw_bus *bus,
17491749
if (status[0] == SDW_SLAVE_ATTACHED) {
17501750
dev_dbg(bus->dev, "Slave attached, programming device number\n");
17511751
ret = sdw_program_device_num(bus);
1752-
if (ret)
1752+
if (ret < 0)
17531753
dev_err(bus->dev, "Slave attach failed: %d\n", ret);
17541754
/*
17551755
* programming a device number will have side effects,
@@ -1783,7 +1783,7 @@ int sdw_handle_slave_status(struct sdw_bus *bus,
17831783

17841784
case SDW_SLAVE_ALERT:
17851785
ret = sdw_handle_slave_alerts(slave);
1786-
if (ret)
1786+
if (ret < 0)
17871787
dev_err(&slave->dev,
17881788
"Slave %d alert handling failed: %d\n",
17891789
i, ret);
@@ -1802,7 +1802,7 @@ int sdw_handle_slave_status(struct sdw_bus *bus,
18021802
attached_initializing = true;
18031803

18041804
ret = sdw_initialize_slave(slave);
1805-
if (ret)
1805+
if (ret < 0)
18061806
dev_err(&slave->dev,
18071807
"Slave %d initialization failed: %d\n",
18081808
i, ret);
@@ -1816,7 +1816,7 @@ int sdw_handle_slave_status(struct sdw_bus *bus,
18161816
}
18171817

18181818
ret = sdw_update_slave_status(slave, status[i]);
1819-
if (ret)
1819+
if (ret < 0)
18201820
dev_err(&slave->dev,
18211821
"Update Slave status failed:%d\n", ret);
18221822
if (attached_initializing) {

0 commit comments

Comments
 (0)