| Message ID | 1387651152-3884-1-git-send-email-zajec5@gmail.com |
|---|---|
| State | Accepted |
| Commit | 4f8aaf72287578c846ed7ac8c6114aacbf416e45 |
| Headers | show |
Hi Rafał, On Sat, Dec 21, 2013 at 07:39:11PM +0100, Rafał Miłecki wrote: > Some devices have even nicer-to-recognize CFE thanks to the magic. > > Signed-off-by: Rafał Miłecki <zajec5@gmail.com> > --- > This patch adds one line wider than 80 chars, however this improves code > readability thanks to keeping one rule per line. I hope this can be > accepted in this case. I tripped on the same checkpatch error, and I thought the same thing about readability. Probably worth an exception in this case. Forcing the '||' or half the rule onto the next line wouldn't be too pretty. > Both patches were verified with > ./verify ../linux/l2-mtd/ mips-bcm47xx_defconfig < patch Nice to know I'm not the only one running these tools :) Both patches look good. Pushed to l2-mtd.git. Brian
2014/1/5 Brian Norris <computersforpeace@gmail.com>: >> Both patches were verified with >> ./verify ../linux/l2-mtd/ mips-bcm47xx_defconfig < patch > > Nice to know I'm not the only one running these tools :) Artem taught me to! ;)
diff --git a/drivers/mtd/bcm47xxpart.c b/drivers/mtd/bcm47xxpart.c index 931746d..b72a3ac 100644 --- a/drivers/mtd/bcm47xxpart.c +++ b/drivers/mtd/bcm47xxpart.c @@ -23,10 +23,11 @@ * Amount of bytes we read when analyzing each block of flash memory. * Set it big enough to allow detecting partition and reading important data. */ -#define BCM47XXPART_BYTES_TO_READ 0x404 +#define BCM47XXPART_BYTES_TO_READ 0x4e8 /* Magics */ #define BOARD_DATA_MAGIC 0x5246504D /* MPFR */ +#define CFE_MAGIC 0x43464531 /* 1EFC */ #define FACTORY_MAGIC 0x59544346 /* FCTY */ #define POT_MAGIC1 0x54544f50 /* POTT */ #define POT_MAGIC2 0x504f /* OP */ @@ -102,8 +103,9 @@ static int bcm47xxpart_parse(struct mtd_info *master, continue; } - /* CFE has small NVRAM at 0x400 */ - if (buf[0x400 / 4] == NVRAM_HEADER) { + /* Magic or small NVRAM at 0x400 */ + if ((buf[0x4e0 / 4] == CFE_MAGIC && buf[0x4e4 / 4] == CFE_MAGIC) || + (buf[0x400 / 4] == NVRAM_HEADER)) { bcm47xxpart_add_part(&parts[curr_part++], "boot", offset, MTD_WRITEABLE); continue;
Some devices have even nicer-to-recognize CFE thanks to the magic. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> --- This patch adds one line wider than 80 chars, however this improves code readability thanks to keeping one rule per line. I hope this can be accepted in this case. --- Both patches were verified with ./verify ../linux/l2-mtd/ mips-bcm47xx_defconfig < patch --- drivers/mtd/bcm47xxpart.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)