Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753342AbdIFL1P (ORCPT ); Wed, 6 Sep 2017 07:27:15 -0400 Received: from mail-pf0-f178.google.com ([209.85.192.178]:34655 "EHLO mail-pf0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752917AbdIFL1M (ORCPT ); Wed, 6 Sep 2017 07:27:12 -0400 X-Google-Smtp-Source: ADKCNb4IxRJPQvqRrWoUfYkb0MvWaOlXxCV+W2R4SeukdCTiVJZ+1uCCUXd/1MV4PgbHShnNkoLNcA== From: Baolin Wang To: broonie@kernel.org Cc: linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, baolin.wang@linaro.org Subject: [PATCH] spi: Use ida to manage SPI bus number Date: Wed, 6 Sep 2017 19:26:51 +0800 Message-Id: <2a15b398a8f8d3f6f46f9fd6e8591242d29c44a2.1504697026.git.baolin.wang@linaro.org> X-Mailer: git-send-email 1.7.9.5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2459 Lines: 77 This patch adds one static ida variable to manage SPI bus number, moreover we can get dynamic bus number from ida instead of one "dynamic" IDs, which can be removed. Signed-off-by: Baolin Wang --- drivers/spi/spi.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 4fcbb0a..1498be2 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -40,10 +40,13 @@ #include #include #include +#include #define CREATE_TRACE_POINTS #include +static DEFINE_IDA(spi_bus_ida); + static void spidev_release(struct device *dev) { struct spi_device *spi = to_spi_device(dev); @@ -2052,7 +2055,6 @@ static int of_spi_register_master(struct spi_controller *ctlr) */ int spi_register_controller(struct spi_controller *ctlr) { - static atomic_t dyn_bus_id = ATOMIC_INIT((1<<15) - 1); struct device *dev = ctlr->dev.parent; struct boardinfo *bi; int status = -ENODEV; @@ -2076,12 +2078,15 @@ int spi_register_controller(struct spi_controller *ctlr) if ((ctlr->bus_num < 0) && ctlr->dev.of_node) ctlr->bus_num = of_alias_get_id(ctlr->dev.of_node, "spi"); - /* convention: dynamically assigned bus IDs count down from the max */ + if (ctlr->bus_num >= 0) + ctlr->bus_num = ida_simple_get(&spi_bus_ida, ctlr->bus_num, + ctlr->bus_num + 1, GFP_KERNEL); + if (ctlr->bus_num < 0) { - /* FIXME switch to an IDR based scheme, something like - * I2C now uses, so we can't run out of "dynamic" IDs - */ - ctlr->bus_num = atomic_dec_return(&dyn_bus_id); + ctlr->bus_num = ida_simple_get(&spi_bus_ida, 0, 0, GFP_KERNEL); + if (ctlr->bus_num < 0) + return ctlr->bus_num; + dynamic = 1; } @@ -2128,7 +2133,10 @@ int spi_register_controller(struct spi_controller *ctlr) /* Register devices from the device tree and ACPI */ of_register_spi_devices(ctlr); acpi_register_spi_devices(ctlr); + + return 0; done: + ida_simple_remove(&spi_bus_ida, ctlr->bus_num); return status; } EXPORT_SYMBOL_GPL(spi_register_controller); @@ -2202,6 +2210,7 @@ void spi_unregister_controller(struct spi_controller *ctlr) list_del(&ctlr->list); mutex_unlock(&board_lock); + ida_simple_remove(&spi_bus_ida, ctlr->bus_num); dummy = device_for_each_child(&ctlr->dev, NULL, __unregister); device_unregister(&ctlr->dev); } -- 1.7.9.5