From patchwork Tue Jul 11 17:17:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 118673 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:6406:b0:135:48c7:ea9a with SMTP id f6csp3276118rwh; Tue, 11 Jul 2023 10:29:38 -0700 (PDT) X-Google-Smtp-Source: APBJJlEIaHyy23GvmRb0GR5AkPYKuNcxzCC+ezocFRZ93S2QLyOErM5od4zbLxEmAWLIsjM9eKWQ X-Received: by 2002:a05:6a00:1a93:b0:682:edbe:4cbd with SMTP id e19-20020a056a001a9300b00682edbe4cbdmr12155683pfv.15.1689096578088; Tue, 11 Jul 2023 10:29:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689096578; cv=none; d=google.com; s=arc-20160816; b=LVMBPclhhwv+z35OYy4apc8EcilB43vcRDOygF7xtbQRQoO1GACzM3mq/IO0x+KMZk 4/liMGodlAwG4H9WkrHwvs/EkkOVCpMLXFX1V5QzDyOqEnMaT4a313V7IuKcJaoopTE4 4wfYi15J03xxNOnCp70bW5omcijlkvNdl+T6o5I6yZfgyh5a4UJBKY41F2MvdeUlfkxn LTDhUO/o9b+paVTSkZQffGRIp7xU2bzdIQxN2SLMDDkwD9RLzUetKE1sLs1SR0vpWHAT QZUL65aDvVF7WSrSOBI4JMtLdjEqUp4cjAX5ZbGRQgwumaNnxn8yrcmgJmwDulWrXsMP dyBg== 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=9m7mEkcyCzIIQX9iIIrHOAD6Py4ts/XqTbXDxLK5m3k=; fh=1nNdhl7R87shz8NR0wsonZRuXIWFIMAGTVMiI+iZ2Fo=; b=kbWFdj9K2QVL8ysTBu6TGjdnVt+rAm4tVVyS5BNpMuWipv2TA2XD9DckrrzZg13GVT cJLxSCDTlnh8LKNITe0cKuFqou3s5XrdrMiKa0L4rqX0NrX9dVubzT9zLR7RabQZGsAl m96S582SyyWntendx4oA8yG4vlGDzyvg9A3THNHCEXy6uDd4LV7wkQY7+RL0OsDjc4ac AhyEfDDfhwqlILCBFR+XtK3Z+YOwpkDZCKp+eQyiXcLLAcj1FjUUbx0Ocu3N0zAgLUWo SCxXtizF/au/U5d1gyPIYqReACDwZsN5pJO6EOp4bryjOC/cHx94kc6g4cxQk8Px/DBV zTCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=DSY1Sox5; 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 s10-20020a056a00194a00b0068224c12950si1804512pfk.64.2023.07.11.10.29.25; Tue, 11 Jul 2023 10:29:38 -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=DSY1Sox5; 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 S231931AbjGKRSD (ORCPT + 99 others); Tue, 11 Jul 2023 13:18:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230525AbjGKRR5 (ORCPT ); Tue, 11 Jul 2023 13:17:57 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8894CF9; Tue, 11 Jul 2023 10:17:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689095876; x=1720631876; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=30sabh/p1/O/QZ5qTRNNcuYMznetHRhsRBrUeoewA/U=; b=DSY1Sox5JfyJNy5NgReIMQeBL4KH6VBuIx7+UXSNip8v+PA7/qXuOfNC 8YF+vu6h3fxJkq0KnggwYtfI5bPQDEWS1GnHMkmN8FaEG5hZ0i5zlUZNY FNeFtwqAkOl5XdGUc3OE+ImZcAcv/WtuAB3k3EoIQTIomIHODFiY1yfOZ aqcCNM/nJ9OU0JJbbLJAHb+zwguzDZ8xzfJ9JwefFu9R17e/+ICPbftiR rF4tcAeksXDobAiKyX+EUH+1KPa+tCGivz+WCgYKyRk2TZlnFsSxeYb6x paGEGp3SIAV4sP71J5bc90BB2W+9iaab750iy0qHjEcHi6NBue4Z2T3uD A==; X-IronPort-AV: E=McAfee;i="6600,9927,10768"; a="451044971" X-IronPort-AV: E=Sophos;i="6.01,197,1684825200"; d="scan'208";a="451044971" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jul 2023 10:17:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10768"; a="698501338" X-IronPort-AV: E=Sophos;i="6.01,197,1684825200"; d="scan'208";a="698501338" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga006.jf.intel.com with ESMTP; 11 Jul 2023 10:17:53 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 0ED90F7; 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 01/14] spi: Remove unneeded OF node NULL checks Date: Tue, 11 Jul 2023 20:17:43 +0300 Message-Id: <20230711171756.86736-2-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: 1771146133868474156 X-GMAIL-MSGID: 1771146133868474156 In the couple of places the NULL check of OF node is implied by the call that takes it as a parameter. Drop the respective duplicate checks. Signed-off-by: Andy Shevchenko Reviewed-by: AngeloGioacchino Del Regno # MediaTek --- drivers/spi/spi.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 9291b2a0e887..8f3282a71c63 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -2399,9 +2399,6 @@ static void of_register_spi_devices(struct spi_controller *ctlr) struct spi_device *spi; struct device_node *nc; - if (!ctlr->dev.of_node) - return; - for_each_available_child_of_node(ctlr->dev.of_node, nc) { if (of_node_test_and_set_flag(nc, OF_POPULATED)) continue; @@ -3134,7 +3131,7 @@ int spi_register_controller(struct spi_controller *ctlr) if (WARN(id < 0, "couldn't get idr")) return id == -ENOSPC ? -EBUSY : id; ctlr->bus_num = id; - } else if (ctlr->dev.of_node) { + } else { /* Allocate dynamic bus number using Linux idr */ id = of_alias_get_id(ctlr->dev.of_node, "spi"); if (id >= 0) {