aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorge Boncompte [DTI2] <jorge@dti2.net>2008-06-17 19:18:49 -0400
committerDavid S. Miller <davem@davemloft.net>2008-06-17 19:18:49 -0400
commit2be63b878f2a1e6d939b05f4f5cb733cb39bcd22 (patch)
tree5d41eb43ca2b8742206a9f493c35bbc5d7edf97f
parentf586287e0fed366d80822666f70487472ab8793a (diff)
atm: [iphase] move struct suni_priv to suni.h
Signed-off-by: Jorge Boncompte [DTI2] <jorge@dti2.net> Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/atm/iphase.c7
-rw-r--r--drivers/atm/suni.c9
-rw-r--r--drivers/atm/suni.h9
3 files changed, 9 insertions, 16 deletions
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
index 139fce6968a6..14e4638759a6 100644
--- a/drivers/atm/iphase.c
+++ b/drivers/atm/iphase.c
@@ -65,12 +65,7 @@
65#include "iphase.h" 65#include "iphase.h"
66#include "suni.h" 66#include "suni.h"
67#define swap(x) (((x & 0xff) << 8) | ((x & 0xff00) >> 8)) 67#define swap(x) (((x & 0xff) << 8) | ((x & 0xff00) >> 8))
68struct suni_priv { 68
69 struct k_sonet_stats sonet_stats; /* link diagnostics */
70 unsigned char loop_mode; /* loopback mode */
71 struct atm_dev *dev; /* device back-pointer */
72 struct suni_priv *next; /* next SUNI */
73};
74#define PRIV(dev) ((struct suni_priv *) dev->phy_data) 69#define PRIV(dev) ((struct suni_priv *) dev->phy_data)
75 70
76static unsigned char ia_phy_get(struct atm_dev *dev, unsigned long addr); 71static unsigned char ia_phy_get(struct atm_dev *dev, unsigned long addr);
diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
index b1d063cc4fbe..6097f6877a44 100644
--- a/drivers/atm/suni.c
+++ b/drivers/atm/suni.c
@@ -29,15 +29,6 @@
29#define DPRINTK(format,args...) 29#define DPRINTK(format,args...)
30#endif 30#endif
31 31
32
33struct suni_priv {
34 struct k_sonet_stats sonet_stats; /* link diagnostics */
35 int loop_mode; /* loopback mode */
36 struct atm_dev *dev; /* device back-pointer */
37 struct suni_priv *next; /* next SUNI */
38};
39
40
41#define PRIV(dev) ((struct suni_priv *) dev->phy_data) 32#define PRIV(dev) ((struct suni_priv *) dev->phy_data)
42 33
43#define PUT(val,reg) dev->ops->phy_put(dev,val,SUNI_##reg) 34#define PUT(val,reg) dev->ops->phy_put(dev,val,SUNI_##reg)
diff --git a/drivers/atm/suni.h b/drivers/atm/suni.h
index d14c835abc97..efa79bfae75b 100644
--- a/drivers/atm/suni.h
+++ b/drivers/atm/suni.h
@@ -8,7 +8,7 @@
8 8
9#include <linux/atmdev.h> 9#include <linux/atmdev.h>
10#include <linux/atmioc.h> 10#include <linux/atmioc.h>
11 11#include <linux/sonet.h>
12 12
13/* SUNI registers */ 13/* SUNI registers */
14 14
@@ -205,6 +205,13 @@
205 205
206 206
207#ifdef __KERNEL__ 207#ifdef __KERNEL__
208struct suni_priv {
209 struct k_sonet_stats sonet_stats; /* link diagnostics */
210 int loop_mode; /* loopback mode */
211 struct atm_dev *dev; /* device back-pointer */
212 struct suni_priv *next; /* next SUNI */
213};
214
208int suni_init(struct atm_dev *dev); 215int suni_init(struct atm_dev *dev);
209#endif 216#endif
210 217