From patchwork Mon Jul 10 10:27:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 117826 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp4925149vqx; Mon, 10 Jul 2023 03:33:07 -0700 (PDT) X-Google-Smtp-Source: APBJJlEmgEWZ5zFzwoMmuGvF1tY3ViLyJP7tvcaQ65jieTlGLZPfyXmxMAMRhQLM0eDx60Yb19y8 X-Received: by 2002:a05:6a00:99f:b0:656:c971:951 with SMTP id u31-20020a056a00099f00b00656c9710951mr26535549pfg.8.1688985186823; Mon, 10 Jul 2023 03:33:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688985186; cv=none; d=google.com; s=arc-20160816; b=cQWPT3WLfuXmU8gge3+Kti/Uu8qudss1oNkOOgN901dZeCg8eb9kGLiPWJ8CnwPOL0 wdypkkaevhYutWcPnRLv6vtIBR4Qjw0+CLqR2ERP93psPGBtPEv4r7mtLQeO5Dub+4/S liP7BBd1zDNpcXz2Ao8HqVc7+p5YXF2ekIQTkRXyIETDBXZbBAn1RHbDMJggDZnnjWjw mJBph8G/NCmqcDpJRZJ7TY5ZEER7b8iwbQgURKa26jjLeI+NJTu9abkXkMBwnDTTOsIa 8IWZSeb0uBZZ7IUvfrbGoZQh/4VKl/1P/3FE3HrtcumMJikOWPAxQaEaDP9vqu5Ja/Fb 0Plw== 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:cc:to:from :dkim-signature; bh=05Eo8yAcewTO+WPsEETnF/DlVCQ3v4XdrP+vRxVBOe8=; fh=0+F98wGFYRypkYB2HnAQPtJBQZZGg6jGZd/5tkylhQc=; b=Q0H1kIMv/xFDPcX/bCNgpDV/3iCTjqNYo6Uwqz5JI0Pxe0qc6OjoEj/iwOmGx3nkQ7 jFzX8HZVqKdwK8OygtZha7i8Qt/D5W84Zb2sF0SE9vQZhs/KhGbVAuTU4IzyrHahoDSc PiHHcCBLNTiMfeZ86eePdk+I6rd/hMB7Sf+WgIxG4dnE87x1BqCGSDCm4kc8KvOoKlz1 HpaNJvvV9sHPeMpJwnY3J1wR+QTS9LIbniK330WUYSJeyxMQzBZPx1GUhtN9IkobFJsr Cbkhx+fwKQFrcIrvwpXjiXHKKIIUOvRgYPad2QrZZ0+cITvPJVMZjDYSV3jIXfVLx76J iNxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=QYiDNHsl; 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 i11-20020a63e44b000000b0055bdf89c9d8si8431810pgk.436.2023.07.10.03.32.53; Mon, 10 Jul 2023 03:33:06 -0700 (PDT) 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=QYiDNHsl; 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 S233026AbjGJK16 (ORCPT + 99 others); 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_Kleine?= =?utf-8?q?-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 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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: INBOX X-GMAIL-THRID: 1771029330727322788 X-GMAIL-MSGID: 1771029330727322788 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_controller *ctlr) return 0; } +/* 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 = idr_alloc(&spi_master_idr, ctlr, start, end, GFP_KERNEL); + mutex_unlock(&board_lock); + if (WARN(id < 0, "couldn't get idr")) + return id == -ENOSPC ? -EBUSY : id; + ctlr->bus_num = 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 *ctlr) { struct device *dev = ctlr->dev.parent; struct boardinfo *bi; + int first_dynamic; int status; - int id, first_dynamic; if (!dev) return -ENODEV; @@ -3122,27 +3136,13 @@ int spi_register_controller(struct spi_controller *ctlr) if (status) return status; + if (ctlr->bus_num < 0) + ctlr->bus_num = of_alias_get_id(ctlr->dev.of_node, "spi"); if (ctlr->bus_num >= 0) { /* Devices with a fixed bus num must check-in with the num */ - mutex_lock(&board_lock); - id = 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 == -ENOSPC ? -EBUSY : id; - ctlr->bus_num = id; - } else { - /* Allocate dynamic bus number using Linux idr */ - id = of_alias_get_id(ctlr->dev.of_node, "spi"); - if (id >= 0) { - ctlr->bus_num = id; - mutex_lock(&board_lock); - id = 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 == -ENOSPC ? -EBUSY : id; - } + status = spi_controller_id_alloc(ctlr, ctlr->bus_num, ctlr->bus_num + 1); + if (status) + return status; } if (ctlr->bus_num < 0) { first_dynamic = of_alias_get_highest_id("spi"); @@ -3151,13 +3151,9 @@ int spi_register_controller(struct spi_controller *ctlr) else first_dynamic++; - mutex_lock(&board_lock); - id = 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 = id; + status = spi_controller_id_alloc(ctlr, first_dynamic, 0); + if (status) + return status; } ctlr->bus_lock_flag = 0; init_completion(&ctlr->xfer_completion);