| Message ID | 56F78ACB.1010402@gmail.com |
|---|---|
| State | Rejected |
| Headers | show |
On Sun, Mar 27, 2016 at 03:24:59PM +0800, zhaoxiu.zeng wrote: > From: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com> > > Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com> I'm not CC'd on the rest of this series, where you defined parity16(). And I doubt you've tested this. So I'm not applying. Brian > drivers/mtd/ssfdc.c | 20 ++------------------ > 1 file changed, 2 insertions(+), 18 deletions(-) > > diff --git a/drivers/mtd/ssfdc.c b/drivers/mtd/ssfdc.c > index daf82ba..b4d9144 100644 > --- a/drivers/mtd/ssfdc.c > +++ b/drivers/mtd/ssfdc.c > @@ -182,24 +182,10 @@ static int read_raw_oob(struct mtd_info *mtd, loff_t offs, uint8_t *buf) > return 0; > } > > -/* Parity calculator on a word of n bit size */ > -static int get_parity(int number, int size) > -{ > - int k; > - int parity; > - > - parity = 1; > - for (k = 0; k < size; k++) { > - parity += (number >> k); > - parity &= 1; > - } > - return parity; > -} > - > /* Read and validate the logical block address field stored in the OOB */ > static int get_logical_address(uint8_t *oob_buf) > { > - int block_address, parity; > + int block_address; > int offset[2] = {6, 11}; /* offset of the 2 address fields within OOB */ > int j; > int ok = 0; > @@ -215,11 +201,9 @@ static int get_logical_address(uint8_t *oob_buf) > > /* Check for the signature bits in the address field (MSBits) */ > if ((block_address & ~0x7FF) == 0x1000) { > - parity = block_address & 0x01; > block_address &= 0x7FF; > - block_address >>= 1; > > - if (get_parity(block_address, 10) != parity) { > + if (!parity16(block_address)) { > pr_debug("SSFDC_RO: logical address field%d" > "parity error(0x%04X)\n", j+1, > block_address); > -- > 2.5.5 >
diff --git a/drivers/mtd/ssfdc.c b/drivers/mtd/ssfdc.c index daf82ba..b4d9144 100644 --- a/drivers/mtd/ssfdc.c +++ b/drivers/mtd/ssfdc.c @@ -182,24 +182,10 @@ static int read_raw_oob(struct mtd_info *mtd, loff_t offs, uint8_t *buf) return 0; } -/* Parity calculator on a word of n bit size */ -static int get_parity(int number, int size) -{ - int k; - int parity; - - parity = 1; - for (k = 0; k < size; k++) { - parity += (number >> k); - parity &= 1; - } - return parity; -} - /* Read and validate the logical block address field stored in the OOB */ static int get_logical_address(uint8_t *oob_buf) { - int block_address, parity; + int block_address; int offset[2] = {6, 11}; /* offset of the 2 address fields within OOB */ int j; int ok = 0; @@ -215,11 +201,9 @@ static int get_logical_address(uint8_t *oob_buf) /* Check for the signature bits in the address field (MSBits) */ if ((block_address & ~0x7FF) == 0x1000) { - parity = block_address & 0x01; block_address &= 0x7FF; - block_address >>= 1; - if (get_parity(block_address, 10) != parity) { + if (!parity16(block_address)) { pr_debug("SSFDC_RO: logical address field%d" "parity error(0x%04X)\n", j+1, block_address);