Merge tag 'hsi-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi

Pull HSI updates from Sebastian Reichel:
 "Misc fixes"

* tag 'hsi-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
  HSI: omap_ssi_port: fix handling of_get_named_gpio result
  HSI: omap_ssi: fix handling ida_simple_get result
  HSI: Remove struct hsi_client private fields from kernel-doc

diff --git a/drivers/hsi/controllers/omap_ssi.c b/drivers/hsi/controllers/omap_ssi.c
index f6d3100b7a328dbd65d1be63d063ad595a915bdf..27b91f14ba7a6319e12a49893c70aa47e76aebfa 100644 (file)
--- 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 02e66032ae7360addfd6a64d1c5cc46991743d57..e80a66e20998697de466d6b5fe7bb773d7a77888 100644 (file)
--- 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 5dd60c2e120f944aa0d35fe7aef607fa605d70f5..2790591c77cf681013e2b0ef99390d31c8b06f1c 100644 (file)
--- 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;