3 files changed, 7 insertions, 11 deletions

diff --git a/drivers/hsi/controllers/omap_ssi.c b/drivers/hsi/controllers/omap_ssi.c
index f6d3100b7a32..27b91f14ba7a 100644
--- a/drivers/hsi/controllers/omap_ssi.c
+++ b/drivers/hsi/controllers/omap_ssi.c
@@ -323,11 +323,10 @@ static int __init ssi_add_controller(struct hsi_controller *ssi,
                 return -ENOMEM;
         }
 
-        ssi->id = ida_simple_get(&platform_omap_ssi_ida, 0, 0, GFP_KERNEL);
-        if (ssi->id < 0) {
-                err = ssi->id;
+        err = ida_simple_get(&platform_omap_ssi_ida, 0, 0, GFP_KERNEL);
+        if (err < 0)
                 goto out_err;
-        }
+        ssi->id = err;
 
         ssi->owner = THIS_MODULE;
         ssi->device.parent = &pd->dev;
diff --git a/drivers/hsi/controllers/omap_ssi_port.c b/drivers/hsi/controllers/omap_ssi_port.c
index 02e66032ae73..e80a66e20998 100644
--- a/drivers/hsi/controllers/omap_ssi_port.c
+++ b/drivers/hsi/controllers/omap_ssi_port.c
@@ -1147,13 +1147,13 @@ static int __init ssi_port_probe(struct platform_device *pd)
                 goto error;
         }
 
-        cawake_gpio = of_get_named_gpio(np, "ti,ssi-cawake-gpio", 0);
-        if (cawake_gpio < 0) {
+        err = of_get_named_gpio(np, "ti,ssi-cawake-gpio", 0);
+        if (err < 0) {
                 dev_err(&pd->dev, "DT data is missing cawake gpio (err=%d)\n",
-                        cawake_gpio);
-                err = -ENODEV;
+                        err);
                 goto error;
         }
+        cawake_gpio = err;
 
         err = devm_gpio_request_one(&port->device, cawake_gpio, GPIOF_DIR_IN,
                 "cawake");
diff --git a/include/linux/hsi/hsi.h b/include/linux/hsi/hsi.h
index 5dd60c2e120f..2790591c77cf 100644
--- a/include/linux/hsi/hsi.h
+++ b/include/linux/hsi/hsi.h
@@ -135,9 +135,6 @@ static inline int hsi_register_board_info(struct hsi_board_info const *info,
  * @device: Driver model representation of the device
  * @tx_cfg: HSI TX configuration
  * @rx_cfg: HSI RX configuration
- * @e_handler: Callback for handling port events (RX Wake High/Low)
- * @pclaimed: Keeps tracks if the clients claimed its associated HSI port
- * @nb: Notifier block for port events
  */
 struct hsi_client {
         struct device           device;