ChangeSet 1.2040, 2005/03/09 10:22:12-08:00, [EMAIL PROTECTED]

[PATCH] aoe: drivers/block/aoe/aoechr.c cleanups

Adrian Bunk <[EMAIL PROTECTED]> writes:

> 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: Adrian Bunk <[EMAIL PROTECTED]>
Signed-off-by: Ed L. Cashin <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>


 drivers/block/aoe/aoe.h    |    1 -
 drivers/block/aoe/aoechr.c |   37 +------------------------------------
 2 files changed, 1 insertion(+), 37 deletions(-)


diff -Nru a/drivers/block/aoe/aoe.h b/drivers/block/aoe/aoe.h
--- a/drivers/block/aoe/aoe.h   2005-03-09 16:15:39 -08:00
+++ b/drivers/block/aoe/aoe.h   2005-03-09 16:15:39 -08:00
@@ -143,7 +143,6 @@
 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);
diff -Nru a/drivers/block/aoe/aoechr.c b/drivers/block/aoe/aoechr.c
--- a/drivers/block/aoe/aoechr.c        2005-03-09 16:15:39 -08:00
+++ b/drivers/block/aoe/aoechr.c        2005-03-09 16:15:39 -08:00
@@ -99,41 +99,6 @@
                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 @@
        }
 }
 
-struct file_operations aoe_fops = {
+static struct file_operations aoe_fops = {
        .write = aoechr_write,
        .read = aoechr_read,
        .open = aoechr_open,

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to