mirror of
				git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
				synced 2025-09-04 20:19:47 +08:00 
			
		
		
		
	 d3ec4844d4
			
		
	
	
		d3ec4844d4
		
	
	
	
	
		
			
			* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
  fs: Merge split strings
  treewide: fix potentially dangerous trailing ';' in #defined values/expressions
  uwb: Fix misspelling of neighbourhood in comment
  net, netfilter: Remove redundant goto in ebt_ulog_packet
  trivial: don't touch files that are removed in the staging tree
  lib/vsprintf: replace link to Draft by final RFC number
  doc: Kconfig: `to be' -> `be'
  doc: Kconfig: Typo: square -> squared
  doc: Konfig: Documentation/power/{pm => apm-acpi}.txt
  drivers/net: static should be at beginning of declaration
  drivers/media: static should be at beginning of declaration
  drivers/i2c: static should be at beginning of declaration
  XTENSA: static should be at beginning of declaration
  SH: static should be at beginning of declaration
  MIPS: static should be at beginning of declaration
  ARM: static should be at beginning of declaration
  rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check
  Update my e-mail address
  PCIe ASPM: forcedly -> forcibly
  gma500: push through device driver tree
  ...
Fix up trivial conflicts:
 - arch/arm/mach-ep93xx/dma-m2p.c (deleted)
 - drivers/gpio/gpio-ep93xx.c (renamed and context nearby)
 - drivers/net/r8169.c (just context changes)
		
	
			
		
			
				
	
	
		
			71 lines
		
	
	
		
			1.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			71 lines
		
	
	
		
			1.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
| 
 | |
|   Broadcom B43 wireless driver
 | |
|   RFKILL support
 | |
| 
 | |
|   Copyright (c) 2007 Michael Buesch <m@bues.ch>
 | |
| 
 | |
|   This program is free software; you can redistribute it and/or modify
 | |
|   it under the terms of the GNU General Public License as published by
 | |
|   the Free Software Foundation; either version 2 of the License, or
 | |
|   (at your option) any later version.
 | |
| 
 | |
|   This program is distributed in the hope that it will be useful,
 | |
|   but WITHOUT ANY WARRANTY; without even the implied warranty of
 | |
|   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | |
|   GNU General Public License for more details.
 | |
| 
 | |
|   You should have received a copy of the GNU General Public License
 | |
|   along with this program; see the file COPYING.  If not, write to
 | |
|   the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
 | |
|   Boston, MA 02110-1301, USA.
 | |
| 
 | |
| */
 | |
| 
 | |
| #include "b43.h"
 | |
| 
 | |
| 
 | |
| /* Returns TRUE, if the radio is enabled in hardware. */
 | |
| bool b43_is_hw_radio_enabled(struct b43_wldev *dev)
 | |
| {
 | |
| 	return !(b43_read32(dev, B43_MMIO_RADIO_HWENABLED_HI)
 | |
| 		& B43_MMIO_RADIO_HWENABLED_HI_MASK);
 | |
| }
 | |
| 
 | |
| /* The poll callback for the hardware button. */
 | |
| void b43_rfkill_poll(struct ieee80211_hw *hw)
 | |
| {
 | |
| 	struct b43_wl *wl = hw_to_b43_wl(hw);
 | |
| 	struct b43_wldev *dev = wl->current_dev;
 | |
| 	bool enabled;
 | |
| 	bool brought_up = false;
 | |
| 
 | |
| 	mutex_lock(&wl->mutex);
 | |
| 	if (unlikely(b43_status(dev) < B43_STAT_INITIALIZED)) {
 | |
| 		if (b43_bus_powerup(dev, 0)) {
 | |
| 			mutex_unlock(&wl->mutex);
 | |
| 			return;
 | |
| 		}
 | |
| 		b43_device_enable(dev, 0);
 | |
| 		brought_up = true;
 | |
| 	}
 | |
| 
 | |
| 	enabled = b43_is_hw_radio_enabled(dev);
 | |
| 
 | |
| 	if (unlikely(enabled != dev->radio_hw_enable)) {
 | |
| 		dev->radio_hw_enable = enabled;
 | |
| 		b43info(wl, "Radio hardware status changed to %s\n",
 | |
| 			enabled ? "ENABLED" : "DISABLED");
 | |
| 		wiphy_rfkill_set_hw_state(hw->wiphy, !enabled);
 | |
| 		if (enabled != dev->phy.radio_on)
 | |
| 			b43_software_rfkill(dev, !enabled);
 | |
| 	}
 | |
| 
 | |
| 	if (brought_up) {
 | |
| 		b43_device_disable(dev, 0);
 | |
| 		b43_bus_may_powerdown(dev);
 | |
| 	}
 | |
| 
 | |
| 	mutex_unlock(&wl->mutex);
 | |
| }
 |