Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c25949d4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents b14bf630 525e1abc

drivers/hsi/controllers/omap_ssi.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -323,11 +323,10 @@ static int __init ssi_add_controller(struct hsi_controller *ssi, 
		return -ENOMEM;

		return -ENOMEM;

	}

	}





	ssi->id = ida_simple_get(&platform_omap_ssi_ida, 0, 0, GFP_KERNEL);

	err = ida_simple_get(&platform_omap_ssi_ida, 0, 0, GFP_KERNEL);

	if (ssi->id < 0) {

	if (err < 0)

		err = ssi->id;

		goto out_err;

		goto out_err;

	}

	ssi->id = err;





	ssi->owner = THIS_MODULE;

	ssi->owner = THIS_MODULE;

	ssi->device.parent = &pd->dev;

	ssi->device.parent = &pd->dev;

drivers/hsi/controllers/omap_ssi_port.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -1147,13 +1147,13 @@ static int __init ssi_port_probe(struct platform_device *pd) 
		goto error;

		goto error;

	}

	}





	cawake_gpio = of_get_named_gpio(np, "ti,ssi-cawake-gpio", 0);

	err = of_get_named_gpio(np, "ti,ssi-cawake-gpio", 0);

	if (cawake_gpio < 0) {

	if (err < 0) {

		dev_err(&pd->dev, "DT data is missing cawake gpio (err=%d)\n",

		dev_err(&pd->dev, "DT data is missing cawake gpio (err=%d)\n",

			cawake_gpio);

			err);

		err = -ENODEV;

		goto error;

		goto error;

	}

	}

	cawake_gpio = err;





	err = devm_gpio_request_one(&port->device, cawake_gpio, GPIOF_DIR_IN,

	err = devm_gpio_request_one(&port->device, cawake_gpio, GPIOF_DIR_IN,

		"cawake");

		"cawake");

include/linux/hsi/hsi.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -135,9 +135,6 @@ static inline int hsi_register_board_info(struct hsi_board_info const *info, 
 * @device: Driver model representation of the device

 * @device: Driver model representation of the device

 * @tx_cfg: HSI TX configuration

 * @tx_cfg: HSI TX configuration

 * @rx_cfg: HSI RX 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 hsi_client {

	struct device		device;

	struct device		device;