If we fail to add a switch for some reason log an error instead of
keeping silent. This is useful for debugging.

Signed-off-by: Mika Westerberg <[email protected]>
---
 drivers/thunderbolt/switch.c | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/drivers/thunderbolt/switch.c b/drivers/thunderbolt/switch.c
index f9efd670d032..fd7878020f70 100644
--- a/drivers/thunderbolt/switch.c
+++ b/drivers/thunderbolt/switch.c
@@ -1775,21 +1775,25 @@ int tb_switch_add(struct tb_switch *sw)
         * configuration based mailbox.
         */
        ret = tb_switch_add_dma_port(sw);
-       if (ret)
+       if (ret) {
+               dev_err(&sw->dev, "failed to add DMA port\n");
                return ret;
+       }
 
        if (!sw->safe_mode) {
                /* read drom */
                ret = tb_drom_read(sw);
                if (ret) {
-                       tb_sw_warn(sw, "tb_eeprom_read_rom failed\n");
+                       dev_err(&sw->dev, "reading DROM failed\n");
                        return ret;
                }
                tb_sw_dbg(sw, "uid: %#llx\n", sw->uid);
 
                ret = tb_switch_set_uuid(sw);
-               if (ret)
+               if (ret) {
+                       dev_err(&sw->dev, "failed to set UUID\n");
                        return ret;
+               }
 
                for (i = 0; i <= sw->config.max_port_number; i++) {
                        if (sw->ports[i].disabled) {
@@ -1797,14 +1801,18 @@ int tb_switch_add(struct tb_switch *sw)
                                continue;
                        }
                        ret = tb_init_port(&sw->ports[i]);
-                       if (ret)
+                       if (ret) {
+                               dev_err(&sw->dev, "failed to initialize port 
%d\n", i);
                                return ret;
+                       }
                }
        }
 
        ret = device_add(&sw->dev);
-       if (ret)
+       if (ret) {
+               dev_err(&sw->dev, "failed to add device: %d\n", ret);
                return ret;
+       }
 
        if (tb_route(sw)) {
                dev_info(&sw->dev, "new device found, vendor=%#x device=%#x\n",
@@ -1816,6 +1824,7 @@ int tb_switch_add(struct tb_switch *sw)
 
        ret = tb_switch_nvm_add(sw);
        if (ret) {
+               dev_err(&sw->dev, "failed to add NVM devices\n");
                device_del(&sw->dev);
                return ret;
        }
-- 
2.23.0

Reply via email to