1 files changed, 0 insertions, 88 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.h b/drivers/net/wireless/rt2x00/rt2x00pci.h
index e2c99f2b9a14..60d90b20f8b9 100644
--- a/drivers/net/wireless/rt2x00/rt2x00pci.h
+++ b/drivers/net/wireless/rt2x00/rt2x00pci.h
@@ -36,94 +36,6 @@
 #define PCI_DEVICE_DATA(__ops)  .driver_data = (kernel_ulong_t)(__ops)
 /*
- * Register access.
- */
-static inline void rt2x00pci_register_read(struct rt2x00_dev *rt2x00dev,
-                                           const unsigned int offset,
-                                           u32 *value)
-{
-        *value = readl(rt2x00dev->csr.base + offset);
-}
-static inline void rt2x00pci_register_multiread(struct rt2x00_dev *rt2x00dev,
-                                                const unsigned int offset,
-                                                void *value, const u32 length)
-{
-        memcpy_fromio(value, rt2x00dev->csr.base + offset, length);
-}
-static inline void rt2x00pci_register_write(struct rt2x00_dev *rt2x00dev,
-                                            const unsigned int offset,
-                                            u32 value)
-{
-        writel(value, rt2x00dev->csr.base + offset);
-}
-static inline void rt2x00pci_register_multiwrite(struct rt2x00_dev *rt2x00dev,
-                                                 const unsigned int offset,
-                                                 const void *value,
-                                                 const u32 length)
-{
-        __iowrite32_copy(rt2x00dev->csr.base + offset, value, length >> 2);
-}
-/**
- * rt2x00pci_regbusy_read - Read from register with busy check
- * @rt2x00dev: Device pointer, see &struct rt2x00_dev.
- * @offset: Register offset
- * @field: Field to check if register is busy
- * @reg: Pointer to where register contents should be stored
- *
- * This function will read the given register, and checks if the
- * register is busy. If it is, it will sleep for a couple of
- * microseconds before reading the register again. If the register
- * is not read after a certain timeout, this function will return
- * FALSE.
- */
-int rt2x00pci_regbusy_read(struct rt2x00_dev *rt2x00dev,
-                           const unsigned int offset,
-                           const struct rt2x00_field32 field,
-                           u32 *reg);
-/**
- * struct queue_entry_priv_pci: Per entry PCI specific information
- *
- * @desc: Pointer to device descriptor
- * @desc_dma: DMA pointer to &desc.
- * @data: Pointer to device's entry memory.
- * @data_dma: DMA pointer to &data.
- */
-struct queue_entry_priv_pci {
-        __le32 *desc;
-        dma_addr_t desc_dma;
-};
-/**
- * rt2x00pci_rxdone - Handle RX done events
- * @rt2x00dev: Device pointer, see &struct rt2x00_dev.
- *
- * Returns true if there are still rx frames pending and false if all
- * pending rx frames were processed.
- */
-bool rt2x00pci_rxdone(struct rt2x00_dev *rt2x00dev);
-/**
- * rt2x00pci_flush_queue - Flush data queue
- * @queue: Data queue to stop
- * @drop: True to drop all pending frames.
- *
- * This will wait for a maximum of 100ms, waiting for the queues
- * to become empty.
- */
-void rt2x00pci_flush_queue(struct data_queue *queue, bool drop);
-/*
- * Device initialization handlers.
- */
-int rt2x00pci_initialize(struct rt2x00_dev *rt2x00dev);
-void rt2x00pci_uninitialize(struct rt2x00_dev *rt2x00dev);
-/*
 * PCI driver handlers.
 */
 int rt2x00pci_probe(struct pci_dev *pci_dev, const struct rt2x00_ops *ops);

diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.h b/drivers/net/wireless/rt2x00/rt2x00pci.h index e2c99f2b9a14..60d90b20f8b9 100644 --- a/drivers/net/wireless/rt2x00/rt2x00pci.h +++ b/drivers/net/wireless/rt2x00/rt2x00pci.h
@@ -36,94 +36,6 @@
36	#define PCI_DEVICE_DATA(__ops) .driver_data = (kernel_ulong_t)(__ops)	36	#define PCI_DEVICE_DATA(__ops) .driver_data = (kernel_ulong_t)(__ops)
37		37
38	/*	38	/*
39	* Register access.
40	*/
41	static inline void rt2x00pci_register_read(struct rt2x00_dev *rt2x00dev,
42	const unsigned int offset,
43	u32 *value)
44	{
45	*value = readl(rt2x00dev->csr.base + offset);
46	}
47
48	static inline void rt2x00pci_register_multiread(struct rt2x00_dev *rt2x00dev,
49	const unsigned int offset,
50	void *value, const u32 length)
51	{
52	memcpy_fromio(value, rt2x00dev->csr.base + offset, length);
53	}
54
55	static inline void rt2x00pci_register_write(struct rt2x00_dev *rt2x00dev,
56	const unsigned int offset,
57	u32 value)
58	{
59	writel(value, rt2x00dev->csr.base + offset);
60	}
61
62	static inline void rt2x00pci_register_multiwrite(struct rt2x00_dev *rt2x00dev,
63	const unsigned int offset,
64	const void *value,
65	const u32 length)
66	{
67	__iowrite32_copy(rt2x00dev->csr.base + offset, value, length >> 2);
68	}
69
70	/**
71	* rt2x00pci_regbusy_read - Read from register with busy check
72	* @rt2x00dev: Device pointer, see &struct rt2x00_dev.
73	* @offset: Register offset
74	* @field: Field to check if register is busy
75	* @reg: Pointer to where register contents should be stored
76	*
77	* This function will read the given register, and checks if the
78	* register is busy. If it is, it will sleep for a couple of
79	* microseconds before reading the register again. If the register
80	* is not read after a certain timeout, this function will return
81	* FALSE.
82	*/
83	int rt2x00pci_regbusy_read(struct rt2x00_dev *rt2x00dev,
84	const unsigned int offset,
85	const struct rt2x00_field32 field,
86	u32 *reg);
87
88	/**
89	* struct queue_entry_priv_pci: Per entry PCI specific information
90	*
91	* @desc: Pointer to device descriptor
92	* @desc_dma: DMA pointer to &desc.
93	* @data: Pointer to device's entry memory.
94	* @data_dma: DMA pointer to &data.
95	*/
96	struct queue_entry_priv_pci {
97	__le32 *desc;
98	dma_addr_t desc_dma;
99	};
100
101	/**
102	* rt2x00pci_rxdone - Handle RX done events
103	* @rt2x00dev: Device pointer, see &struct rt2x00_dev.
104	*
105	* Returns true if there are still rx frames pending and false if all
106	* pending rx frames were processed.
107	*/
108	bool rt2x00pci_rxdone(struct rt2x00_dev *rt2x00dev);
109
110	/**
111	* rt2x00pci_flush_queue - Flush data queue
112	* @queue: Data queue to stop
113	* @drop: True to drop all pending frames.
114	*
115	* This will wait for a maximum of 100ms, waiting for the queues
116	* to become empty.
117	*/
118	void rt2x00pci_flush_queue(struct data_queue *queue, bool drop);
119
120	/*
121	* Device initialization handlers.
122	*/
123	int rt2x00pci_initialize(struct rt2x00_dev *rt2x00dev);
124	void rt2x00pci_uninitialize(struct rt2x00_dev *rt2x00dev);
125
126	/*
127	* PCI driver handlers.	39	* PCI driver handlers.
128	*/	40	*/
129	int rt2x00pci_probe(struct pci_dev pci_dev, const struct rt2x00_ops ops);	41	int rt2x00pci_probe(struct pci_dev pci_dev, const struct rt2x00_ops ops);