From patchwork Fri Mar 10 16:45:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 67577 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp982324wrd; Fri, 10 Mar 2023 08:57:33 -0800 (PST) X-Google-Smtp-Source: AK7set97CSNVKze6gEirYuJVY232eIQWhCcR9mv0E2QXE5vNYKzk8Ycq1kvjXCWQBhxu4xpbq2Ti X-Received: by 2002:a17:90b:4b11:b0:233:9fff:888e with SMTP id lx17-20020a17090b4b1100b002339fff888emr27819677pjb.39.1678467453469; Fri, 10 Mar 2023 08:57:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678467453; cv=none; d=google.com; s=arc-20160816; b=Tr8BbBPVbIlrvrSwccEpnHnSNueSQVs051hZCFqNNZt1bj4mTi/2w96P3nT3ROnKrp ZbLxPxexE8vAnriNTV3/vGWCHpQAABmreJP/5H1/nRsCGi1r8JScbSXYensb30Puuhqd 7Pqo+s8aA1af1JDk1ZzhB+HHeDYP8IO1c9r/Mig1RFvMPWfBsJdj6eEV44NG3qxn8EsW TgUdOz8MgFxQi/MkBxzN7Ckh7wL9rcZEbZeiQcVnZqAoqOXekC5fDiW5io6TktiqoD3M Q5QxBFTCcrbawcVlRv5HypyBpXWJilG3TZzzxN18a1MUFeeCkicjFEI0kg8NM6HVb471 XDNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=q894XboNbpPXVPyE7xDYpnLw1pM4fWYn6oJT3snBsv0=; b=jtP/DsdajRSo1GwsinINK39R6caBY8W+L/X0gp04MvBQDULtE4kyIb5WMYthLPbuPn M4anAtypP9uygpdW3VSyiXQoCt4dZ0eyTS6na4l5BkZqNT1GptDXXR8wS314uqFHfxS/ m7TGZ86f2pPdlqUuS+qg8oHmv1VdLBQib3WuyfTIyHH0bZh0TqZAkf6KwyFJTgJM+3sx Xtuf2yCsJWadEON1w0ygaZxCUjRoy7jNLIfwYJxUalOW8HVbt0m8MvBsbTIogoNQ65nR RSeGAJQiCP0P54KsI6yI8W1HkyGd/LhYXvp2fmKrt9UVwgSx4/e+WoLEr2IHiDdbRk8g MULA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Fsvkistm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l193-20020a6391ca000000b004fb90f10ac7si177701pge.812.2023.03.10.08.57.17; Fri, 10 Mar 2023 08:57:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Fsvkistm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231181AbjCJQvN (ORCPT + 99 others); Fri, 10 Mar 2023 11:51:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230379AbjCJQuc (ORCPT ); Fri, 10 Mar 2023 11:50:32 -0500 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D99F13482E; Fri, 10 Mar 2023 08:47:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678466861; x=1710002861; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=j3a+pSqIIQuyILIQAWllEvax3sYCFju0/icmipo/1ho=; b=FsvkistmTxCntSOFdc6juR9mWg2jlI5GGitVf63ApKTl64g/8nUgJb5N Ejk8F9lbOXEhpne3397J945UMs5lJ1tEd6aWCGOXUrx2i4E9euQqHJR6j xYq8xq3Mpy+zpI8GQNmFfhL5v5CLrDAQC2uEfdWFm8BnFxXLtHLccZyAv CWwDfI05f5YXL/wqFJIO7Mr8YHKITV0dc2D0djIMXn4w3RWPeJLKZpik2 9M/Q7Fq8U7X6Vq1w0Okbt7soVKhRTD7+457MQL11JjSZWrWD99w4Kfoay iY/nLNW/Of5nK7KReo9M3wUrEjkCaQLXITpygIBAt8kF1OuCwkF2xGvSC w==; X-IronPort-AV: E=McAfee;i="6500,9779,10645"; a="320621156" X-IronPort-AV: E=Sophos;i="5.98,250,1673942400"; d="scan'208";a="320621156" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2023 08:45:13 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10645"; a="746778639" X-IronPort-AV: E=Sophos;i="5.98,250,1673942400"; d="scan'208";a="746778639" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga004.fm.intel.com with ESMTP; 10 Mar 2023 08:45:11 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 6000B3CB; Fri, 10 Mar 2023 18:45:53 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , Jens Axboe , Greg Kroah-Hartman , linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 8/9] pktcdvd: Get rid of redundant 'else' Date: Fri, 10 Mar 2023 18:45:48 +0200 Message-Id: <20230310164549.22133-9-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230310164549.22133-1-andriy.shevchenko@linux.intel.com> References: <20230310164549.22133-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760000688659428750?= X-GMAIL-MSGID: =?utf-8?q?1760000688659428750?= In the snippets like the following if (...) return / goto / break / continue ...; else ... the 'else' is redundant. Get rid of it. Signed-off-by: Andy Shevchenko Reviewed-by: Greg Kroah-Hartman --- drivers/block/pktcdvd.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c index 340e953e3888..22048739a245 100644 --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c @@ -958,25 +958,25 @@ static int pkt_set_segment_merging(struct pktcdvd_device *pd, struct request_que { struct device *ddev = disk_to_dev(pd->disk); - if ((pd->settings.size << 9) / CD_FRAMESIZE - <= queue_max_segments(q)) { + if ((pd->settings.size << 9) / CD_FRAMESIZE <= queue_max_segments(q)) { /* * The cdrom device can handle one segment/frame */ clear_bit(PACKET_MERGE_SEGS, &pd->flags); return 0; - } else if ((pd->settings.size << 9) / PAGE_SIZE - <= queue_max_segments(q)) { + } + + if ((pd->settings.size << 9) / PAGE_SIZE <= queue_max_segments(q)) { /* * We can handle this case at the expense of some extra memory * copies during write operations */ set_bit(PACKET_MERGE_SEGS, &pd->flags); return 0; - } else { - dev_err(ddev, "cdrom max_phys_segments too small\n"); - return -EIO; } + + dev_err(ddev, "cdrom max_phys_segments too small\n"); + return -EIO; } static void pkt_end_io_read(struct bio *bio)