lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rename new rfkill sysfs knobs

Browse Source 
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: Florian Mickler <florian@mickler.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
florian@mickler.org
2010-03-13 13:31:05 +01:00
committed by John W. Linville
parent 09a08cff3d
commit 819bfecc4f
2 changed files with 13 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Documentation/ABI/stable/sysfs-class-rfkill
View File

@@ -4,7 +4,7 @@ For details to this subsystem look at Documentation/rfkill.txt.
For the deprecated /sys/class/rfkill/*/state and For the deprecated /sys/class/rfkill/*/state and
/sys/class/rfkill/*/claim knobs of this interface look in /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 What: /sys/class/rfkill
Date: 09-Jul-2007 Date: 09-Jul-2007
@@ -42,8 +42,8 @@ Values: A numeric value.
1: true 1: true
What: /sys/class/rfkill/rfkill[0-9]+/blocked_hw What: /sys/class/rfkill/rfkill[0-9]+/hard
Date: 23-Feb-2010 Date: 12-March-2010
KernelVersion v2.6.34 KernelVersion v2.6.34
Contact: linux-wireless@vger.kernel.org Contact: linux-wireless@vger.kernel.org
Description: Current hardblock state. This file is read only. Description: Current hardblock state. This file is read only.
@@ -55,8 +55,8 @@ Values: A numeric value.
the driver's control. the driver's control.
What: /sys/class/rfkill/rfkill[0-9]+/blocked_sw What: /sys/class/rfkill/rfkill[0-9]+/soft
Date: 23-Feb-2010 Date: 12-March-2010
KernelVersion v2.6.34 KernelVersion v2.6.34
Contact: linux-wireless@vger.kernel.org Contact: linux-wireless@vger.kernel.org
Description: Current softblock state. This file is read and write. Description: Current softblock state. This file is read and write.

35
net/rfkill/core.c
View File

@@ -628,37 +628,25 @@ static ssize_t rfkill_persistent_show(struct device *dev,
return sprintf(buf, "%d\n", rfkill->persistent); 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, struct device_attribute *attr,
char *buf) char *buf)
{ {
struct rfkill *rfkill = to_rfkill(dev); struct rfkill *rfkill = to_rfkill(dev);
unsigned long flags;
u32 state;
spin_lock_irqsave(&rfkill->lock, flags); return sprintf(buf, "%d\n", (rfkill->state & RFKILL_BLOCK_HW) ? 1 : 0 );
state = rfkill->state;
spin_unlock_irqrestore(&rfkill->lock, flags);
return sprintf(buf, "%d\n", (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, struct device_attribute *attr,
char *buf) char *buf)
{ {
struct rfkill *rfkill = to_rfkill(dev); struct rfkill *rfkill = to_rfkill(dev);
unsigned long flags;
u32 state;
spin_lock_irqsave(&rfkill->lock, flags); return sprintf(buf, "%d\n", (rfkill->state & RFKILL_BLOCK_SW) ? 1 : 0 );
state = rfkill->state;
spin_unlock_irqrestore(&rfkill->lock, flags);
return sprintf(buf, "%d\n", (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, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
@@ -698,14 +686,8 @@ static ssize_t rfkill_state_show(struct device *dev,
char *buf) char *buf)
{ {
struct rfkill *rfkill = to_rfkill(dev); struct rfkill *rfkill = to_rfkill(dev);
unsigned long flags;
u32 state;
spin_lock_irqsave(&rfkill->lock, flags); return sprintf(buf, "%d\n", user_state_from_blocked(rfkill->state));
state = rfkill->state;
spin_unlock_irqrestore(&rfkill->lock, flags);
return sprintf(buf, "%d\n", user_state_from_blocked(state));
} }
static ssize_t rfkill_state_store(struct device *dev, 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(persistent, S_IRUGO, rfkill_persistent_show, NULL),
__ATTR(state, S_IRUGO|S_IWUSR, rfkill_state_show, rfkill_state_store), __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(claim, S_IRUGO|S_IWUSR, rfkill_claim_show, rfkill_claim_store),
__ATTR(sw, S_IRUGO|S_IWUSR, rfkill_blocked_sw_show, __ATTR(soft, S_IRUGO|S_IWUSR, rfkill_soft_show, rfkill_soft_store),
rfkill_blocked_sw_store), __ATTR(hard, S_IRUGO, rfkill_hard_show, NULL),
__ATTR(hw, S_IRUGO, rfkill_blocked_hw_show, NULL),
__ATTR_NULL __ATTR_NULL
}; };