diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-14 18:40:16 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-14 18:40:16 (GMT) |
| commit | c25949d4cc22449414fe73bc930bdf650078e877 (patch) | |
| tree | 1150b5e961df0802cef29a82139ffc8b606a0822 | |
| parent | b14bf630be972aceb0c8981f9794e612cbb141f7 (diff) | |
| parent | 525e1abc6b5a7d8bd9006de1da6e99722305ea2b (diff) | |
| download | linux-c25949d4cc22449414fe73bc930bdf650078e877.tar.xz | |
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
| -rw-r--r-- | drivers/hsi/controllers/omap_ssi.c | 7 | ||||
| -rw-r--r-- | drivers/hsi/controllers/omap_ssi_port.c | 8 | ||||
| -rw-r--r-- | include/linux/hsi/hsi.h | 3 |
3 files changed, 7 insertions, 11 deletions
diff --git a/drivers/hsi/controllers/omap_ssi.c b/drivers/hsi/controllers/omap_ssi.c index f6d3100..27b91f1 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 02e6603..e80a66e 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 5dd60c2..2790591 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; |