Skip to contentSkip to conversation

net: cleanup unused macros in net directory

PATCH Applied Shan Wei 3 participants 3 messages Jan 14, 2011 – Jan 20, 2011

Subsystems (5)
Networking Network drivers 9P file system Packet sockets +1 more subsystems
lore
Share & tools
lore

Shan Wei

author
#0 lore raw

PATCH 1/1 net: cleanup unused macros in net directory

Clean up some unused macros in net/*.
1. be left for code change. e.g. PGV_FROM_VMALLOC, PGV_FROM_VMALLOC, KMEM_SAFETYZONE.
2. never be used since introduced to kernel.
e.g. P9_RDMA_MAX_SGE, UTIL_CTRL_PKT_SIZE.

Signed-off-by Shan Wei <[email protected]>
---
 net/9p/trans_rdma.c     |    1 -
 net/caif/cfcnfg.c       |    2 --
 net/caif/cfdgml.c       |    1 -
 net/caif/cfserl.c       |    1 -
 net/caif/cfutill.c      |    2 +-
 net/caif/cfveil.c       |    2 +-
 net/decnet/dn_table.c   |    1 -
 net/packet/af_packet.c  |    1 -
 net/rds/rds.h           |    1 -
 net/wanrouter/wanmain.c |    2 --
 10 files changed, 2 insertions(+), 12 deletions(-)
net/9p/trans_rdma.c +0 -1
index 17c5ba7..29a54cc 100644
@@ -59,7 +59,6 @@
 						 * safely advertise a maxsize
 						 * of 64k */
 
-#define P9_RDMA_MAX_SGE (P9_RDMA_MAXSIZE >> PAGE_SHIFT)
 /**
  * struct p9_trans_rdma - RDMA transport instance
  *
net/caif/cfcnfg.c +0 -2
index 21ede14..ed3cfda 100644
@@ -23,10 +23,8 @@
 #include <asm/atomic.h>
 
 #define MAX_PHY_LAYERS 7
-#define PHY_NAME_LEN 20
 
 #define container_obj(layr) container_of(layr, struct cfcnfg, layer)
-#define RFM_FRAGMENT_SIZE 4030
 
 /* Information about CAIF physical interfaces held by Config Module in order
  * to manage physical interfaces
net/caif/cfdgml.c +0 -1
index d3ed264..27dab26 100644
@@ -18,7 +18,6 @@
 #define DGM_CMD_BIT  0x80
 #define DGM_FLOW_OFF 0x81
 #define DGM_FLOW_ON  0x80
-#define DGM_CTRL_PKT_SIZE 1
 #define DGM_MTU 1500
 
 static int cfdgml_receive(struct cflayer *layr, struct cfpkt *pkt);
net/caif/cfserl.c +0 -1
index 9297f7d..8303fe3 100644
@@ -25,7 +25,6 @@ struct cfserl {
 	spinlock_t sync;
 	bool usestx;
 };
-#define STXLEN(layr) (layr->usestx ? 1 : 0)
 
 static int cfserl_receive(struct cflayer *layr, struct cfpkt *pkt);
 static int cfserl_transmit(struct cflayer *layr, struct cfpkt *pkt);
net/caif/cfutill.c +1 -1
index efad410..315c0d6 100644
@@ -20,7 +20,7 @@
 #define UTIL_REMOTE_SHUTDOWN 0x82
 #define UTIL_FLOW_OFF 0x81
 #define UTIL_FLOW_ON  0x80
-#define UTIL_CTRL_PKT_SIZE 1
+
 static int cfutill_receive(struct cflayer *layr, struct cfpkt *pkt);
 static int cfutill_transmit(struct cflayer *layr, struct cfpkt *pkt);
net/caif/cfveil.c +1 -1
index 3b425b1..c3b1dec 100644
@@ -17,7 +17,7 @@
 #define VEI_FLOW_OFF 0x81
 #define VEI_FLOW_ON  0x80
 #define VEI_SET_PIN  0x82
-#define VEI_CTRL_PKT_SIZE 1
+
 #define container_obj(layr) container_of(layr, struct cfsrvl, layer)
 
 static int cfvei_receive(struct cflayer *layr, struct cfpkt *pkt);
net/decnet/dn_table.c +0 -1
index f2abd37..b66600b 100644
@@ -59,7 +59,6 @@ struct dn_hash
 };
 
 #define dz_key_0(key)		((key).datum = 0)
-#define dz_prefix(key,dz)	((key).datum)
 
 #define for_nexthops(fi) { int nhsel; const struct dn_fib_nh *nh;\
 	for(nhsel = 0, nh = (fi)->fib_nh; nhsel < (fi)->fib_nhs; nh++, nhsel++)
net/packet/af_packet.c +0 -1
index 91cb1d7..4b87237 100644
@@ -164,7 +164,6 @@ struct packet_mreq_max {
 static int packet_set_ring(struct sock *sk, struct tpacket_req *req,
 		int closing, int tx_ring);
 
-#define PGV_FROM_VMALLOC 1
 struct pgv {
 	char *buffer;
 };
net/rds/rds.h +0 -1
index 9542449..da8adac 100644
@@ -50,7 +50,6 @@ rdsdebug(char *fmt, ...)
 #define RDS_FRAG_SIZE	((unsigned int)(1 << RDS_FRAG_SHIFT))
 
 #define RDS_CONG_MAP_BYTES	(65536 / 8)
-#define RDS_CONG_MAP_LONGS	(RDS_CONG_MAP_BYTES / sizeof(unsigned long))
 #define RDS_CONG_MAP_PAGES	(PAGE_ALIGN(RDS_CONG_MAP_BYTES) / PAGE_SIZE)
 #define RDS_CONG_MAP_PAGE_BITS	(PAGE_SIZE * 8)
net/wanrouter/wanmain.c +0 -2
index 74944a2..788a12c 100644
@@ -59,8 +59,6 @@
 #include <asm/uaccess.h>        /* copy_to/from_user */
 #include <linux/init.h>         /* __initfunc et al. */
 
-#define KMEM_SAFETYZONE 8
-
 #define DEV_TO_SLAVE(dev)	(*((struct net_device **)netdev_priv(dev)))
 
 /*
Signature · 1 line
1.7.0.1
maintainer Applied
#2 lore raw
In reply to Shan Wei

From: Shan Wei <[email protected]>
Date: Fri, 14 Jan 2011 16:19:52 +0800

Quoted 8 lines

Clean up some unused macros in net/*.
1. be left for code change. e.g. PGV_FROM_VMALLOC, PGV_FROM_VMALLOC, KMEM_SAFETYZONE.
2. never be used since introduced to kernel.
e.g. P9_RDMA_MAX_SGE, UTIL_CTRL_PKT_SIZE.

Signed-off-by Shan Wei <[email protected]>

Applied, thanks.