From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 345EC2836B5 for ; Wed, 5 Nov 2025 18:37:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762367869; cv=none; b=LQVkd0htrJ+MHCTaWJq4NuurSuY7tBypcaLDBcPuPjr9wMlkT7UFt5aJe2pmO9UEnxie/natAm5abf4/WkzuokXY+Fgb5ns3nhGhJCCl2FfRytZ9K8JAOciKLk0ROyrzGWMcM/vGSYc66K5/fljZ6tI2gROUQXcBe6k4Oj8gtHs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762367869; c=relaxed/simple; bh=R4bFuwzCbhJ+188XUh8XwprDMEtEHFoHtrsAsGVOyD8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=s7mZtNYSusfwaazclgxyUD2G5vMVn91k4xSZehwisG462U283vHjkobpYuTADfPtP9WQ3G2+MBWS+vAa9ctjLp+ao88n9hs6S7I//tGHOGhIycaDvV+F+UxRFLn8YsL2tlV5rBSoFzQIzO0A1K3BbntOnuIZImv0f8t1CXNZs+c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=pass smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=aAzbRA0Q; arc=none smtp.client-ip=192.198.163.18 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="aAzbRA0Q" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1762367868; x=1793903868; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=R4bFuwzCbhJ+188XUh8XwprDMEtEHFoHtrsAsGVOyD8=; b=aAzbRA0Q2uDurVH9NeNnjDWBPq9wy+hAj2j9oyBFR57CX9Azc4l0nd/+ junL5Qvfyx7Lo6F+IUK+1v54RwKGO7v3g8/jigcZ4yIjvWx5MUT4k6YBa ewtsAJJ6V2GWBRXBefeLo43Mp7KCV4RZyR0+kRXpXRRtawTvCuT5DnssU 7Am7+Alvpp4kyvzIZHVeHZLCsSEiixVzb828laveflyNpKjKzsQM4flWh C9NNsRcKi+Rz03YcaOa94U3FwZEA15edmKvKCfR3FN0eAp4lwvo2QZMAf RRYLatHymNcwIJBC0Pc8iQXN1xfiP8j2Dms6hni7BrdV4fBds0u1GY3Rf A==; X-CSE-ConnectionGUID: 68CTlI8wQcC91tRMl51C7g== X-CSE-MsgGUID: HPwmgyi8SuuuXJdqBlYaqw== X-IronPort-AV: E=McAfee;i="6800,10657,11604"; a="63697954" X-IronPort-AV: E=Sophos;i="6.19,282,1754982000"; d="scan'208";a="63697954" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Nov 2025 10:37:47 -0800 X-CSE-ConnectionGUID: 0xdNeHl9RUeQBFiybfJjpg== X-CSE-MsgGUID: XC/DnSzmQMyT3FXIJqvJ+w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.19,282,1754982000"; d="scan'208";a="191819128" Received: from black.igk.intel.com ([10.91.253.5]) by fmviesa005.fm.intel.com with ESMTP; 05 Nov 2025 10:37:46 -0800 Received: by black.igk.intel.com (Postfix, from userid 1003) id 5BB5296; Wed, 05 Nov 2025 19:37:45 +0100 (CET) From: Andy Shevchenko To: Ira Weiny , Andy Shevchenko , nvdimm@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Dan Williams , Vishal Verma , Dave Jiang Subject: [PATCH v1 1/1] libnvdimm/labels: Get rid of redundant 'else' Date: Wed, 5 Nov 2025 19:37:43 +0100 Message-ID: <20251105183743.1800500-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.50.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 --- drivers/nvdimm/label.c | 60 ++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/drivers/nvdimm/label.c b/drivers/nvdimm/label.c index 04f4a049599a..b129f3a55a70 100644 --- a/drivers/nvdimm/label.c +++ b/drivers/nvdimm/label.c @@ -734,13 +734,13 @@ static enum nvdimm_claim_class guid_to_nvdimm_cclass(guid_t *guid) { if (guid_equal(guid, &nvdimm_btt_guid)) return NVDIMM_CCLASS_BTT; - else if (guid_equal(guid, &nvdimm_btt2_guid)) + if (guid_equal(guid, &nvdimm_btt2_guid)) return NVDIMM_CCLASS_BTT2; - else if (guid_equal(guid, &nvdimm_pfn_guid)) + if (guid_equal(guid, &nvdimm_pfn_guid)) return NVDIMM_CCLASS_PFN; - else if (guid_equal(guid, &nvdimm_dax_guid)) + if (guid_equal(guid, &nvdimm_dax_guid)) return NVDIMM_CCLASS_DAX; - else if (guid_equal(guid, &guid_null)) + if (guid_equal(guid, &guid_null)) return NVDIMM_CCLASS_NONE; return NVDIMM_CCLASS_UNKNOWN; @@ -751,13 +751,13 @@ static enum nvdimm_claim_class uuid_to_nvdimm_cclass(uuid_t *uuid) { if (uuid_equal(uuid, &nvdimm_btt_uuid)) return NVDIMM_CCLASS_BTT; - else if (uuid_equal(uuid, &nvdimm_btt2_uuid)) + if (uuid_equal(uuid, &nvdimm_btt2_uuid)) return NVDIMM_CCLASS_BTT2; - else if (uuid_equal(uuid, &nvdimm_pfn_uuid)) + if (uuid_equal(uuid, &nvdimm_pfn_uuid)) return NVDIMM_CCLASS_PFN; - else if (uuid_equal(uuid, &nvdimm_dax_uuid)) + if (uuid_equal(uuid, &nvdimm_dax_uuid)) return NVDIMM_CCLASS_DAX; - else if (uuid_equal(uuid, &uuid_null)) + if (uuid_equal(uuid, &uuid_null)) return NVDIMM_CCLASS_NONE; return NVDIMM_CCLASS_UNKNOWN; @@ -768,20 +768,20 @@ static const guid_t *to_abstraction_guid(enum nvdimm_claim_class claim_class, { if (claim_class == NVDIMM_CCLASS_BTT) return &nvdimm_btt_guid; - else if (claim_class == NVDIMM_CCLASS_BTT2) + if (claim_class == NVDIMM_CCLASS_BTT2) return &nvdimm_btt2_guid; - else if (claim_class == NVDIMM_CCLASS_PFN) + if (claim_class == NVDIMM_CCLASS_PFN) return &nvdimm_pfn_guid; - else if (claim_class == NVDIMM_CCLASS_DAX) + if (claim_class == NVDIMM_CCLASS_DAX) return &nvdimm_dax_guid; - else if (claim_class == NVDIMM_CCLASS_UNKNOWN) { - /* - * If we're modifying a namespace for which we don't - * know the claim_class, don't touch the existing guid. - */ - return target; - } else + if (claim_class == NVDIMM_CCLASS_NONE) return &guid_null; + + /* + * If we're modifying a namespace for which we don't + * know the claim_class, don't touch the existing guid. + */ + return target; } /* CXL labels store UUIDs instead of GUIDs for the same data */ @@ -790,20 +790,20 @@ static const uuid_t *to_abstraction_uuid(enum nvdimm_claim_class claim_class, { if (claim_class == NVDIMM_CCLASS_BTT) return &nvdimm_btt_uuid; - else if (claim_class == NVDIMM_CCLASS_BTT2) + if (claim_class == NVDIMM_CCLASS_BTT2) return &nvdimm_btt2_uuid; - else if (claim_class == NVDIMM_CCLASS_PFN) + if (claim_class == NVDIMM_CCLASS_PFN) return &nvdimm_pfn_uuid; - else if (claim_class == NVDIMM_CCLASS_DAX) + if (claim_class == NVDIMM_CCLASS_DAX) return &nvdimm_dax_uuid; - else if (claim_class == NVDIMM_CCLASS_UNKNOWN) { - /* - * If we're modifying a namespace for which we don't - * know the claim_class, don't touch the existing uuid. - */ - return target; - } else + if (claim_class == NVDIMM_CCLASS_NONE) return &uuid_null; + + /* + * If we're modifying a namespace for which we don't + * know the claim_class, don't touch the existing uuid. + */ + return target; } static void reap_victim(struct nd_mapping *nd_mapping, @@ -990,9 +990,7 @@ static int init_labels(struct nd_mapping *nd_mapping, int num_labels) mutex_unlock(&nd_mapping->lock); } - if (ndd->ns_current == -1 || ndd->ns_next == -1) - /* pass */; - else + if (ndd->ns_current != -1 && ndd->ns_next != -1) return max(num_labels, old_num_labels); nsindex = to_namespace_index(ndd, 0); -- 2.50.1