lkml.org 
[lkml]   [2013]   [Sep]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] UBI: simplify image sequence test
    Date
    The test:
    if (!a && b)
    a = b;
    can be symplified in:
    if (!a)
    a = b;

    And there's no need to test if ubi->image_seq is not null, because if it is,
    it is set to image_seq.
    So, we just test if image_seq is not null.

    Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
    ---
    drivers/mtd/ubi/attach.c | 5 ++---
    1 file changed, 2 insertions(+), 3 deletions(-)

    diff --git a/drivers/mtd/ubi/attach.c b/drivers/mtd/ubi/attach.c
    index 03b32b0..33bb1f2 100644
    --- a/drivers/mtd/ubi/attach.c
    +++ b/drivers/mtd/ubi/attach.c
    @@ -900,10 +900,9 @@ static int scan_peb(struct ubi_device *ubi, struct ubi_attach_info *ai,
    * number.
    */
    image_seq = be32_to_cpu(ech->image_seq);
    - if (!ubi->image_seq && image_seq)
    + if (!ubi->image_seq)
    ubi->image_seq = image_seq;
    - if (ubi->image_seq && image_seq &&
    - ubi->image_seq != image_seq) {
    + if (image_seq && ubi->image_seq != image_seq) {
    ubi_err("bad image sequence number %d in PEB %d, expected %d",
    image_seq, pnum, ubi->image_seq);
    ubi_dump_ec_hdr(ech);
    --
    1.7.10.4


    \
     
     \ /
      Last update: 2013-09-27 15:41    [W:2.644 / U:0.584 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site