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

Commit 0b3e6f86 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

iwlagn: remove 5000 hw header 



The inline function in this header is only used
in a single file, so we can move it there.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3246c4e6

drivers/net/wireless/iwlwifi/iwl-5000-hw.h

deleted100644 → 0
+0 −88
Original line number Diff line number Diff line 
/******************************************************************************

 *

 * This file is provided under a dual BSD/GPLv2 license.  When using or

 * redistributing this file, you may do so under either license.

 *

 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2007 - 2011 Intel Corporation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as

 * published by the Free Software Foundation.

 *

 * 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; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,

 * USA

 *

 * The full GNU General Public License is included in this distribution

 * in the file called LICENSE.GPL.

 *

 * Contact Information:

 *  Intel Linux Wireless <ilw@linux.intel.com>

 * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497

 *

 * BSD LICENSE

 *

 * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 *

 *  * Redistributions of source code must retain the above copyright

 *    notice, this list of conditions and the following disclaimer.

 *  * Redistributions in binary form must reproduce the above copyright

 *    notice, this list of conditions and the following disclaimer in

 *    the documentation and/or other materials provided with the

 *    distribution.

 *  * Neither the name Intel Corporation nor the names of its

 *    contributors may be used to endorse or promote products derived

 *    from this software without specific prior written permission.

 *

 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 *

 *****************************************************************************/

/*

 * Please use this file (iwl-5000-hw.h) only for hardware-related definitions.

 * Use iwl-commands.h for uCode API definitions.

 */



#ifndef __iwl_5000_hw_h__

#define __iwl_5000_hw_h__



/* 5150 only */

#define IWL_5150_VOLTAGE_TO_TEMPERATURE_COEFF	(-5)



static inline s32 iwl_temp_calib_to_offset(struct iwl_priv *priv)

{

	u16 temperature, voltage;

	__le16 *temp_calib = (__le16 *)iwl_eeprom_query_addr(priv,

				EEPROM_KELVIN_TEMPERATURE);



	temperature = le16_to_cpu(temp_calib[0]);

	voltage = le16_to_cpu(temp_calib[1]);



	/* offset = temp - volt / coeff */

	return (s32)(temperature - voltage / IWL_5150_VOLTAGE_TO_TEMPERATURE_COEFF);

}



#endif /* __iwl_5000_hw_h__ */

drivers/net/wireless/iwlwifi/iwl-5000.c

+15 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ 
#include "iwl-helpers.h"

#include "iwl-agn.h"

#include "iwl-agn-hw.h"

#include "iwl-5000-hw.h"

#include "iwl-trans.h"

#include "iwl-shared.h"

#include "iwl-cfg.h"
@@ -134,6 +133,21 @@ static struct iwl_sensitivity_ranges iwl5150_sensitivity = { 
	.nrg_th_cca = 62,

};



#define IWL_5150_VOLTAGE_TO_TEMPERATURE_COEFF	(-5)



static s32 iwl_temp_calib_to_offset(struct iwl_priv *priv)

{

	u16 temperature, voltage;

	__le16 *temp_calib = (__le16 *)iwl_eeprom_query_addr(priv,

				EEPROM_KELVIN_TEMPERATURE);



	temperature = le16_to_cpu(temp_calib[0]);

	voltage = le16_to_cpu(temp_calib[1]);



	/* offset = temp - volt / coeff */

	return (s32)(temperature - voltage / IWL_5150_VOLTAGE_TO_TEMPERATURE_COEFF);

}



static void iwl5150_set_ct_threshold(struct iwl_priv *priv)

{

	const s32 volt2temp_coef = IWL_5150_VOLTAGE_TO_TEMPERATURE_COEFF;