Skip to content

Commit

Permalink
rfkill: add type string helper
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Henrique de Moraes Holschuh authored and John W. Linville committed Jun 26, 2008
1 parent 79399a8 commit 99c632e
Showing 1 changed file with 15 additions and 18 deletions.
33 changes: 15 additions & 18 deletions net/rfkill/rfkill.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 99c632e

Please sign in to comment.