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.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 E139EC43218 for ; Thu, 25 Apr 2019 14:00:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C81B7206BA for ; Thu, 25 Apr 2019 14:00:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b="Jij/M/um" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729290AbfDYOAc (ORCPT ); Thu, 25 Apr 2019 10:00:32 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:56131 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728656AbfDYOAI (ORCPT ); Thu, 25 Apr 2019 10:00:08 -0400 Received: by mail-wm1-f67.google.com with SMTP id o25so9417035wmf.5 for ; Thu, 25 Apr 2019 07:00:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9DEf2+/eJxdJJU+ovxmpQMK1t6ycwFEqzXXJsV2XCB4=; b=Jij/M/umMKImakg2JhOet5RDHpte8UpPTu6OxtnnlZCGZC0OYYDMfxrux+K/JlRiQe A7n7Ow3XlsGiE+2qo4Z2yiCsRwAlmoroqrYd4AedaZjFcsVgiS6c+WAEuAtBxH9KT5qV EBmsy5YI5KZL6d2yqcqaEmfXL+Y1BGPRSTkYDwH2ZrnVCJsTi3aXN3lOYQs2Ikx4Oobc mlKs+oamtDR2ESeWzkdj6TQx7uNr07vEqJsAZSQzTf7DpzsitVmdVO+XSnwQh3cjOdjP bVADMh83rKIY+Ji12+ztx5v5AZLCoTXLAicu9YtgFie7inL4RER7zLxRNrA4Fireicxk vBkw== 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:in-reply-to :references; bh=9DEf2+/eJxdJJU+ovxmpQMK1t6ycwFEqzXXJsV2XCB4=; b=LIshDCNpO3C9mdxTv8gw7xDG2YngzBJv85Kut7gdwo7yDkXEdR3/43EJ5WWAMfuv5i WXcZd64r3oxhrtDvN//lGucH+eLn6SwkWXe5/+G6/PmVGEqmuAu3jaqudsOmkjytAvKI CLfvQieR7qCTKCyDJmPQpXbXblN4aJO8Ka2CXqZl/DIcDQuCdf6ApHzgjRZLj5PFgf56 z8fB6/V5QYH8s+vE8xvK46Rt11ga5xasYa7Ngmbx4aysmZ0tHC0WH/eSt/kT6sh3fEjP KMipa/JGNXbd98F21TQoxq2Hmylj4AKVFs31VG6ON55w6jzkFUNPPKqjHemIbQSDtRt3 zitw== X-Gm-Message-State: APjAAAWAYjygf5X4rLU/Z2qJ2I490vC1BZVsR2cXYtP+eLY9/hKpgVkv j9QODve9idZDsWFXNXOSm+pNvykILx8= X-Google-Smtp-Source: APXvYqz4gINZyTVXvOa6yeasrEhbp3/2sOHvIeOoqOUoADaeqb7FNGnXf0wUgLcdwEih+1lK/9mmdQ== X-Received: by 2002:a1c:f20e:: with SMTP id s14mr3407349wmc.93.1556200806094; Thu, 25 Apr 2019 07:00:06 -0700 (PDT) Received: from localhost (jirka.pirko.cz. [84.16.102.26]) by smtp.gmail.com with ESMTPSA id s2sm18779372wmc.7.2019.04.25.07.00.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Apr 2019 07:00:05 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, mlxsw@mellanox.com, jakub.kicinski@netronome.com, dsahern@gmail.com Subject: [patch net-next v4 07/16] netdevsim: use ida for bus device ids Date: Thu, 25 Apr 2019 15:59:47 +0200 Message-Id: <20190425135956.3970-8-jiri@resnulli.us> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190425135956.3970-1-jiri@resnulli.us> References: <20190425135956.3970-1-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko Instead of increments of u32 value, use ida to manage bus device ids. Signed-off-by: Jiri Pirko --- drivers/net/netdevsim/bus.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/net/netdevsim/bus.c b/drivers/net/netdevsim/bus.c index 5b5a9b0831a9..c50c5ea90555 100644 --- a/drivers/net/netdevsim/bus.c +++ b/drivers/net/netdevsim/bus.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include @@ -11,7 +12,7 @@ #include "netdevsim.h" -static u32 nsim_bus_dev_id; +static DEFINE_IDA(nsim_bus_dev_ids); static struct nsim_bus_dev *to_nsim_bus_dev(struct device *dev) { @@ -134,14 +135,19 @@ struct nsim_bus_dev *nsim_bus_dev_new(void) if (!nsim_bus_dev) return ERR_PTR(-ENOMEM); - nsim_bus_dev->dev.id = nsim_bus_dev_id++; + err = ida_alloc(&nsim_bus_dev_ids, GFP_KERNEL); + if (err < 0) + goto err_nsim_bus_dev_free; + nsim_bus_dev->dev.id = err; nsim_bus_dev->dev.bus = &nsim_bus; nsim_bus_dev->dev.type = &nsim_bus_dev_type; err = device_register(&nsim_bus_dev->dev); if (err) - goto err_nsim_bus_dev_free; + goto err_nsim_bus_dev_id_free; return nsim_bus_dev; +err_nsim_bus_dev_id_free: + ida_free(&nsim_bus_dev_ids, nsim_bus_dev->dev.id); err_nsim_bus_dev_free: kfree(nsim_bus_dev); return ERR_PTR(err); @@ -150,6 +156,7 @@ struct nsim_bus_dev *nsim_bus_dev_new(void) void nsim_bus_dev_del(struct nsim_bus_dev *nsim_bus_dev) { device_unregister(&nsim_bus_dev->dev); + ida_free(&nsim_bus_dev_ids, nsim_bus_dev->dev.id); kfree(nsim_bus_dev); } -- 2.17.2