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

Commit 819bfecc authored by florian@mickler.org's avatar florian@mickler.org Committed by John W. Linville
Browse files

rename new rfkill sysfs knobs 



This patch renames the (never officially released) sysfs-knobs
"blocked_hw" and "blocked_sw" to "hard" and "soft", as the hardware vs
software conotation is misleading.

It also gets rid of not needed locks around u32-read-access.

Signed-off-by: default avatarFlorian Mickler <florian@mickler.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 09a08cff

Documentation/ABI/stable/sysfs-class-rfkill

+5 −5
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ For details to this subsystem look at Documentation/rfkill.txt. 


For the deprecated /sys/class/rfkill/*/state and

/sys/class/rfkill/*/claim knobs of this interface look in

Documentation/ABI/obsolte/sysfs-class-rfkill.

Documentation/ABI/obsolete/sysfs-class-rfkill.



What: 		/sys/class/rfkill

Date:		09-Jul-2007
@@ -42,8 +42,8 @@ Values: A numeric value. 
		1: true





What:		/sys/class/rfkill/rfkill[0-9]+/blocked_hw

Date:		23-Feb-2010

What:		/sys/class/rfkill/rfkill[0-9]+/hard

Date:		12-March-2010

KernelVersion	v2.6.34

Contact:	linux-wireless@vger.kernel.org

Description: 	Current hardblock state. This file is read only.
@@ -55,8 +55,8 @@ Values: A numeric value. 
			the driver's control.





What:		/sys/class/rfkill/rfkill[0-9]+/blocked_sw

Date:		23-Feb-2010

What:		/sys/class/rfkill/rfkill[0-9]+/soft

Date:		12-March-2010

KernelVersion	v2.6.34

Contact:	linux-wireless@vger.kernel.org

Description:	Current softblock state. This file is read and write.

net/rfkill/core.c

+8 −27
Original line number Diff line number Diff line
@@ -628,37 +628,25 @@ static ssize_t rfkill_persistent_show(struct device *dev, 
	return sprintf(buf, "%d\n", rfkill->persistent);

}



static ssize_t rfkill_blocked_hw_show(struct device *dev,

static ssize_t rfkill_hard_show(struct device *dev,

				 struct device_attribute *attr,

				 char *buf)

{

	struct rfkill *rfkill = to_rfkill(dev);

	unsigned long flags;

	u32 state;



	spin_lock_irqsave(&rfkill->lock, flags);

	state = rfkill->state;

	spin_unlock_irqrestore(&rfkill->lock, flags);



	return sprintf(buf, "%d\n", (state & RFKILL_BLOCK_HW) ? 1 : 0 );

	return sprintf(buf, "%d\n", (rfkill->state & RFKILL_BLOCK_HW) ? 1 : 0 );

}



static ssize_t rfkill_blocked_sw_show(struct device *dev,

static ssize_t rfkill_soft_show(struct device *dev,

				 struct device_attribute *attr,

				 char *buf)

{

	struct rfkill *rfkill = to_rfkill(dev);

	unsigned long flags;

	u32 state;



	spin_lock_irqsave(&rfkill->lock, flags);

	state = rfkill->state;

	spin_unlock_irqrestore(&rfkill->lock, flags);



	return sprintf(buf, "%d\n", (state & RFKILL_BLOCK_SW) ? 1 : 0 );

	return sprintf(buf, "%d\n", (rfkill->state & RFKILL_BLOCK_SW) ? 1 : 0 );

}



static ssize_t rfkill_blocked_sw_store(struct device *dev,

static ssize_t rfkill_soft_store(struct device *dev,

				  struct device_attribute *attr,

				  const char *buf, size_t count)

{
@@ -698,14 +686,8 @@ static ssize_t rfkill_state_show(struct device *dev, 
				 char *buf)

{

	struct rfkill *rfkill = to_rfkill(dev);

	unsigned long flags;

	u32 state;



	spin_lock_irqsave(&rfkill->lock, flags);

	state = rfkill->state;

	spin_unlock_irqrestore(&rfkill->lock, flags);



	return sprintf(buf, "%d\n", user_state_from_blocked(state));

	return sprintf(buf, "%d\n", user_state_from_blocked(rfkill->state));

}



static ssize_t rfkill_state_store(struct device *dev,
@@ -755,9 +737,8 @@ static struct device_attribute rfkill_dev_attrs[] = { 
	__ATTR(persistent, S_IRUGO, rfkill_persistent_show, NULL),

	__ATTR(state, S_IRUGO|S_IWUSR, rfkill_state_show, rfkill_state_store),

	__ATTR(claim, S_IRUGO|S_IWUSR, rfkill_claim_show, rfkill_claim_store),

	__ATTR(sw, S_IRUGO|S_IWUSR, rfkill_blocked_sw_show,

			rfkill_blocked_sw_store),

	__ATTR(hw, S_IRUGO, rfkill_blocked_hw_show, NULL),

	__ATTR(soft, S_IRUGO|S_IWUSR, rfkill_soft_show, rfkill_soft_store),

	__ATTR(hard, S_IRUGO, rfkill_hard_show, NULL),

	__ATTR_NULL

};