diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-14 21:40:16 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-14 21:40:16 +0300 |
commit | c25949d4cc22449414fe73bc930bdf650078e877 (patch) | |
tree | 1150b5e961df0802cef29a82139ffc8b606a0822 /include | |
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
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/hsi/hsi.h | 3 |
1 files changed, 0 insertions, 3 deletions
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; |