From: Jens Axboe <jens.axboe@oracle.com>
Date: Tue, 30 Oct 2007 09:34:33 +0000 (+0100)
Subject: SG: Make sg_init_one() use general table init functions
X-Git-Tag: v2.6.24-rc2~44^2~2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=013fb33972061ac65cdf3e1771267985e59deca1;p=linux-2.6-omap-h63xx.git

SG: Make sg_init_one() use general table init functions

Don't open code sg_init_one(), make it reuse sg_init_table().

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---

diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h
index 32326c293d7..d5e1876daf3 100644
--- a/include/linux/scatterlist.h
+++ b/include/linux/scatterlist.h
@@ -205,28 +205,6 @@ static inline void __sg_mark_end(struct scatterlist *sg)
 	sg->page_link |= 0x02;
 }
 
-/**
- * sg_init_one - Initialize a single entry sg list
- * @sg:		 SG entry
- * @buf:	 Virtual address for IO
- * @buflen:	 IO length
- *
- * Notes:
- *   This should not be used on a single entry that is part of a larger
- *   table. Use sg_init_table() for that.
- *
- **/
-static inline void sg_init_one(struct scatterlist *sg, const void *buf,
-			       unsigned int buflen)
-{
-	memset(sg, 0, sizeof(*sg));
-#ifdef CONFIG_DEBUG_SG
-	sg->sg_magic = SG_MAGIC;
-#endif
-	sg_mark_end(sg, 1);
-	sg_set_buf(sg, buf, buflen);
-}
-
 /**
  * sg_init_table - Initialize SG table
  * @sgl:	   The SG table
@@ -250,6 +228,24 @@ static inline void sg_init_table(struct scatterlist *sgl, unsigned int nents)
 #endif
 }
 
+/**
+ * sg_init_one - Initialize a single entry sg list
+ * @sg:		 SG entry
+ * @buf:	 Virtual address for IO
+ * @buflen:	 IO length
+ *
+ * Notes:
+ *   This should not be used on a single entry that is part of a larger
+ *   table. Use sg_init_table() for that.
+ *
+ **/
+static inline void sg_init_one(struct scatterlist *sg, const void *buf,
+			       unsigned int buflen)
+{
+	sg_init_table(sg, 1);
+	sg_set_buf(sg, buf, buflen);
+}
+
 /**
  * sg_phys - Return physical address of an sg entry
  * @sg:	     SG entry