From nobody Fri Sep 20 16:44:15 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6BE1CEB64DA for ; Mon, 10 Jul 2023 10:28:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233199AbjGJK16 (ORCPT ); Mon, 10 Jul 2023 06:27:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229493AbjGJK14 (ORCPT ); Mon, 10 Jul 2023 06:27:56 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC3A2AF; Mon, 10 Jul 2023 03:27:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688984875; x=1720520875; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=REWyC/nAC6Z96ggpA1NLsyDE3cGETw1DuCTFixDA/T8=; b=QYiDNHslAz5euZQXA5hn7+FOH/XuJHCE1J5WaTXeqMqkZKeOLhdmIAmK cIvCehpUZb+GEzPQkJl/f2IHQeR6U/F+k/Yhw+B0CTph9sSHNrHmdUsDD zW+EQhzwuIdnQLRgQnF7DsrLLgEnn5TxJuedzizRu4/MuBZTO/V8iPGtn 5At5PgO8nVo6MtH/9Ceefj2bpjlngq94xhUD/ksI4pH5hys2fYkoPd1VM 3MB75QDspe3WrWQuBINvoo/ONIf49trUe1DsHeYUi6xAqEEgAsUnD66RR KD9SxeR+St2F/6sEk5GwKmaesjBxH/xneLpYu3yUWmWeavYcVaS+AYdph A==; X-IronPort-AV: E=McAfee;i="6600,9927,10766"; a="364345390" X-IronPort-AV: E=Sophos;i="6.01,194,1684825200"; d="scan'208";a="364345390" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jul 2023 03:27:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10766"; a="865297523" X-IronPort-AV: E=Sophos;i="6.01,194,1684825200"; d="scan'208";a="865297523" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 10 Jul 2023 03:27:48 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 0244B379; Mon, 10 Jul 2023 13:27:52 +0300 (EEST) From: Andy Shevchenko To: Mark Brown , Yang Yingliang , Andy Shevchenko , Amit Kumar Mahapatra via Alsa-devel , Kris Bahnsen , Neil Armstrong , Tharun Kumar P , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , linux-spi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, netdev@vger.kernel.org Cc: Radu Pirea , Nicolas Ferre , Alexandre Belloni , Claudiu Beznea , Tudor Ambarus , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Matthias Brugger , AngeloGioacchino Del Regno , Alain Volmat , Maxime Coquelin , Alexandre Torgue , Max Filippov , Richard Cochran Subject: [PATCH v1 2/8] spi: Drop duplicate IDR allocation code in spi_register_controller() Date: Mon, 10 Jul 2023 13:27:45 +0300 Message-Id: <20230710102751.83314-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230710102751.83314-1-andriy.shevchenko@linux.intel.com> References: <20230710102751.83314-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Refactor spi_register_controller() to drop duplicate IDR allocation. Instead of if-else-if branching use two sequential if:s, which allows to re-use the logic of IDR allocation in all cases. Signed-off-by: Andy Shevchenko --- drivers/spi/spi.c | 50 ++++++++++++++++++++++------------------------- 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 8f3282a71c63..6d74218cf38e 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -3081,6 +3081,20 @@ static int spi_controller_check_ops(struct spi_contr= oller *ctlr) return 0; } =20 +/* Allocate dynamic bus number using Linux idr */ +static int spi_controller_id_alloc(struct spi_controller *ctlr, int start,= int end) +{ + int id; + + mutex_lock(&board_lock); + id =3D idr_alloc(&spi_master_idr, ctlr, start, end, GFP_KERNEL); + mutex_unlock(&board_lock); + if (WARN(id < 0, "couldn't get idr")) + return id =3D=3D -ENOSPC ? -EBUSY : id; + ctlr->bus_num =3D id; + return 0; +} + /** * spi_register_controller - register SPI master or slave controller * @ctlr: initialized master, originally from spi_alloc_master() or @@ -3108,8 +3122,8 @@ int spi_register_controller(struct spi_controller *ct= lr) { struct device *dev =3D ctlr->dev.parent; struct boardinfo *bi; + int first_dynamic; int status; - int id, first_dynamic; =20 if (!dev) return -ENODEV; @@ -3122,27 +3136,13 @@ int spi_register_controller(struct spi_controller *= ctlr) if (status) return status; =20 + if (ctlr->bus_num < 0) + ctlr->bus_num =3D of_alias_get_id(ctlr->dev.of_node, "spi"); if (ctlr->bus_num >=3D 0) { /* Devices with a fixed bus num must check-in with the num */ - mutex_lock(&board_lock); - id =3D idr_alloc(&spi_master_idr, ctlr, ctlr->bus_num, - ctlr->bus_num + 1, GFP_KERNEL); - mutex_unlock(&board_lock); - if (WARN(id < 0, "couldn't get idr")) - return id =3D=3D -ENOSPC ? -EBUSY : id; - ctlr->bus_num =3D id; - } else { - /* Allocate dynamic bus number using Linux idr */ - id =3D of_alias_get_id(ctlr->dev.of_node, "spi"); - if (id >=3D 0) { - ctlr->bus_num =3D id; - mutex_lock(&board_lock); - id =3D idr_alloc(&spi_master_idr, ctlr, ctlr->bus_num, - ctlr->bus_num + 1, GFP_KERNEL); - mutex_unlock(&board_lock); - if (WARN(id < 0, "couldn't get idr")) - return id =3D=3D -ENOSPC ? -EBUSY : id; - } + status =3D spi_controller_id_alloc(ctlr, ctlr->bus_num, ctlr->bus_num + = 1); + if (status) + return status; } if (ctlr->bus_num < 0) { first_dynamic =3D of_alias_get_highest_id("spi"); @@ -3151,13 +3151,9 @@ int spi_register_controller(struct spi_controller *c= tlr) else first_dynamic++; =20 - mutex_lock(&board_lock); - id =3D idr_alloc(&spi_master_idr, ctlr, first_dynamic, - 0, GFP_KERNEL); - mutex_unlock(&board_lock); - if (WARN(id < 0, "couldn't get idr")) - return id; - ctlr->bus_num =3D id; + status =3D spi_controller_id_alloc(ctlr, first_dynamic, 0); + if (status) + return status; } ctlr->bus_lock_flag =3D 0; init_completion(&ctlr->xfer_completion); --=20 2.40.0.1.gaa8946217a0b