HSI changes for the v4.5 series
* misc. fixes -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABCgAGBQJWluUqAAoJENju1/PIO/qa+iUP+gPqTVJGYiEa0rFyjyyP82k0 XStggPg2+GANfKtTyjP1MvQ8I0CyzFZhfPHXGBzQmskba1RLt28TK7xGufsuih1w A2YL22mUKFkR93BEEyLZ9iaXoxoixp7ucLvHVrwz+nKTSAAqubRTOnW/f/xqmaDj jj5QIYNj1sU2RVvoqXu9Qb2UIMl/EAMkevFOkjMHU2uadRGtJo6kW32jm7OluVI9 hZeVie9HLJ6jzV9n7gWiGocEycnVmW9aHJnwdt/tFHKE5wi+AZmzI3E68k7/xtDo OXk0guEKOmooqWRdNgJc0uag7Ev/4Q19jIJSSm5Rq9UdQF0+bcEXQxLnbmXlPe44 o93MZ5svHfGUjbg7CJym1fBzXV0Qp0x4G34SrEGE5xfGPllv4SaIvqXSGL6wCcrs lv262cD3VDBuD0C7RUKFl2nHhUU3qE8vSh3oMsafXkLePOoAnKwfcKZEZyj+JvhX qbwoLO8/PIuQltRGOV4HiaYlRVJpCE2TW+0H5DIcxgxgJGdGVA4pHWCi21//5Lzu sJkNqnfD2FtH/dPBYxunJoZVccgx6ncrHSUR4pTKKvp9837HLDxyOvqIjg9ztvpI MvNSNe8CcTZkcuk8eDtxKq3l9zWWxguTgxZPvU4F8Hl8RaFZRFjVFYPbTFEK7TXr AzHE7V9SDabCJe1ppO60 =hCJ3 -----END PGP SIGNATURE----- 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
This commit is contained in:
Коммит
c25949d4cc
|
@ -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;
|
||||
|
|
|
@ -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");
|
||||
|
|
|
@ -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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче