diff options
| author | Henrique de Moraes Holschuh <hmh@hmh.eng.br> | 2008-06-23 17:23:04 -0300 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-06-26 14:21:21 -0400 |
| commit | 99c632e5a304e1f76350eb9e8b2493514de8b60c (patch) | |
| tree | 81eb9f9494a377d377ab57357adf7a37253d25e8 /net/rfkill | |
| parent | 79399a8d1908f6a406e82d23c5a9937e1722ed3a (diff) | |
| download | linux-stable-99c632e5a304e1f76350eb9e8b2493514de8b60c.tar.gz linux-stable-99c632e5a304e1f76350eb9e8b2493514de8b60c.tar.bz2 linux-stable-99c632e5a304e1f76350eb9e8b2493514de8b60c.zip | |
rfkill: add type string helper
We will need access to the rfkill switch type in string format for more
than just sysfs. Therefore, move it to a generic helper.
Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/rfkill')
| -rw-r--r-- | net/rfkill/rfkill.c | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/net/rfkill/rfkill.c b/net/rfkill/rfkill.c index a561e350a70a..3c7773475ea6 100644 --- a/net/rfkill/rfkill.c +++ b/net/rfkill/rfkill.c @@ -224,34 +224,31 @@ static ssize_t rfkill_name_show(struct device *dev, return sprintf(buf, "%s\n", rfkill->name); } -static ssize_t rfkill_type_show(struct device *dev, - struct device_attribute *attr, - char *buf) +static const char *rfkill_get_type_str(enum rfkill_type type) { - struct rfkill *rfkill = to_rfkill(dev); - const char *type; - - switch (rfkill->type) { + switch (type) { case RFKILL_TYPE_WLAN: - type = "wlan"; - break; + return "wlan"; case RFKILL_TYPE_BLUETOOTH: - type = "bluetooth"; - break; + return "bluetooth"; case RFKILL_TYPE_UWB: - type = "ultrawideband"; - break; + return "ultrawideband"; case RFKILL_TYPE_WIMAX: - type = "wimax"; - break; + return "wimax"; case RFKILL_TYPE_WWAN: - type = "wwan"; - break; + return "wwan"; default: BUG(); } +} + +static ssize_t rfkill_type_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct rfkill *rfkill = to_rfkill(dev); - return sprintf(buf, "%s\n", type); + return sprintf(buf, "%s\n", rfkill_get_type_str(rfkill->type)); } static ssize_t rfkill_state_show(struct device *dev, |