diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-01-11 10:28:19 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-01-11 10:28:19 -0500 |
| commit | 734d1ece37fbf3d2ddfc71bc6c69e0fe35f02542 (patch) | |
| tree | c4805dd7e746b1feb9e09e9849f3245d0b2c0c6b /include/linux/input.h | |
| parent | 216c82c6aba63eeb49d7654b448e0d47bea255bb (diff) | |
| parent | 9931faca02c604c22335f5a935a501bb2ace6e20 (diff) | |
Merge tag 'v3.8-rc3' into v4l_for_linus
Linux 3.8-rc3
* tag 'v3.8-rc3': (11110 commits)
Linux 3.8-rc3
mm: reinstante dropped pmd_trans_splitting() check
cred: Remove tgcred pointer from struct cred
drm/ttm: fix fence locking in ttm_buffer_object_transfer
ARM: clps711x: Fix bad merge of clockevents setup
ARM: highbank: save and restore L2 cache and GIC on suspend
ARM: highbank: add a power request clear
ARM: highbank: fix secondary boot and hotplug
ARM: highbank: fix typos with hignbank in power request functions
ARM: dts: fix highbank cpu mpidr values
ARM: dts: add device_type prop to cpu nodes on Calxeda platforms
drm/prime: drop reference on imported dma-buf come from gem
xen/netfront: improve truesize tracking
ARM: mx5: Fix MX53 flexcan2 clock
ARM: OMAP2+: am33xx-hwmod: Fix wrongly terminated am33xx_usbss_mpu_irqs array
sctp: fix Kconfig bug in default cookie hmac selection
EDAC: Cleanup device deregistering path
EDAC: Fix EDAC Kconfig menu
EDAC: Fix kernel panic on module unloading
ALSA: hda - add mute LED for HP Pavilion 17 (Realtek codec)
...
Diffstat (limited to 'include/linux/input.h')
| -rw-r--r-- | include/linux/input.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/linux/input.h b/include/linux/input.h index cab994ba6d91..82ce323b9986 100644 --- a/include/linux/input.h +++ b/include/linux/input.h | |||
| @@ -112,6 +112,11 @@ struct input_value { | |||
| 112 | * @h_list: list of input handles associated with the device. When | 112 | * @h_list: list of input handles associated with the device. When |
| 113 | * accessing the list dev->mutex must be held | 113 | * accessing the list dev->mutex must be held |
| 114 | * @node: used to place the device onto input_dev_list | 114 | * @node: used to place the device onto input_dev_list |
| 115 | * @num_vals: number of values queued in the current frame | ||
| 116 | * @max_vals: maximum number of values queued in a frame | ||
| 117 | * @vals: array of values queued in the current frame | ||
| 118 | * @devres_managed: indicates that devices is managed with devres framework | ||
| 119 | * and needs not be explicitly unregistered or freed. | ||
| 115 | */ | 120 | */ |
| 116 | struct input_dev { | 121 | struct input_dev { |
| 117 | const char *name; | 122 | const char *name; |
| @@ -180,6 +185,8 @@ struct input_dev { | |||
| 180 | unsigned int num_vals; | 185 | unsigned int num_vals; |
| 181 | unsigned int max_vals; | 186 | unsigned int max_vals; |
| 182 | struct input_value *vals; | 187 | struct input_value *vals; |
| 188 | |||
| 189 | bool devres_managed; | ||
| 183 | }; | 190 | }; |
| 184 | #define to_input_dev(d) container_of(d, struct input_dev, dev) | 191 | #define to_input_dev(d) container_of(d, struct input_dev, dev) |
| 185 | 192 | ||
| @@ -323,7 +330,8 @@ struct input_handle { | |||
| 323 | struct list_head h_node; | 330 | struct list_head h_node; |
| 324 | }; | 331 | }; |
| 325 | 332 | ||
| 326 | struct input_dev *input_allocate_device(void); | 333 | struct input_dev __must_check *input_allocate_device(void); |
| 334 | struct input_dev __must_check *devm_input_allocate_device(struct device *); | ||
| 327 | void input_free_device(struct input_dev *dev); | 335 | void input_free_device(struct input_dev *dev); |
| 328 | 336 | ||
| 329 | static inline struct input_dev *input_get_device(struct input_dev *dev) | 337 | static inline struct input_dev *input_get_device(struct input_dev *dev) |
