From ebb8d3a74b3c0576f874dea430385131eac83522 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 3 Feb 2016 15:57:25 +0100
Subject: [PATCH] mt76x2: move mt76x2_write_reg_pairs to mt76x2_init.c

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
---
 mt76x2.h      |  8 --------
 mt76x2_core.c | 10 ----------
 mt76x2_init.c | 20 ++++++++++++++++++--
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/mt76x2.h b/mt76x2.h
index f77d8449..1119c7f8 100644
--- a/mt76x2.h
+++ b/mt76x2.h
@@ -150,14 +150,6 @@ struct mt76x2_sta {
 	int n_frames;
 };
 
-struct mt76x2_reg_pair {
-	u32 reg;
-	u32 value;
-};
-
-void mt76_write_reg_pairs(struct mt76x2_dev *dev,
-			  const struct mt76x2_reg_pair *data, int len);
-
 static inline bool is_mt7612(struct mt76x2_dev *dev)
 {
 	return (dev->rev >> 16) == 0x7612;
diff --git a/mt76x2_core.c b/mt76x2_core.c
index 7c0bf2d5..d69dd18c 100644
--- a/mt76x2_core.c
+++ b/mt76x2_core.c
@@ -15,16 +15,6 @@
 #include "mt76x2.h"
 #include "mt76x2_trace.h"
 
-void mt76_write_reg_pairs(struct mt76x2_dev *dev,
-			  const struct mt76x2_reg_pair *data, int len)
-{
-	while (len > 0) {
-		mt76_wr(dev, data->reg, data->value);
-		len--;
-		data++;
-	}
-}
-
 void mt76x2_set_irq_mask(struct mt76x2_dev *dev, u32 clear, u32 set)
 {
 	unsigned long flags;
diff --git a/mt76x2_init.c b/mt76x2_init.c
index 00e785a0..6deb6242 100644
--- a/mt76x2_init.c
+++ b/mt76x2_init.c
@@ -16,6 +16,11 @@
 #include "mt76x2_eeprom.h"
 #include "mt76x2_mcu.h"
 
+struct mt76x2_reg_pair {
+	u32 reg;
+	u32 value;
+};
+
 static bool
 mt76x2_wait_for_mac(struct mt76x2_dev *dev)
 {
@@ -62,6 +67,17 @@ mt76x2_mac_pbf_init(struct mt76x2_dev *dev)
 	mt76_wr(dev, MT_PBF_RX_MAX_PCNT, 0xfebf);
 }
 
+static void
+mt76x2_write_reg_pairs(struct mt76x2_dev *dev,
+		       const struct mt76x2_reg_pair *data, int len)
+{
+	while (len > 0) {
+		mt76_wr(dev, data->reg, data->value);
+		len--;
+		data++;
+	}
+}
+
 static void
 mt76_write_mac_initvals(struct mt76x2_dev *dev)
 {
@@ -148,8 +164,8 @@ mt76_write_mac_initvals(struct mt76x2_dev *dev)
 		{ MT_GF40_PROT_CFG,		DEFAULT_PROT_CFG_40 },
 	};
 
-	mt76_write_reg_pairs(dev, vals, ARRAY_SIZE(vals));
-	mt76_write_reg_pairs(dev, prot_vals, ARRAY_SIZE(prot_vals));
+	mt76x2_write_reg_pairs(dev, vals, ARRAY_SIZE(vals));
+	mt76x2_write_reg_pairs(dev, prot_vals, ARRAY_SIZE(prot_vals));
 }
 
 static void