From patchwork Fri Jun 1 16:12:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Bornyakov X-Patchwork-Id: 50066 Received: from vger.kernel.org ([209.132.180.67]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fOmdQ-0000mZ-RS; Fri, 01 Jun 2018 16:10:37 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752594AbeFAQJ7 (ORCPT + 1 other); Fri, 1 Jun 2018 12:09:59 -0400 Received: from mail-lf0-f65.google.com ([209.85.215.65]:35294 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752333AbeFAQJ6 (ORCPT ); Fri, 1 Jun 2018 12:09:58 -0400 Received: by mail-lf0-f65.google.com with SMTP id y72-v6so15590321lfd.2; Fri, 01 Jun 2018 09:09:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=mWlZJEyWvYlweuliyLGrcdaIRuWmzePgcsWZD7qSGhA=; b=Q/+dZNY9GuOGc4Z4SB+bZpJ7KN1Go/fWPIXCjQX9toStgnOk/olhJEUfuPI2w7RRSs AkosUZrTWCyl8ZzXidZZzuSKsC8STgdqobG/5D7TOKNScQK4zEL+yrJuvWOduzC+qCgv vRp52/NfwO/ixLjg6lfB0HrvCGpH0MuWuBePsVwElkgzxSddzHvpl0E+tDB2nO0xzH7v 84imrZ7xFXgKeM2hQwjtedJVWt/2tRjtjkwIcWF8Ly5UsrexMvwM/IexNlmFyn8Fpklu QxAc5PExdS2W4+ZI7ORRyvLe5IYKm+N0hQuehcGHNJz5BoxeWaSg9swzmvQrhIQd9Akz a/fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=mWlZJEyWvYlweuliyLGrcdaIRuWmzePgcsWZD7qSGhA=; b=i7vHZdza8p/mAXL5rSRlm6UsYDL7GLJ3MGhVVEiEi6yl47B452/CfR4tPwKAwSoWpL KSRznhr6mKmWa2RgQhCmkAbZoI14fHPli0ebBhWtcBIw8w5cx7QC8+Zdl58BKtmv+rxy 98cYKer5AesoC+KjLxOd2kVTaWIZP4B+s/DBJrIzSMA9vIOoNYJqv8cZbC1hZOukPz2R vc8Wq4sc8ToAkbr1S/GbZNn5rXP/4Q0SbGA3WGXBoXXWYvIvaQUa3/PBIMl1r4xCSqND WrwZzTGXp74o9k+j8xnjwLQ3YLQe6j7omvF63m1hqle1KO7E9iJu0QX0v65XB2L9uEaf /71g== X-Gm-Message-State: ALKqPwdOMg6lw3aNOFcHt6VcP/XfNSBlw5JDRHMCdkCw73uOZF42Pui/ HXnV2xs4dSyBrFP54dz0+o0= X-Google-Smtp-Source: ADUXVKIRjWUvrhPBdPeTTJuwnk/YzPky8IhpDrNtrAScEZrhENca7lfSuktzctNVXffndU0dDy576Q== X-Received: by 2002:a19:c3d6:: with SMTP id t205-v6mr6863020lff.127.1527869397182; Fri, 01 Jun 2018 09:09:57 -0700 (PDT) Received: from localhost.localdomain ([188.162.65.204]) by smtp.gmail.com with ESMTPSA id a18-v6sm2379158ljf.17.2018.06.01.09.09.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Jun 2018 09:09:56 -0700 (PDT) From: Ivan Bornyakov To: mchehab@kernel.org Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ivan Bornyakov Subject: [PATCH] media: stv090x: fix if-else order Date: Fri, 1 Jun 2018 19:12:21 +0300 Message-Id: <20180601161221.24807-1-brnkv.i1@gmail.com> X-Mailer: git-send-email 2.16.4 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org There is this code: if (v >= 0x20) { ... } else if (v < 0x20) { ... } else if (v > 0x30) { /* this branch is impossible */ } It would be sensibly for last branch to be on the top. Signed-off-by: Ivan Bornyakov --- drivers/media/dvb-frontends/stv090x.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/media/dvb-frontends/stv090x.c b/drivers/media/dvb-frontends/stv090x.c index 9133f65d4623..d70eb311ebaf 100644 --- a/drivers/media/dvb-frontends/stv090x.c +++ b/drivers/media/dvb-frontends/stv090x.c @@ -4841,7 +4841,11 @@ static int stv090x_setup(struct dvb_frontend *fe) } state->internal->dev_ver = stv090x_read_reg(state, STV090x_MID); - if (state->internal->dev_ver >= 0x20) { + if (state->internal->dev_ver > 0x30) { + /* we shouldn't bail out from here */ + dprintk(FE_ERROR, 1, "INFO: Cut: 0x%02x probably incomplete support!", + state->internal->dev_ver); + } else if (state->internal->dev_ver >= 0x20) { if (stv090x_write_reg(state, STV090x_TSGENERAL, 0x0c) < 0) goto err; @@ -4857,10 +4861,6 @@ static int stv090x_setup(struct dvb_frontend *fe) state->internal->dev_ver); goto err; - } else if (state->internal->dev_ver > 0x30) { - /* we shouldn't bail out from here */ - dprintk(FE_ERROR, 1, "INFO: Cut: 0x%02x probably incomplete support!", - state->internal->dev_ver); } /* ADC1 range */