s390/net: move pnet constants

There is no need to define these PNETID related constants in
the pnet.h file, since they are just used locally within pnet.c.
Just code cleanup, no functional change.

Signed-off-by: Ursula Braun <ubraun@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/s390/include/asm/pnet.h b/arch/s390/include/asm/pnet.h
index 6e278584f8f1d19a4710a7cea852599c9e1d6e24..5739276b458dfc658b87f79e8190ba0811b01b64 100644 (file)
--- a/arch/s390/include/asm/pnet.h
+++ b/arch/s390/include/asm/pnet.h
@@ -11,13 +11,5 @@
 #include <linux/device.h>
 #include <linux/types.h>
 
-#define PNETIDS_LEN            64      /* Total utility string length in bytes
-                                        * to cover up to 4 PNETIDs of 16 bytes
-                                        * for up to 4 device ports
-                                        */
-#define MAX_PNETID_LEN         16      /* Max.length of a single port PNETID */
-#define MAX_PNETID_PORTS       (PNETIDS_LEN / MAX_PNETID_LEN)
-                                       /* Max. # of ports with a PNETID */
-
 int pnet_id_by_dev_port(struct device *dev, unsigned short port, u8 *pnetid);
 #endif /* _ASM_S390_PNET_H */

diff --git a/arch/s390/net/pnet.c b/arch/s390/net/pnet.c
index e22f1b10a6c7bea046cc88502313a9d63893a95e..9ecdbdf5978148ee60fe3a08a70f01ddd732eb92 100644 (file)
--- a/arch/s390/net/pnet.c
+++ b/arch/s390/net/pnet.c
@@ -13,6 +13,14 @@
 #include <asm/ccwdev.h>
 #include <asm/pnet.h>
 
+#define PNETIDS_LEN            64      /* Total utility string length in bytes
+                                        * to cover up to 4 PNETIDs of 16 bytes
+                                        * for up to 4 device ports
+                                        */
+#define MAX_PNETID_LEN         16      /* Max.length of a single port PNETID */
+#define MAX_PNETID_PORTS       (PNETIDS_LEN / MAX_PNETID_LEN)
+                                       /* Max. # of ports with a PNETID */
+
 /*
  * Get the PNETIDs from a device.
  * s390 hardware supports the definition of a so-called Physical Network