KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix mtd warnings

Browse source 
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
This commit is contained in:
Florian Fainelli 2011-05-25 19:16:58 +00:00
parent f5f989e3fb
commit fad3f46f0d
5 changed files with 30 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
target/linux/generic/patches-2.6.32/066-block2mtd_probe.patch
View file

@ -1,10 +1,16 @@
--- a/drivers/mtd/devices/block2mtd.c --- a/drivers/mtd/devices/block2mtd.c
+++ b/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 /* We might not have rootfs mounted at this point. Try
to resolve the device name by other means. */ to resolve the device name by other means. */
+ wait_for_device_probe(); + 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) { if (devt) {
bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ); bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);

10
target/linux/generic/patches-2.6.36/066-block2mtd_probe.patch
View file

@ -1,10 +1,16 @@
--- a/drivers/mtd/devices/block2mtd.c --- a/drivers/mtd/devices/block2mtd.c
+++ b/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 /* We might not have rootfs mounted at this point. Try
to resolve the device name by other means. */ to resolve the device name by other means. */
+ wait_for_device_probe(); + 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) { if (devt) {
bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ); bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);

5
target/linux/generic/patches-2.6.37/400-rootfs_split.patch
View file

@ -111,8 +111,8 @@
+ } + }
+ +
+ memcpy(dpart, part, sizeof(*part)); + memcpy(dpart, part, sizeof(*part));
+ strcpy((char *)&dpart[1], ROOTFS_SPLIT_NAME);
+ dpart->name = (unsigned char *)&dpart[1]; + dpart->name = (unsigned char *)&dpart[1];
+ strcpy(dpart->name, ROOTFS_SPLIT_NAME);
+ +
+ dpart->size = rpart->size - (split_offset - spart->offset); + dpart->size = rpart->size - (split_offset - spart->offset);
+ dpart->offset = split_offset; + dpart->offset = split_offset;
@ -301,7 +301,8 @@
+struct mtd_partition; +struct mtd_partition;
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 size; /* partition size */
uint64_t offset; /* offset within the master MTD space */ uint64_t offset; /* offset within the master MTD space */
uint32_t mask_flags; /* master MTD flags to mask out for this partition */ uint32_t mask_flags; /* master MTD flags to mask out for this partition */

10
target/linux/generic/patches-2.6.37/442-block2mtd_probe.patch
View file

@ -1,10 +1,16 @@
--- a/drivers/mtd/devices/block2mtd.c --- a/drivers/mtd/devices/block2mtd.c
+++ b/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 /* We might not have rootfs mounted at this point. Try
to resolve the device name by other means. */ to resolve the device name by other means. */
+ wait_for_device_probe(); + 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) { if (devt) {
bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ); bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);

5
target/linux/generic/patches-2.6.38/400-rootfs_split.patch
View file

@ -111,8 +111,8 @@
+ } + }
+ +
+ memcpy(dpart, part, sizeof(*part)); + memcpy(dpart, part, sizeof(*part));
+ strcpy((char *)&dpart[1], ROOTFS_SPLIT_NAME);
+ dpart->name = (unsigned char *)&dpart[1]; + dpart->name = (unsigned char *)&dpart[1];
+ strcpy(dpart->name, ROOTFS_SPLIT_NAME);
+ +
+ dpart->size = rpart->size - (split_offset - spart->offset); + dpart->size = rpart->size - (split_offset - spart->offset);
+ dpart->offset = split_offset; + dpart->offset = split_offset;
@ -302,7 +302,8 @@
+struct mtd_partition; +struct mtd_partition;
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 size; /* partition size */
uint64_t offset; /* offset within the master MTD space */ uint64_t offset; /* offset within the master MTD space */
uint32_t mask_flags; /* master MTD flags to mask out for this partition */ uint32_t mask_flags; /* master MTD flags to mask out for this partition */