Skip to contentSkip to conversation

drivers/block/aoe/aoechr.c cleanups

PATCH Applied Adrian Bunk 3 participants 3 messages Jan 29, 2005 – Feb 1, 2005

Subsystems (2)
Block layer ATA over Ethernet (aoe) driver
lore
Share & tools
lore

Adrian Bunk

author
#0 lore raw

PATCH 1/1 drivers/block/aoe/aoechr.c cleanups

This patch contains the following cleanups:
- make the needlessly global struct aoe_fops static
- #if 0 the unused global function aoechr_hdump

Signed-off-by Adrian Bunk <[email protected]>

---

 drivers/block/aoe/aoechr.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)
drivers/block/aoe/aoechr.c renamed from drivers/block/aoe/aoechr.c.old +5 -1
@@ -99,6 +99,8 @@
 		up(&emsgs_sema);
 }
 
+#if 0
+
 #define PERLINE 16
 void
 aoechr_hdump(char *buf, int n)

@@ -134,6 +136,8 @@
 	kfree(fbuf);
 }
 
+#endif  /*  0  */
+
 static ssize_t
 aoechr_write(struct file *filp, const char __user *buf, size_t cnt, loff_t *offp)
 {

@@ -233,7 +237,7 @@
 	}
 }
 
-struct file_operations aoe_fops = {
+static struct file_operations aoe_fops = {
 	.write = aoechr_write,
 	.read = aoechr_read,
 	.open = aoechr_open,
#1 lore raw
Quoted 3 lines · Adrian Bunk

This patch contains the following cleanups:
- make the needlessly global struct aoe_fops static
- #if 0 the unused global function aoechr_hdump

Thanks for the patch. The original patch leaves the prototype for aoechr_hdump in aoe.h, but since this function is just for debugging, it seems better to just take both prototype and definition out.

remove aoechr_hdump
make aoe_fops static

Signed-off-by Ed L. Cashin <[email protected]>
drivers/block/aoe/aoe.h +0 -1
diff -urNp aa/drivers/block/aoe/aoe.h bb/drivers/block/aoe/aoe.h
@@ -143,7 +143,6 @@ void aoedisk_rm_sysfs(struct aoedev *d);
 int aoechr_init(void);
 void aoechr_exit(void);
 void aoechr_error(char *);
-void aoechr_hdump(char *, int len);
 
 void aoecmd_work(struct aoedev *d);
 void aoecmd_cfg(ushort, unsigned char);
drivers/block/aoe/aoechr.c +1 -36
diff -urNp aa/drivers/block/aoe/aoechr.c bb/drivers/block/aoe/aoechr.c
@@ -99,41 +99,6 @@ bail:		spin_unlock_irqrestore(&emsgs_loc
 		up(&emsgs_sema);
 }
 
-#define PERLINE 16
-void
-aoechr_hdump(char *buf, int n)
-{
-	int bufsiz;
-	char *fbuf;
-	int linelen;
-	char *p, *e, *fp;
-
-	bufsiz = n * 3;			/* 2 hex digits and a space */
-	bufsiz += n / PERLINE + 1;	/* the newline characters */
-	bufsiz += 1;			/* the final '\0' */
-
-	fbuf = kmalloc(bufsiz, GFP_ATOMIC);
-	if (!fbuf) {
-		printk(KERN_INFO
-		       "%s: cannot allocate memory\n",
-		       __FUNCTION__);
-		return;
-	}
-	
-	for (p = buf; n <= 0;) {
-		linelen = n > PERLINE ? PERLINE : n;
-		n -= linelen;
-
-		fp = fbuf;
-		for (e=p+linelen; p<e; p++)
-			fp += sprintf(fp, "%2.2X ", *p & 255);
-		sprintf(fp, "\n");
-		aoechr_error(fbuf);
-	}
-
-	kfree(fbuf);
-}
-
 static ssize_t
 aoechr_write(struct file *filp, const char __user *buf, size_t cnt, loff_t *offp)
 {

@@ -233,7 +198,7 @@ loop:
 	}
 }
 
-struct file_operations aoe_fops = {
+static struct file_operations aoe_fops = {
 	.write = aoechr_write,
 	.read = aoechr_read,
 	.open = aoechr_open,
Signature · 2 lines
-- 
  Ed L Cashin <[email protected]>
Applied
#2 lore raw
Quoted 11 lines · Ed L Cashin
Quoted 3 lines · Adrian Bunk

This patch contains the following cleanups:
- make the needlessly global struct aoe_fops static
- #if 0 the unused global function aoechr_hdump

Thanks for the patch. The original patch leaves the prototype for aoechr_hdump in aoe.h, but since this function is just for debugging, it seems better to just take both prototype and definition out.

Quoted 4 lines

remove aoechr_hdump
make aoe_fops static

Signed-off-by Ed L. Cashin <[email protected]>

Applied, thanks.

greg k-h