From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E5F0DC0650F for ; Thu, 8 Aug 2019 15:03:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B95FC217D7 for ; Thu, 8 Aug 2019 15:03:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="MX6wtxj/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732346AbfHHPD2 (ORCPT ); Thu, 8 Aug 2019 11:03:28 -0400 Received: from mail-lj1-f196.google.com ([209.85.208.196]:33853 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728289AbfHHPD2 (ORCPT ); Thu, 8 Aug 2019 11:03:28 -0400 Received: by mail-lj1-f196.google.com with SMTP id p17so89239314ljg.1 for ; Thu, 08 Aug 2019 08:03:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=mmnFZZttzNll6Mb5XmwQX5FbW4sfyb4MRTiyZMXbxWg=; b=MX6wtxj/Lge1vMMnI1h6iHZbUVKMELdiW/nhVQO5y0r1HlVIwEc4NbOIU2EJDo6wI3 fhlc1ud1ZYizA3b1dK+6vCSE07SJPfM/uu3F5wYCnkm+KcbuW4HEm25LTf1HNE70PTnR HT0FpUjDV+M10cwqHm48zWTMcBt0zCVl9r54YZ/5nAgwfP7zejGLSDiPCvZX1Y0jUiwr 8lRfvlYWYiFlS9TOo0ZZ55NvbPmzGRmcr8U/HQiVAhp4mHe6TZx4pIlJQXr4Zgc4SkJd EmxQBUdGX7bHKxW9IYbmxavMmwOeH5yrT7ljAOlseFZMODy/qghDQEkdeUr76Ilkb+IP y3zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=mmnFZZttzNll6Mb5XmwQX5FbW4sfyb4MRTiyZMXbxWg=; b=hx2td2GG8Q6i5LjNDyFgoR22UcerQvbt4Ikgw+QDfkTd9Da9hJkpm+p52z0stQhy4g Ondj5jaohQnl1awkoLEknxsAsMhPxT4y1jJY5MV6CXYTz+ALChHbkhfk5a68Jk0eTM4U B5i1KpHnxLpA3r5uLwk10R6qP8D2EVqoSb+3JTz3Xr39Dz4PQt5ITSAV8cLuP6P+lR57 Ouew1ZUbj2pf/mmINfOPURz3iSToVqzlX6GVpnuWfpg/xC5VrdM4KA7v3hTuuO6Srkog a7p4nkaIqVmHwbaJhIhA0rmPHOUaX1C915owoqtAx13R7zeWy+nDoyEU8rbG8+Bp0ZUk OHtA== X-Gm-Message-State: APjAAAVoYRJDg7siJL6vQpjvqy0wJ+Yf1XatRPqCQAMS7qZzL5km3ydz BhK7G6Q7MLNnHJl+U6It40jrag== X-Google-Smtp-Source: APXvYqx5jBVZ+U8o+QEk+Eln2jVbnq3YUSTLl/i/iei4yhxc/PRs4RRk4Wt1np88KOo1uQG5EfCh/g== X-Received: by 2002:a2e:890c:: with SMTP id d12mr8436882lji.103.1565276606115; Thu, 08 Aug 2019 08:03:26 -0700 (PDT) Received: from genomnajs.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id m28sm18845209ljb.68.2019.08.08.08.03.24 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 08 Aug 2019 08:03:24 -0700 (PDT) From: Linus Walleij To: Mark Brown , linux-spi@vger.kernel.org Cc: linux-gpio@vger.kernel.org, Bartosz Golaszewski , Linus Walleij Subject: [PATCH] spi: Rename of_spi_register_master() function Date: Thu, 8 Aug 2019 17:03:21 +0200 Message-Id: <20190808150321.23319-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Rename this function to of_spi_get_gpio_numbers() as this is what the function does, it does not register a master, it is called in the path of registering a master so the name is logical in a convoluted way, but it is better to follow Rusty Russell's ABI level no 7: "The obvious use is (probably) the correct one" Signed-off-by: Linus Walleij --- drivers/spi/spi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 75ac046cae52..79d7526e1337 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -2236,7 +2236,7 @@ struct spi_controller *__spi_alloc_controller(struct device *dev, EXPORT_SYMBOL_GPL(__spi_alloc_controller); #ifdef CONFIG_OF -static int of_spi_register_master(struct spi_controller *ctlr) +static int of_spi_get_gpio_numbers(struct spi_controller *ctlr) { int nb, i, *cs; struct device_node *np = ctlr->dev.of_node; @@ -2269,7 +2269,7 @@ static int of_spi_register_master(struct spi_controller *ctlr) return 0; } #else -static int of_spi_register_master(struct spi_controller *ctlr) +static int of_spi_get_gpio_numbers(struct spi_controller *ctlr) { return 0; } @@ -2456,7 +2456,7 @@ int spi_register_controller(struct spi_controller *ctlr) ctlr->mode_bits |= SPI_CS_HIGH; } else { /* Legacy code path for GPIOs from DT */ - status = of_spi_register_master(ctlr); + status = of_spi_get_gpio_numbers(ctlr); if (status) return status; } -- 2.21.0