diff options
Diffstat (limited to 'drivers/mtd/bcm47xxpart.c')
| -rw-r--r-- | drivers/mtd/bcm47xxpart.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/drivers/mtd/bcm47xxpart.c b/drivers/mtd/bcm47xxpart.c index 7a6384b..9279a91 100644 --- a/drivers/mtd/bcm47xxpart.c +++ b/drivers/mtd/bcm47xxpart.c @@ -27,13 +27,11 @@ /* Magics */ #define BOARD_DATA_MAGIC 0x5246504D /* MPFR */ -#define FACTORY_MAGIC 0x59544346 /* FCTY */ #define POT_MAGIC1 0x54544f50 /* POTT */ #define POT_MAGIC2 0x504f /* OP */ #define ML_MAGIC1 0x39685a42 #define ML_MAGIC2 0x26594131 #define TRX_MAGIC 0x30524448 -#define SQSH_MAGIC 0x71736873 /* shsq */ struct trx_header { uint32_t magic; @@ -73,14 +71,7 @@ static int bcm47xxpart_parse(struct mtd_info *master, /* Alloc */ parts = kzalloc(sizeof(struct mtd_partition) * BCM47XXPART_MAX_PARTS, GFP_KERNEL); - if (!parts) - return -ENOMEM; - buf = kzalloc(BCM47XXPART_BYTES_TO_READ, GFP_KERNEL); - if (!buf) { - kfree(parts); - return -ENOMEM; - } /* Parse block by block looking for magics */ for (offset = 0; offset <= master->size - blocksize; @@ -119,13 +110,6 @@ static int bcm47xxpart_parse(struct mtd_info *master, continue; } - /* Found on Huawei E970 */ - if (buf[0x000 / 4] == FACTORY_MAGIC) { - bcm47xxpart_add_part(&parts[curr_part++], "factory", - offset, MTD_WRITEABLE); - continue; - } - /* POT(TOP) */ if (buf[0x000 / 4] == POT_MAGIC1 && (buf[0x004 / 4] & 0xFFFF) == POT_MAGIC2) { @@ -183,13 +167,6 @@ static int bcm47xxpart_parse(struct mtd_info *master, offset = rounddown(offset + trx->length, blocksize); continue; } - - /* Squashfs on devices not using TRX */ - if (buf[0x000 / 4] == SQSH_MAGIC) { - bcm47xxpart_add_part(&parts[curr_part++], "rootfs", - offset, 0); - continue; - } } /* Look for NVRAM at the end of the last block. */ |