On 5/16/11 2:34 AM, Felix Fietkau wrote:
> On 2011-05-16 6:45 AM, Philip Prindeville wrote:
>> 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
>>
>> Can someone get these upstream.
>>
>> Signed-off-by: Philip Prindeville<phil...@redfish-solutions.com>
> If I remember correctly, this is not an upstream issue, but a problem in
> one of the patches. Please fold your fix into that patch (for 2.6.38 as
> well if it has the issue as well), then resubmit.
>
> - Felix
Here it is as patched patches for 2.6.37.6.
Index: target/linux/generic/patches-2.6.37/410-mtd_info_move_forward_decl.patch
===================================================================
--- target/linux/generic/patches-2.6.37/410-mtd_info_move_forward_decl.patch
(revision 26907)
+++ target/linux/generic/patches-2.6.37/410-mtd_info_move_forward_decl.patch
(working copy)
@@ -1,6 +1,6 @@
--- a/include/linux/mtd/partitions.h
+++ b/include/linux/mtd/partitions.h
-@@ -33,6 +33,7 @@
+@@ -33,10 +33,11 @@
* Note: writeable partitions require their size and offset be
* erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
*/
@@ -8,6 +8,11 @@
struct mtd_partition;
struct mtd_partition {
+- 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 */
@@ -49,7 +50,6 @@ struct mtd_partition {
#define MTDPART_SIZ_FULL (0)
@@ -16,3 +21,14 @@
int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int);
int del_mtd_partitions(struct mtd_info *);
+--- a/drivers/mtd/mtdpart.c 2011-05-16 11:47:03.000000000 -0600
++++ b/drivers/mtd/mtdpart.c 2011-05-16 11:52:55.000000000 -0600
+@@ -764,7 +764,7 @@ static int split_rootfs_data(struct mtd_
+
+ memcpy(dpart, part, sizeof(*part));
+ dpart->name = (unsigned char *)&dpart[1];
+- strcpy(dpart->name, ROOTFS_SPLIT_NAME);
++ strcpy((char *)&dpart[1], ROOTFS_SPLIT_NAME);
+
+ dpart->size = rpart->size - (split_offset - spart->offset);
+ dpart->offset = split_offset;
Index: target/linux/generic/patches-2.6.37/442-block2mtd_probe.patch
===================================================================
--- target/linux/generic/patches-2.6.37/442-block2mtd_probe.patch
(revision 26907)
+++ target/linux/generic/patches-2.6.37/442-block2mtd_probe.patch
(working copy)
@@ -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);
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
