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 /drivers/net | |
| 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 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/ath9k/main.c | 1 | ||||
| -rw-r--r-- | drivers/net/wireless/b43/rfkill.c | 1 | ||||
| -rw-r--r-- | drivers/net/wireless/b43legacy/rfkill.c | 1 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-rfkill.c | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c index 13d4e6756c99..0607df20e497 100644 --- a/drivers/net/wireless/ath9k/main.c +++ b/drivers/net/wireless/ath9k/main.c | |||
| @@ -1267,7 +1267,6 @@ static int ath_init_sw_rfkill(struct ath_softc *sc) | |||
| 1267 | sc->rf_kill.rfkill->data = sc; | 1267 | sc->rf_kill.rfkill->data = sc; |
| 1268 | sc->rf_kill.rfkill->toggle_radio = ath_sw_toggle_radio; | 1268 | sc->rf_kill.rfkill->toggle_radio = ath_sw_toggle_radio; |
| 1269 | sc->rf_kill.rfkill->state = RFKILL_STATE_UNBLOCKED; | 1269 | sc->rf_kill.rfkill->state = RFKILL_STATE_UNBLOCKED; |
| 1270 | sc->rf_kill.rfkill->user_claim_unsupported = 1; | ||
| 1271 | 1270 | ||
| 1272 | return 0; | 1271 | return 0; |
| 1273 | } | 1272 | } |
diff --git a/drivers/net/wireless/b43/rfkill.c b/drivers/net/wireless/b43/rfkill.c index afad42358693..9e1d00bc24d3 100644 --- a/drivers/net/wireless/b43/rfkill.c +++ b/drivers/net/wireless/b43/rfkill.c | |||
| @@ -139,7 +139,6 @@ void b43_rfkill_init(struct b43_wldev *dev) | |||
| 139 | rfk->rfkill->state = RFKILL_STATE_UNBLOCKED; | 139 | rfk->rfkill->state = RFKILL_STATE_UNBLOCKED; |
| 140 | rfk->rfkill->data = dev; | 140 | rfk->rfkill->data = dev; |
| 141 | rfk->rfkill->toggle_radio = b43_rfkill_soft_toggle; | 141 | rfk->rfkill->toggle_radio = b43_rfkill_soft_toggle; |
| 142 | rfk->rfkill->user_claim_unsupported = 1; | ||
| 143 | 142 | ||
| 144 | rfk->poll_dev = input_allocate_polled_device(); | 143 | rfk->poll_dev = input_allocate_polled_device(); |
| 145 | if (!rfk->poll_dev) { | 144 | if (!rfk->poll_dev) { |
diff --git a/drivers/net/wireless/b43legacy/rfkill.c b/drivers/net/wireless/b43legacy/rfkill.c index b32bf6a94f19..4b0c7d27a51f 100644 --- a/drivers/net/wireless/b43legacy/rfkill.c +++ b/drivers/net/wireless/b43legacy/rfkill.c | |||
| @@ -142,7 +142,6 @@ void b43legacy_rfkill_init(struct b43legacy_wldev *dev) | |||
| 142 | rfk->rfkill->state = RFKILL_STATE_UNBLOCKED; | 142 | rfk->rfkill->state = RFKILL_STATE_UNBLOCKED; |
| 143 | rfk->rfkill->data = dev; | 143 | rfk->rfkill->data = dev; |
| 144 | rfk->rfkill->toggle_radio = b43legacy_rfkill_soft_toggle; | 144 | rfk->rfkill->toggle_radio = b43legacy_rfkill_soft_toggle; |
| 145 | rfk->rfkill->user_claim_unsupported = 1; | ||
| 146 | 145 | ||
| 147 | rfk->poll_dev = input_allocate_polled_device(); | 146 | rfk->poll_dev = input_allocate_polled_device(); |
| 148 | if (!rfk->poll_dev) { | 147 | if (!rfk->poll_dev) { |
diff --git a/drivers/net/wireless/iwlwifi/iwl-rfkill.c b/drivers/net/wireless/iwlwifi/iwl-rfkill.c index 2ad9faf1508a..65605ad44e4b 100644 --- a/drivers/net/wireless/iwlwifi/iwl-rfkill.c +++ b/drivers/net/wireless/iwlwifi/iwl-rfkill.c | |||
| @@ -91,7 +91,6 @@ int iwl_rfkill_init(struct iwl_priv *priv) | |||
| 91 | priv->rfkill->data = priv; | 91 | priv->rfkill->data = priv; |
| 92 | priv->rfkill->state = RFKILL_STATE_UNBLOCKED; | 92 | priv->rfkill->state = RFKILL_STATE_UNBLOCKED; |
| 93 | priv->rfkill->toggle_radio = iwl_rfkill_soft_rf_kill; | 93 | priv->rfkill->toggle_radio = iwl_rfkill_soft_rf_kill; |
| 94 | priv->rfkill->user_claim_unsupported = 1; | ||
| 95 | 94 | ||
| 96 | priv->rfkill->dev.class->suspend = NULL; | 95 | priv->rfkill->dev.class->suspend = NULL; |
| 97 | priv->rfkill->dev.class->resume = NULL; | 96 | priv->rfkill->dev.class->resume = NULL; |
