lkml.org 
[lkml]   [2008]   [May]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH 12/15] rfkill: add type string helper
Date
From
On Sunday 18 May 2008, Henrique de Moraes Holschuh wrote:
> 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>

> Cc: Ivo van Doorn <IvDoorn@gmail.com>
> ---
> 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 251defe..4ed8d19 100644
> --- a/net/rfkill/rfkill.c
> +++ b/net/rfkill/rfkill.c
> @@ -220,34 +220,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 const *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,




\
 
 \ /
  Last update: 2008-05-20 11:59    [W:0.124 / U:5.392 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site