diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2009-03-27 09:14:31 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-04-22 16:54:27 -0400 |
commit | 621cac85297de5ba655e3430b007dd2e0da91da6 (patch) | |
tree | 6193ecf0966094bb744fb4238191bcab03a3cdef /include/linux/rfkill.h | |
parent | c1c6b14b22af0f85d05a70405dc3fba5de840c7b (diff) |
rfkill: remove user_claim stuff
Almost all drivers do not support user_claim, so remove it
completely and always report -EOPNOTSUPP to userspace. Since
userspace cannot really drive rfkill _anyway_ (due to the
odd restrictions imposed by the documentation) having this
code is just pointless.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/linux/rfkill.h')
-rw-r--r-- | include/linux/rfkill.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h index e1ec7d9aa49c..de18ef227e00 100644 --- a/include/linux/rfkill.h +++ b/include/linux/rfkill.h | |||
@@ -58,9 +58,6 @@ enum rfkill_state { | |||
58 | * @type: Radio type which the button controls, the value stored | 58 | * @type: Radio type which the button controls, the value stored |
59 | * here should be a value from enum rfkill_type. | 59 | * here should be a value from enum rfkill_type. |
60 | * @state: State of the switch, "UNBLOCKED" means radio can operate. | 60 | * @state: State of the switch, "UNBLOCKED" means radio can operate. |
61 | * @user_claim_unsupported: Whether the hardware supports exclusive | ||
62 | * RF-kill control by userspace. Set this before registering. | ||
63 | * @user_claim: Set when the switch is controlled exlusively by userspace. | ||
64 | * @mutex: Guards switch state transitions. It serializes callbacks | 61 | * @mutex: Guards switch state transitions. It serializes callbacks |
65 | * and also protects the state. | 62 | * and also protects the state. |
66 | * @data: Pointer to the RF button drivers private data which will be | 63 | * @data: Pointer to the RF button drivers private data which will be |
@@ -83,9 +80,6 @@ struct rfkill { | |||
83 | const char *name; | 80 | const char *name; |
84 | enum rfkill_type type; | 81 | enum rfkill_type type; |
85 | 82 | ||
86 | bool user_claim_unsupported; | ||
87 | bool user_claim; | ||
88 | |||
89 | /* the mutex serializes callbacks and also protects | 83 | /* the mutex serializes callbacks and also protects |
90 | * the state */ | 84 | * the state */ |
91 | struct mutex mutex; | 85 | struct mutex mutex; |