[GIT PATCH] More Driver patches for 2.6.13

[GIT PATCH] More Driver patches for 2.6.13

[Greg KH]

Here are some more small driver patches for 2.6.13.  The fix up the
comments in the crc16 code, update the aoe driver, and fix up some
firmware documentation.

Please pull from:
	rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6.git/
or if master.kernel.org hasn't synced up yet:
	master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6.git/

The full patch set will be sent to the linux-kernel mailing lists, if
anyone wants to see them.

thanks,

greg k-h

 Documentation/aoe/mkshelf.sh                          |    6 ++++--
 Documentation/firmware_class/firmware_sample_driver.c |    8 ++++----
 drivers/block/aoe/aoe.h                               |   12 ++++++------
 drivers/w1/w1_ds2433.c                                |    6 +++++-
 include/linux/crc16.h                                 |   16 +---------------
 5 files changed, 20 insertions(+), 28 deletions(-)


Christophe Lucas:
  printk : Documentation/firmware_class/firmware_sample_driver.c

Ed L Cashin:
  aoe [1/2]: support 16 AoE slot addresses per AoE shelf
  aoe [2/2]: update driver version number to twelve

Evgeniy Polyakov:
  crc16: remove w1 specific comments.

[PATCH] aoe [1/2]: support 16 AoE slot addresses per AoE shelf

[Greg KH]

[PATCH] aoe [1/2]: support 16 AoE slot addresses per AoE shelf

Change the number of supported AoE slot addresses per AoE shelf
address to 16.

Signed-off-by: Ed L. Cashin <ecashin@coraid.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
commit e39526e6e7a96904c9f1c85375d49ff437c18c44
tree b90a15c53758c7ea625c874cd4044842a6039656
parent 0a25e4d5647003a32ba5496f9d0f40ba9c1e3863
author Ed L Cashin <ecashin@coraid.com> Fri, 19 Aug 2005 16:54:43 -0400
committer Greg Kroah-Hartman <gregkh@suse.de> Fri, 09 Sep 2005 14:23:16 -0700

 Documentation/aoe/mkshelf.sh |    6 ++++--
 drivers/block/aoe/aoe.h      |   10 +++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Documentation/aoe/mkshelf.sh b/Documentation/aoe/mkshelf.sh
--- a/Documentation/aoe/mkshelf.sh
+++ b/Documentation/aoe/mkshelf.sh
@@ -8,13 +8,15 @@ fi
 n_partitions=${n_partitions:-16}
 dir=$1
 shelf=$2
+nslots=16
+maxslot=`echo $nslots 1 - p | dc`
 MAJOR=152
 
 set -e
 
-minor=`echo 10 \* $shelf \* $n_partitions | bc`
+minor=`echo $nslots \* $shelf \* $n_partitions | bc`
 endp=`echo $n_partitions - 1 | bc`
-for slot in `seq 0 9`; do
+for slot in `seq 0 $maxslot`; do
 	for part in `seq 0 $endp`; do
 		name=e$shelf.$slot
 		test "$part" != "0" && name=${name}p$part
diff --git a/drivers/block/aoe/aoe.h b/drivers/block/aoe/aoe.h
--- a/drivers/block/aoe/aoe.h
+++ b/drivers/block/aoe/aoe.h
@@ -7,12 +7,12 @@
  * default is 16, which is 15 partitions plus the whole disk
  */
 #ifndef AOE_PARTITIONS
-#define AOE_PARTITIONS 16
+#define AOE_PARTITIONS (16)
 #endif
 
-#define SYSMINOR(aoemajor, aoeminor) ((aoemajor) * 10 + (aoeminor))
-#define AOEMAJOR(sysminor) ((sysminor) / 10)
-#define AOEMINOR(sysminor) ((sysminor) % 10)
+#define SYSMINOR(aoemajor, aoeminor) ((aoemajor) * NPERSHELF + (aoeminor))
+#define AOEMAJOR(sysminor) ((sysminor) / NPERSHELF)
+#define AOEMINOR(sysminor) ((sysminor) % NPERSHELF)
 #define WHITESPACE " \t\v\f\n"
 
 enum {
@@ -83,7 +83,7 @@ enum {
 
 enum {
 	MAXATADATA = 1024,
-	NPERSHELF = 10,
+	NPERSHELF = 16,		/* number of slots per shelf address */
 	FREETAG = -1,
 	MIN_BUFS = 8,
 };

[PATCH] crc16: remove w1 specific comments.

[Greg KH]

[PATCH] crc16: remove w1 specific comments.

Remove w1 comments from crc16.h and move
specific constants into w1_ds2433.c where they are used.
Replace %d with %zd.

Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
commit 877599fdef5ea4a7dd1956e22fa9d6923add97f8
tree 344fe19205957f6f002a8bcb93022de13754f6dc
parent 8ccc457722ba226ea72fca6f9ba3b54535d4749e
author Evgeniy Polyakov <johnpol@2ka.mipt.ru> Mon, 12 Sep 2005 17:12:43 +0400
committer Greg Kroah-Hartman <gregkh@suse.de> Mon, 12 Sep 2005 12:35:17 -0700

 drivers/w1/w1_ds2433.c |    6 +++++-
 include/linux/crc16.h  |   16 +---------------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/drivers/w1/w1_ds2433.c b/drivers/w1/w1_ds2433.c
--- a/drivers/w1/w1_ds2433.c
+++ b/drivers/w1/w1_ds2433.c
@@ -15,6 +15,10 @@
 #include <linux/delay.h>
 #ifdef CONFIG_W1_F23_CRC
 #include <linux/crc16.h>
+
+#define CRC16_INIT		0
+#define CRC16_VALID		0xb001
+
 #endif
 
 #include "w1.h"
@@ -214,7 +218,7 @@ static ssize_t w1_f23_write_bin(struct k
 #ifdef CONFIG_W1_F23_CRC
 	/* can only write full blocks in cached mode */
 	if ((off & W1_PAGE_MASK) || (count & W1_PAGE_MASK)) {
-		dev_err(&sl->dev, "invalid offset/count off=%d cnt=%d\n",
+		dev_err(&sl->dev, "invalid offset/count off=%d cnt=%zd\n",
 			(int)off, count);
 		return -EINVAL;
 	}
diff --git a/include/linux/crc16.h b/include/linux/crc16.h
--- a/include/linux/crc16.h
+++ b/include/linux/crc16.h
@@ -1,22 +1,11 @@
 /*
  *	crc16.h - CRC-16 routine
  *
- * Implements the standard CRC-16, as used with 1-wire devices:
+ * Implements the standard CRC-16:
  *   Width 16
  *   Poly  0x8005 (x^16 + x^15 + x^2 + 1)
  *   Init  0
  *
- * For 1-wire devices, the CRC is stored inverted, LSB-first
- *
- * Example buffer with the CRC attached:
- *   31 32 33 34 35 36 37 38 39 C2 44
- *
- * The CRC over a buffer with the CRC attached is 0xB001.
- * So, if (crc16(0, buf, size) == 0xB001) then the buffer is valid.
- *
- * Refer to "Application Note 937: Book of iButton Standards" for details.
- * http://www.maxim-ic.com/appnotes.cfm/appnote_number/937
- *
  * Copyright (c) 2005 Ben Gardner <bgardner@wabtec.com>
  *
  * This source code is licensed under the GNU General Public License,
@@ -28,9 +17,6 @@
 
 #include <linux/types.h>
 
-#define CRC16_INIT		0
-#define CRC16_VALID		0xb001
-
 extern u16 const crc16_table[256];
 
 extern u16 crc16(u16 crc, const u8 *buffer, size_t len);

[PATCH] aoe [2/2]: update driver version number to twelve

[Greg KH]

[PATCH] aoe [2/2]: update driver version number to twelve

Update driver version number to twelve.

Signed-off-by: Ed L. Cashin <ecashin@coraid.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
commit 49a1fd60d2a8e671222515cf6055e91781278517
tree 4d27a330c7944c8d67ab192fb30cab7659bdeb86
parent e39526e6e7a96904c9f1c85375d49ff437c18c44
author Ed L Cashin <ecashin@coraid.com> Fri, 19 Aug 2005 17:05:21 -0400
committer Greg Kroah-Hartman <gregkh@suse.de> Fri, 09 Sep 2005 14:23:19 -0700

 drivers/block/aoe/aoe.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/block/aoe/aoe.h b/drivers/block/aoe/aoe.h
--- a/drivers/block/aoe/aoe.h
+++ b/drivers/block/aoe/aoe.h
@@ -1,5 +1,5 @@
 /* Copyright (c) 2004 Coraid, Inc.  See COPYING for GPL terms. */
-#define VERSION "10"
+#define VERSION "12"
 #define AOE_MAJOR 152
 #define DEVICE_NAME "aoe"
 

[PATCH] printk : Documentation/firmware_class/firmware_sample_driver.c

[Greg KH]

[PATCH] printk : Documentation/firmware_class/firmware_sample_driver.c

printk() calls should include appropriate KERN_* constant.

Signed-off-by: Christophe Lucas <clucas@rotomalug.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
commit 20dd026d7f5a6972dc78b4928a99620001fa547d
tree b2676a15c732f908bf85539d74fd36ee6cacf019
parent 49a1fd60d2a8e671222515cf6055e91781278517
author Christophe Lucas <clucas@rotomalug.org> Thu, 08 Sep 2005 08:55:53 +0200
committer Greg Kroah-Hartman <gregkh@suse.de> Fri, 09 Sep 2005 14:23:29 -0700

 .../firmware_class/firmware_sample_driver.c        |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation/firmware_class/firmware_sample_driver.c b/Documentation/firmware_class/firmware_sample_driver.c
--- a/Documentation/firmware_class/firmware_sample_driver.c
+++ b/Documentation/firmware_class/firmware_sample_driver.c
@@ -32,14 +32,14 @@ static void sample_firmware_load(char *f
 	u8 buf[size+1];
 	memcpy(buf, firmware, size);
 	buf[size] = '\0';
-	printk("firmware_sample_driver: firmware: %s\n", buf);
+	printk(KERN_INFO "firmware_sample_driver: firmware: %s\n", buf);
 }
 
 static void sample_probe_default(void)
 {
 	/* uses the default method to get the firmware */
         const struct firmware *fw_entry;
-	printk("firmware_sample_driver: a ghost device got inserted :)\n");
+	printk(KERN_INFO "firmware_sample_driver: a ghost device got inserted :)\n");
 
         if(request_firmware(&fw_entry, "sample_driver_fw", &ghost_device)!=0)
 	{
@@ -61,7 +61,7 @@ static void sample_probe_specific(void)
 
 	/* NOTE: This currently doesn't work */
 
-	printk("firmware_sample_driver: a ghost device got inserted :)\n");
+	printk(KERN_INFO "firmware_sample_driver: a ghost device got inserted :)\n");
 
         if(request_firmware(NULL, "sample_driver_fw", &ghost_device)!=0)
 	{
@@ -83,7 +83,7 @@ static void sample_probe_async_cont(cons
 		return;
 	}
 
-	printk("firmware_sample_driver: device pointer \"%s\"\n",
+	printk(KERN_INFO "firmware_sample_driver: device pointer \"%s\"\n",
 	       (char *)context);
 	sample_firmware_load(fw->data, fw->size);
 }