Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99c632e5 authored by Henrique de Moraes Holschuh's avatar Henrique de Moraes Holschuh Committed by John W. Linville
Browse files

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: default avatarHenrique de Moraes Holschuh <hmh@hmh.eng.br>
Acked-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 79399a8d

net/rfkill/rfkill.c

+15 −18
Original line number Diff line number Diff line
@@ -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,