[kernel] fix mtd warnings
authorFlorian Fainelli <florian@openwrt.org>
Wed, 25 May 2011 19:16:58 +0000 (19:16 +0000)
committerFlorian Fainelli <florian@openwrt.org>
Wed, 25 May 2011 19:16:58 +0000 (19:16 +0000)
Fixes for the following warnings:

drivers/mtd/devices/block2mtd.c: In function '_open_bdev':
drivers/mtd/devices/block2mtd.c:272:3: warning: ISO C90 forbids mixed declarations and code
drivers/mtd/devices/block2mtd.c: In function 'add_device':
drivers/mtd/devices/block2mtd.c:399:13: warning: assignment discards qualifiers from pointer target type

In the case of 442-block2mtd_probe.patch, it's not until the insertion of a executable statement before the definition that causes a warning, so I've chosen to resolve the issue here by splitting the definition and the initialization into a definition and a statement (and assignment) instead.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
SVN-Revision: 27007

target/linux/generic/patches-2.6.32/066-block2mtd_probe.patch
target/linux/generic/patches-2.6.36/066-block2mtd_probe.patch
target/linux/generic/patches-2.6.37/400-rootfs_split.patch
target/linux/generic/patches-2.6.37/442-block2mtd_probe.patch
target/linux/generic/patches-2.6.38/400-rootfs_split.patch

index b2b1a34..b9130a4 100644 (file)
@@ -1,10 +1,16 @@
 --- a/drivers/mtd/devices/block2mtd.c
 +++ b/drivers/mtd/devices/block2mtd.c
-@@ -268,6 +268,7 @@ static int _open_bdev(struct block2mtd_d
+@@ -264,10 +264,12 @@ static int _open_bdev(struct block2mtd_d
+       bdev = open_bdev_exclusive(dev->devname, FMODE_READ|FMODE_WRITE, NULL);
+ #ifndef MODULE
+       if (IS_ERR(bdev)) {
++              dev_t devt;
                /* We might not have rootfs mounted at this point. Try
                   to resolve the device name by other means. */
  
 +              wait_for_device_probe();
-               dev_t devt = name_to_dev_t(dev->devname);
+-              dev_t devt = name_to_dev_t(dev->devname);
++              devt = name_to_dev_t(dev->devname);
                if (devt) {
                        bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
index 4cc7ef5..b9130a4 100644 (file)
@@ -1,10 +1,16 @@
 --- a/drivers/mtd/devices/block2mtd.c
 +++ b/drivers/mtd/devices/block2mtd.c
-@@ -269,6 +269,7 @@ static int _open_bdev(struct block2mtd_d
+@@ -264,10 +264,12 @@ static int _open_bdev(struct block2mtd_d
+       bdev = open_bdev_exclusive(dev->devname, FMODE_READ|FMODE_WRITE, NULL);
+ #ifndef MODULE
+       if (IS_ERR(bdev)) {
++              dev_t devt;
                /* We might not have rootfs mounted at this point. Try
                   to resolve the device name by other means. */
  
 +              wait_for_device_probe();
-               dev_t devt = name_to_dev_t(dev->devname);
+-              dev_t devt = name_to_dev_t(dev->devname);
++              devt = name_to_dev_t(dev->devname);
                if (devt) {
                        bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
index 00210c0..d7003a9 100644 (file)
 +      }
 +
 +      memcpy(dpart, part, sizeof(*part));
++      strcpy((char *)&dpart[1], ROOTFS_SPLIT_NAME);
 +      dpart->name = (unsigned char *)&dpart[1];
-+      strcpy(dpart->name, ROOTFS_SPLIT_NAME);
 +
 +      dpart->size = rpart->size - (split_offset - spart->offset);
 +      dpart->offset = split_offset;
  
 +struct mtd_partition;
  struct mtd_partition {
-       char *name;                     /* identifier string */
+-      char *name;                     /* identifier string */
++      const char *name;               /* identifier string */
        uint64_t size;                  /* partition size */
        uint64_t offset;                /* offset within the master MTD space */
        uint32_t mask_flags;            /* master MTD flags to mask out for this partition */
index b2b1a34..b9130a4 100644 (file)
@@ -1,10 +1,16 @@
 --- a/drivers/mtd/devices/block2mtd.c
 +++ b/drivers/mtd/devices/block2mtd.c
-@@ -268,6 +268,7 @@ static int _open_bdev(struct block2mtd_d
+@@ -264,10 +264,12 @@ static int _open_bdev(struct block2mtd_d
+       bdev = open_bdev_exclusive(dev->devname, FMODE_READ|FMODE_WRITE, NULL);
+ #ifndef MODULE
+       if (IS_ERR(bdev)) {
++              dev_t devt;
                /* We might not have rootfs mounted at this point. Try
                   to resolve the device name by other means. */
  
 +              wait_for_device_probe();
-               dev_t devt = name_to_dev_t(dev->devname);
+-              dev_t devt = name_to_dev_t(dev->devname);
++              devt = name_to_dev_t(dev->devname);
                if (devt) {
                        bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
index 5158266..cabaab4 100644 (file)
 +      }
 +
 +      memcpy(dpart, part, sizeof(*part));
++      strcpy((char *)&dpart[1], ROOTFS_SPLIT_NAME);
 +      dpart->name = (unsigned char *)&dpart[1];
-+      strcpy(dpart->name, ROOTFS_SPLIT_NAME);
 +
 +      dpart->size = rpart->size - (split_offset - spart->offset);
 +      dpart->offset = split_offset;
  
 +struct mtd_partition;
  struct mtd_partition {
-       char *name;                     /* identifier string */
+-      char *name;                     /* identifier string */
++      const char *name;               /* identifier string */
        uint64_t size;                  /* partition size */
        uint64_t offset;                /* offset within the master MTD space */
        uint32_t mask_flags;            /* master MTD flags to mask out for this partition */