From patchwork Tue Jul 11 17:17:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 118680 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:6406:b0:135:48c7:ea9a with SMTP id f6csp3284476rwh; Tue, 11 Jul 2023 10:44:42 -0700 (PDT) X-Google-Smtp-Source: APBJJlHwEF1qTf4ELQnVYJFkn8iNxZNyVZdbP18aUwHu06Kl0N1RWg264VsqHzN5RYgrv3GGS9Hs X-Received: by 2002:a17:906:5349:b0:993:fba5:cdef with SMTP id j9-20020a170906534900b00993fba5cdefmr8365768ejo.8.1689097482314; Tue, 11 Jul 2023 10:44:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689097482; cv=none; d=google.com; s=arc-20160816; b=B+hZc/LCOc2Ziu+k9eMMX+5c1SM5i7Si5cOOJQB9FQBw0BVuCDZIhcSCSUoeYWtmu2 9gnlxi9O71XdrT5WdzamRv5sf4mAo9sYcZ4HOJjpGJ2cSHdpBdgUlFsqIXYyYTdHHc1N Vss5gbRqPAT4bAZtzcqzS+zj5LBS/RBIvSEbt1z00I/f0lXIN04d5UrBCk9KsH5lRUBR +yyXvNV8/ei9o19odkxYrzEXIQUluj6cSTPSeI0/uT1YWcMmK3ytsuvmNvS+c5wyIIzE sjVh6Np82rubtkyhixzb/r4Oeh2IzDzYQBeIhceDzqEY12uoOeA9XEJVCgASxqrRL0rf woFg== 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=HpuXEIwl+MLumyUNqPICISQp+Z4rTCC9QFaJZRgkqaA=; fh=1nNdhl7R87shz8NR0wsonZRuXIWFIMAGTVMiI+iZ2Fo=; b=oM+TZxZOMUElU6yCTGXfava9gIkJB/Od+rR5YyTEBNRjdawekbaXLdd0QK9tQQVvLI irCyZ7U9QdwhKNLyp7FBEu7vyTHvwubeenbLhAIbDteHTvPe71Uq4aAF0dqZfhMMQlB4 y26WM8+MG8jnzDp0UoaVJjm5NYj6i9e7tsYPljqb/o93fk1de1seTjK+gj7SrNcE/2yW Ybxgr81xlbxXbN8RFHPpbHoTlBxSRgkF4NNtFAZCIgSEOpfmC5SIcbAXGfsL9A5dAA6z oTwgF/iuLIBet9m1KtEf2od+tdSYcCG7MkLh8wLdwemAT0WY03SGNPiU1lq+vlCDVr19 yUKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=JaStsnYz; 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 i13-20020a170906090d00b0097d787c4afesi2453096ejd.398.2023.07.11.10.44.18; Tue, 11 Jul 2023 10:44:42 -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=JaStsnYz; 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 S232492AbjGKRUY (ORCPT + 99 others); Tue, 11 Jul 2023 13:20:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33290 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232224AbjGKRUM (ORCPT ); Tue, 11 Jul 2023 13:20:12 -0400 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D91F1998; Tue, 11 Jul 2023 10:19:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689095994; x=1720631994; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=i6xTQM/M83VGl5L40MPme6/MD9lIrLsXxW1pfo9MYv4=; b=JaStsnYzeTg9oBfhx467Zmd/FHYV1dzltl25Ux6hq1+gU5PSdnER42jw Mi7SZBFIV/rA3bO1h32I1eZrOly6nE6WhuxA3BTj3Fc07UONhBU8tgpOA 8AkhXeQsLNNoS2p+6KCS1pQN0IHW4NnfL6IxMsb7ikBcec52R9a67gegq snxhkOVSbwYwkhLVn/eO53FqgP8dJSPSEuLVYRNiYwPhyn+GLmU1lMGd2 2J7qFwXgg+NTm8dndbB1HshS6H9cN1HY8OG1eUxQpN08dlXdXaPhS13iM BL6g89tnh/ugOYxgfxM865lKrVD4xhKJxe6Pd743qh3qN7O4yBFmKf21z Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10768"; a="362148714" X-IronPort-AV: E=Sophos;i="6.01,197,1684825200"; d="scan'208";a="362148714" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jul 2023 10:19:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10768"; a="715240870" X-IronPort-AV: E=Sophos;i="6.01,197,1684825200"; d="scan'208";a="715240870" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga007.jf.intel.com with ESMTP; 11 Jul 2023 10:17:58 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 5C3475FC; Tue, 11 Jul 2023 20:17:59 +0300 (EEST) From: Andy Shevchenko To: Mark Brown , Cristian Ciocaltea , Yang Yingliang , Andy Shevchenko , Amit Kumar Mahapatra via Alsa-devel , Serge Semin , Neil Armstrong , Tharun Kumar P , Vijaya Krishna Nivarthi , =?utf-8?q?Uwe_Kleine-K?= =?utf-8?q?=C3=B6nig?= , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-riscv@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, linux-trace-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: Sanjay R Mehta , Radu Pirea , Nicolas Ferre , Alexandre Belloni , Claudiu Beznea , Tudor Ambarus , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Matthias Brugger , AngeloGioacchino Del Regno , Andy Gross , Bjorn Andersson , Konrad Dybcio , Heiko Stuebner , Palmer Dabbelt , Paul Walmsley , Orson Zhai , Baolin Wang , Chunyan Zhang , Alain Volmat , Maxime Coquelin , Alexandre Torgue , Max Filippov , Steven Rostedt , Masami Hiramatsu , Richard Cochran , Sebastian Reichel Subject: [PATCH v3 05/14] spi: Kill spi_add_device_locked() Date: Tue, 11 Jul 2023 20:17:47 +0300 Message-Id: <20230711171756.86736-6-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230711171756.86736-1-andriy.shevchenko@linux.intel.com> References: <20230711171756.86736-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE,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: INBOX X-GMAIL-THRID: 1771147081658500962 X-GMAIL-MSGID: 1771147081658500962 Now, spi_add_device_locked() has just a line on top of __spi_add_device(). Besides that, it has a single caller. So, just kill it and embed its parts into the caller. Signed-off-by: Andy Shevchenko --- drivers/spi/spi.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 876d40d2c708..57b5e4488416 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -708,14 +708,6 @@ int spi_add_device(struct spi_device *spi) } EXPORT_SYMBOL_GPL(spi_add_device); -static int spi_add_device_locked(struct spi_device *spi) -{ - struct spi_controller *ctlr = spi->controller; - - WARN_ON(!mutex_is_locked(&ctlr->add_lock)); - return __spi_add_device(spi); -} - /** * spi_new_device - instantiate one new SPI device * @ctlr: Controller to which device is connected @@ -2417,11 +2409,12 @@ static void of_register_spi_devices(struct spi_controller *ctlr) { } struct spi_device *spi_new_ancillary_device(struct spi_device *spi, u8 chip_select) { + struct spi_controller *ctlr = spi->controller; struct spi_device *ancillary; int rc = 0; /* Alloc an spi_device */ - ancillary = spi_alloc_device(spi->controller); + ancillary = spi_alloc_device(ctlr); if (!ancillary) { rc = -ENOMEM; goto err_out; @@ -2436,8 +2429,10 @@ struct spi_device *spi_new_ancillary_device(struct spi_device *spi, ancillary->max_speed_hz = spi->max_speed_hz; ancillary->mode = spi->mode; + WARN_ON(!mutex_is_locked(&ctlr->add_lock)); + /* Register the new device */ - rc = spi_add_device_locked(ancillary); + rc = __spi_add_device(ancillary); if (rc) { dev_err(&spi->dev, "failed to register ancillary device\n"); goto err_out;