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

Commit f2c3c952 authored by Oleksij Rempel's avatar Oleksij Rempel Committed by John W. Linville
Browse files

ath9k-common: create common-debug and move modal_eeprom to cmn 



Signed-off-by: default avatarOleksij Rempel <linux@rempel-privat.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent fbe057d8

drivers/net/wireless/ath/ath9k/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -53,7 +53,8 @@ obj-$(CONFIG_ATH9K_HW) += ath9k_hw.o 
obj-$(CONFIG_ATH9K_COMMON) += ath9k_common.o

ath9k_common-y:=	common.o \

			common-init.o \

			common-beacon.o

			common-beacon.o \

			common-debug.o



ath9k_htc-y +=	htc_hst.o \

		hif_usb.o \

drivers/net/wireless/ath/ath9k/common-debug.c

0 → 100644
+53 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2008-2011 Atheros Communications Inc.

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above

 * copyright notice and this permission notice appear in all copies.

 *

 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */



#include "common.h"



static ssize_t read_file_modal_eeprom(struct file *file, char __user *user_buf,

				      size_t count, loff_t *ppos)

{

	struct ath_hw *ah = file->private_data;

	u32 len = 0, size = 6000;

	char *buf;

	size_t retval;



	buf = kzalloc(size, GFP_KERNEL);

	if (buf == NULL)

		return -ENOMEM;



	len = ah->eep_ops->dump_eeprom(ah, false, buf, len, size);



	retval = simple_read_from_buffer(user_buf, count, ppos, buf, len);

	kfree(buf);



	return retval;

}



static const struct file_operations fops_modal_eeprom = {

	.read = read_file_modal_eeprom,

	.open = simple_open,

	.owner = THIS_MODULE,

	.llseek = default_llseek,

};





void ath9k_cmn_debug_modal_eeprom(struct dentry *debugfs_phy,

				  struct ath_hw *ah)

{

	debugfs_create_file("modal_eeprom", S_IRUSR, debugfs_phy, ah,

			    &fops_modal_eeprom);

}

EXPORT_SYMBOL(ath9k_cmn_debug_modal_eeprom);

drivers/net/wireless/ath/ath9k/common-debug.h

0 → 100644
+18 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2008-2011 Atheros Communications Inc.

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above

 * copyright notice and this permission notice appear in all copies.

 *

 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */



void ath9k_cmn_debug_modal_eeprom(struct dentry *debugfs_phy,

				  struct ath_hw *ah);

drivers/net/wireless/ath/ath9k/common.h

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 


#include "common-init.h"

#include "common-beacon.h"

#include "common-debug.h"



/* Common header for Atheros 802.11n base driver cores */

drivers/net/wireless/ath/ath9k/debug.c

+3 −30
Original line number Diff line number Diff line
@@ -1296,34 +1296,6 @@ static const struct file_operations fops_base_eeprom = { 
	.llseek = default_llseek,

};



static ssize_t read_file_modal_eeprom(struct file *file, char __user *user_buf,

				      size_t count, loff_t *ppos)

{

	struct ath_softc *sc = file->private_data;

	struct ath_hw *ah = sc->sc_ah;

	u32 len = 0, size = 6000;

	char *buf;

	size_t retval;



	buf = kzalloc(size, GFP_KERNEL);

	if (buf == NULL)

		return -ENOMEM;



	len = ah->eep_ops->dump_eeprom(ah, false, buf, len, size);



	retval = simple_read_from_buffer(user_buf, count, ppos, buf, len);

	kfree(buf);



	return retval;

}



static const struct file_operations fops_modal_eeprom = {

	.read = read_file_modal_eeprom,

	.open = simple_open,

	.owner = THIS_MODULE,

	.llseek = default_llseek,

};



#ifdef CONFIG_ATH9K_BTCOEX_SUPPORT

static ssize_t read_file_btcoex(struct file *file, char __user *user_buf,

				size_t count, loff_t *ppos)
@@ -1549,8 +1521,9 @@ int ath9k_init_debug(struct ath_hw *ah) 
			    &fops_dump_nfcal);

	debugfs_create_file("base_eeprom", S_IRUSR, sc->debug.debugfs_phy, sc,

			    &fops_base_eeprom);

	debugfs_create_file("modal_eeprom", S_IRUSR, sc->debug.debugfs_phy, sc,

			    &fops_modal_eeprom);



	ath9k_cmn_debug_modal_eeprom(sc->debug.debugfs_phy, sc->sc_ah);



	debugfs_create_u32("gpio_mask", S_IRUSR | S_IWUSR,

			   sc->debug.debugfs_phy, &sc->sc_ah->gpio_mask);

	debugfs_create_u32("gpio_val", S_IRUSR | S_IWUSR,