diff options
Diffstat (limited to 'include/linux/rfkill.h')
| -rw-r--r-- | include/linux/rfkill.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h index 164332cbb77c..de18ef227e00 100644 --- a/include/linux/rfkill.h +++ b/include/linux/rfkill.h | |||
| @@ -52,23 +52,12 @@ enum rfkill_state { | |||
| 52 | RFKILL_STATE_MAX, /* marker for last valid state */ | 52 | RFKILL_STATE_MAX, /* marker for last valid state */ |
| 53 | }; | 53 | }; |
| 54 | 54 | ||
| 55 | /* | ||
| 56 | * These are DEPRECATED, drivers using them should be verified to | ||
| 57 | * comply with the rfkill usage guidelines in Documentation/rfkill.txt | ||
| 58 | * and then converted to use the new names for rfkill_state | ||
| 59 | */ | ||
| 60 | #define RFKILL_STATE_OFF RFKILL_STATE_SOFT_BLOCKED | ||
| 61 | #define RFKILL_STATE_ON RFKILL_STATE_UNBLOCKED | ||
| 62 | |||
| 63 | /** | 55 | /** |
| 64 | * struct rfkill - rfkill control structure. | 56 | * struct rfkill - rfkill control structure. |
| 65 | * @name: Name of the switch. | 57 | * @name: Name of the switch. |
| 66 | * @type: Radio type which the button controls, the value stored | 58 | * @type: Radio type which the button controls, the value stored |
| 67 | * here should be a value from enum rfkill_type. | 59 | * here should be a value from enum rfkill_type. |
| 68 | * @state: State of the switch, "UNBLOCKED" means radio can operate. | 60 | * @state: State of the switch, "UNBLOCKED" means radio can operate. |
| 69 | * @user_claim_unsupported: Whether the hardware supports exclusive | ||
| 70 | * RF-kill control by userspace. Set this before registering. | ||
| 71 | * @user_claim: Set when the switch is controlled exlusively by userspace. | ||
| 72 | * @mutex: Guards switch state transitions. It serializes callbacks | 61 | * @mutex: Guards switch state transitions. It serializes callbacks |
| 73 | * and also protects the state. | 62 | * and also protects the state. |
| 74 | * @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 |
| @@ -91,9 +80,6 @@ struct rfkill { | |||
| 91 | const char *name; | 80 | const char *name; |
| 92 | enum rfkill_type type; | 81 | enum rfkill_type type; |
| 93 | 82 | ||
| 94 | bool user_claim_unsupported; | ||
| 95 | bool user_claim; | ||
| 96 | |||
| 97 | /* the mutex serializes callbacks and also protects | 83 | /* the mutex serializes callbacks and also protects |
| 98 | * the state */ | 84 | * the state */ |
| 99 | struct mutex mutex; | 85 | struct mutex mutex; |