From patchwork Fri Jul 14 09:17:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 120364 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp2380143vqm; Fri, 14 Jul 2023 02:32:47 -0700 (PDT) X-Google-Smtp-Source: APBJJlGguN6s20LaJiZOve1sE9lMfNe1mkOiHQTIgvEUvykwOQskb5UYDtARnO49nxdQyXGEonl/ X-Received: by 2002:a05:6402:1241:b0:51e:65d:1f6c with SMTP id l1-20020a056402124100b0051e065d1f6cmr4156923edw.9.1689327167175; Fri, 14 Jul 2023 02:32:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689327167; cv=none; d=google.com; s=arc-20160816; b=Vg/89neKp2WW6jcrjom2lIiDi0wmJgQ4at7HcDgGi/wdrODQ4ennB8hIAvS6g3wWCq qUYxRMPkZ/ieiSE8f0lPmHfdJOYEn239BtP/B8fzb4ZT+rjs92DkTQhwNDxOosyMGZoo /dxBPTgEG4LBNZvMCB14S1Jj5ANg2Ps2q1xa6mGlKD2rUKHAfEjkvrycJUS9SpLla070 g2AjnXY0HIP5PhndqtdZ0aDIymOC4wTJRhfavN+NUQYt9OoxydpA/PQpcYcXTTS754Er /u7kOAd5o/kcAsvnFKINQol8gTWyP11MVgvU4+J58vk/a81Zr7zSNGdzmebrv3+6snwJ Btog== 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=fNa5pHhXEGjXBVAhmAXqVo7yzFHoaDvN8UJPS/g1Gnk=; fh=Qdz9kbAdPAfvhj/swQYvX2BMbB6C1mb3M8cD7Q9tvzc=; b=RUsbeQZvxp3xlJGhI0xx+mEHw7lofvy4ZHOcN94qNS9ua41vA7qwZwPyEY1Lwp6oKV LmjJZlLCU96Cblm/ed64Pr4ScJP+Fo04h0BFcKECN7qgu84gkWX1e3Y2WpzYnNEykD2Z XF8sVgRqDJYSLpzRz8h5QEUcr9y0B6asHA4FFEoqvgg+zL5ecTygEfL/PHAokMU09ux2 KZS2eFaG0kNI3T8NKTS7imSFVmq4anQ00Fdh/dwvNVBSiMX+3VNbNWOnYpvwbsvdjlrr s5GByVhvMJ5oTGk2JFjDciLmYt8ulXLqABoSdyDbnBoKSPUJqCASKMpLwVlfzMVjYY9c vXpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=MCARfTwU; 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 bf22-20020a0564021a5600b0051fee9567b3si3935417edb.300.2023.07.14.02.32.23; Fri, 14 Jul 2023 02:32:47 -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=MCARfTwU; 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 S235819AbjGNJS3 (ORCPT + 99 others); Fri, 14 Jul 2023 05:18:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47390 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235801AbjGNJSV (ORCPT ); Fri, 14 Jul 2023 05:18:21 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A1952D51; Fri, 14 Jul 2023 02:18:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689326298; x=1720862298; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=zN+eDH4bSonahOLd7oZfC6x/CMBxwEXOjKeHROeGChE=; b=MCARfTwUMLBcCdiH7djCuTtadkbhmKboMsBdn2zWSFV+QkPQRm8P5fGQ b1V8mc9jZ8mesR9GgKUMjHcZYxzlrXqfpT7j/il4JCQo8UxNcP0YYq/mO tY5fc7NhbZNtFP6+m/HMXl1MzSZ+DUbzeBYzdUffy03LJxcM5x/7FS/ZY 1+RCY0Rz7Hm6PozBmPgTiHJV0pI16y1sBeRPBXul0AoUr8nlKfJpfq7Yj l/xrXShiytF/aQULn8m9NlmDd/gFj/qro/M/e4PxFPyQ4id0c25iQPJKw dODWp2Azc6tR3o2DB6BYYNuBl+1hmSd8GXie9iENRPTePdXttdINJghXa A==; X-IronPort-AV: E=McAfee;i="6600,9927,10770"; a="365468998" X-IronPort-AV: E=Sophos;i="6.01,204,1684825200"; d="scan'208";a="365468998" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2023 02:17:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10770"; a="716281742" X-IronPort-AV: E=Sophos;i="6.01,204,1684825200"; d="scan'208";a="716281742" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga007.jf.intel.com with ESMTP; 14 Jul 2023 02:17:44 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 93C71385; Fri, 14 Jul 2023 12:17:50 +0300 (EEST) From: Andy Shevchenko To: Mark Brown , Andy Shevchenko , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Sebastian Reichel Subject: [PATCH v4 2/4] spi: Kill spi_add_device_locked() Date: Fri, 14 Jul 2023 12:17:46 +0300 Message-Id: <20230714091748.89681-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230714091748.89681-1-andriy.shevchenko@linux.intel.com> References: <20230714091748.89681-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,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: 1771387923730504861 X-GMAIL-MSGID: 1771387923730504861 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 8e70f4183e62..05f702339182 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;