tools: edimax_fw_header: fix suspicious memset usage

[openwrt/svn-archive/archive.git] / target / linux / adm5120 / files / drivers / mtd / trxsplit.c

diff --git a/target/linux/adm5120/files/drivers/mtd/trxsplit.c b/target/linux/adm5120/files/drivers/mtd/trxsplit.c
index 19d1e9da97978c623ba658fb8c370cab9e93175b..76cbdc749496745885d52a3c4909b9520f917eda 100644 (file)
--- a/target/linux/adm5120/files/drivers/mtd/trxsplit.c
+++ b/target/linux/adm5120/files/drivers/mtd/trxsplit.c
@@ -1,23 +1,10 @@
 /*
- *  $Id$
+ *  Copyright (C) Gabor Juhos <juhosg@openwrt.org>
  *
- *  Copyright (C) 2007 OpenWrt.org
- *  Copyright (C) Gabor Juhos <juhosg at openwrt.org>
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
  *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation; either version 2
- *  of the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the
- *  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA  02110-1301, USA.
  */
 
 #include <linux/module.h>
@@ -41,7 +28,7 @@
 #define TRX_NO_HEADER  0x1     /* do not write TRX header */
 #define TRX_GZ_FILES   0x2     /* contains individual gzip files */
 #define TRX_MAX_OFFSET 3
-#define TRX_MIN_KERNEL_SIZE    256*1024
+#define TRX_MIN_KERNEL_SIZE    (256 * 1024)
 
 struct trx_header {
        u32 magic;      /* "HDR0" */
@@ -51,7 +38,7 @@ struct trx_header {
        u32 offsets[TRX_MAX_OFFSET]; /* Offsets of partitions */
 };
 
-#define BLOCK_LEN_MIN          0x10000
+#define TRX_ALIGN      0x1000
 
 static int trx_nr_parts;
 static unsigned long trx_offset;
@@ -66,8 +53,7 @@ static int trxsplit_checktrx(struct mtd_info *mtd, unsigned long offset)
        size_t retlen;
        int err;
 
-       err = mtd->read(mtd, offset, sizeof(trx_hdr), &retlen,
-                       (void *)&trx_hdr);
+       err = mtd_read(mtd, offset, sizeof(trx_hdr), &retlen, (void *)&trx_hdr);
        if (err) {
                printk(KERN_ALERT PFX "unable to read from '%s'\n", mtd->name);
                goto err_out;
@@ -104,17 +90,12 @@ err_out:
 static void trxsplit_findtrx(struct mtd_info *mtd)
 {
        unsigned long offset;
-       unsigned long blocklen;
        int err;
 
-       blocklen = mtd->erasesize;
-       if (blocklen < BLOCK_LEN_MIN)
-               blocklen = BLOCK_LEN_MIN;
-
        printk(KERN_INFO PFX "searching TRX header in '%s'\n", mtd->name);
 
        err = 0;
-       for (offset = 0; offset < mtd->size; offset += blocklen) {
+       for (offset = 0; offset < mtd->size; offset += TRX_ALIGN) {
                err = trxsplit_checktrx(mtd, offset);
                if (err == 0)
                        break;
@@ -162,7 +143,7 @@ static void trxsplit_create_partitions(struct mtd_info *mtd)
        part = &trx_parts[i];
        part->name = "rootfs";
 
-       err = add_mtd_partitions(mtd, trx_parts, trx_nr_parts);
+       err = mtd_device_register(mtd, trx_parts, trx_nr_parts);
        if (err) {
                printk(KERN_ALERT PFX "adding TRX partitions failed\n");
                return;
@@ -177,7 +158,7 @@ static int trxsplit_refresh_partitions(struct mtd_info *mtd)
                mtd->name, MTD_BLOCK_MAJOR, mtd->index);
 
        /* remove old partitions */
-       del_mtd_partitions(mtd);
+       mtd_device_unregister(mtd);
 
        trxsplit_findtrx(mtd);
        if (!trx_mtd)
@@ -192,6 +173,12 @@ err:
 
 static void __init trxsplit_add_mtd(struct mtd_info *mtd)
 {
+       if (mtd->type != MTD_NORFLASH) {
+               printk(KERN_INFO PFX "'%s' is not a NOR flash, skipped\n",
+                               mtd->name);
+               return;
+       }
+
        if (!trx_mtd)
                trxsplit_findtrx(mtd);
 }