From patchwork Thu Apr 25 13:59:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 1090838 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=resnulli.us Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b="btQxqI14"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44qf2Y3d8Fz9s9N for ; Fri, 26 Apr 2019 00:00:05 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727944AbfDYOAB (ORCPT ); Thu, 25 Apr 2019 10:00:01 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:41817 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726202AbfDYOAA (ORCPT ); Thu, 25 Apr 2019 10:00:00 -0400 Received: by mail-wr1-f66.google.com with SMTP id c12so24326003wrt.8 for ; Thu, 25 Apr 2019 06:59:59 -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=308qYGFLEvRGpntTTH2Hz1JYScV0gRNW9fNWDFXINbI=; b=btQxqI14mAOve+BpCwQtTw46F6Ahh/1Q+53iUTNgFNFb2gAX5yom+9edSRducnslaI q/yNKCe/HxspOdzq7IKwrxGGEBiCiqYwJR2B1MTSV35oRe3zdKryF8toL2gCvqwDt0CW oJmBC++OkRR4Ds3qQcol4v/z8ICUvI6BleE0gKQa9rGTeumzW9O+HnjSHKGBx7RNcy7b gcn/nNY2Ik+zCXCtBjijCF3QTbwtFnx81vMCczcTIT85yRwrTyU1PTVFuZLvYDoxwmXX MO5lJHxwugorDOt8QeuPm4n0dcGE3OS6oxeuh+fvqyLJxEsgEjrbiGzFlGQP8hUQeN5s ryuQ== 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=308qYGFLEvRGpntTTH2Hz1JYScV0gRNW9fNWDFXINbI=; b=H2tXaF6TDvWUwpDEY6bjdWq1NrXPR5v8ffspQ4sbxWc1fbBIWsFFjPPOQ4TO3CC3uE QpXwsX3lZVSrlJ1ZerUE5aG4AC+dZnu5/Jf6i0j44zQbQreh57D6gfsz5ZX8lxcqPLcM vGCdQa69DpsSEeePttG1qPKZ3DOmyXyLpUxz+qqFAdtVxMbUSxgAm2gULz1IdrOw9I+Q O1MEmG2YWe6e7+8iiIuA/+Qp0aUKE6i4U3/xFBLT+c3pIvOSpr/k4OV1BdnbLK2wqYAZ F0a9bPJLO8/yQOvjLTQ1/Vcq1zXBuRUAfwANxY1QOitp4GrhnKfOf6BQejdNmi2cybjx mltg== X-Gm-Message-State: APjAAAXjnUVbQ3IqSMQcxGzBUF9G1cLrNG6xutGe4QROEZQv4m9+ogI+ SePGtIl+UQcO4HTgq+oOwhXZJJE+gwE= X-Google-Smtp-Source: APXvYqx+3hf0b7cW0ngQZl9/AnLoJ/DWIB5abbRKvfANJM3Qly6/5pExPsZGZ5+eSgeM6SiwseDM2g== X-Received: by 2002:a5d:6988:: with SMTP id g8mr4729200wru.117.1556200798770; Thu, 25 Apr 2019 06:59:58 -0700 (PDT) Received: from localhost (jirka.pirko.cz. [84.16.102.26]) by smtp.gmail.com with ESMTPSA id x18sm25802744wrw.14.2019.04.25.06.59.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Apr 2019 06:59:58 -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 01/16] netdevsim: move device registration on bus to be done earlier in init Date: Thu, 25 Apr 2019 15:59:41 +0200 Message-Id: <20190425135956.3970-2-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 As a dependency of the subsequent patch, mode device registration to be done earlier, directly in nsim_newlink(). Signed-off-by: Jiri Pirko --- drivers/net/netdevsim/netdev.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/net/netdevsim/netdev.c b/drivers/net/netdevsim/netdev.c index 7805fa840383..6ac5447bca02 100644 --- a/drivers/net/netdevsim/netdev.c +++ b/drivers/net/netdevsim/netdev.c @@ -174,25 +174,14 @@ static int nsim_init(struct net_device *dev) if (err) goto err_debugfs_destroy; - ns->dev.id = nsim_dev_id++; - ns->dev.bus = &nsim_bus; - ns->dev.type = &nsim_dev_type; - err = device_register(&ns->dev); - if (err) - goto err_bpf_uninit; - - SET_NETDEV_DEV(dev, &ns->dev); - err = nsim_devlink_setup(ns); if (err) - goto err_unreg_dev; + goto err_bpf_uninit; nsim_ipsec_init(ns); return 0; -err_unreg_dev: - device_unregister(&ns->dev); err_bpf_uninit: nsim_bpf_uninit(ns); err_debugfs_destroy: @@ -514,11 +503,22 @@ static int nsim_newlink(struct net *src_net, struct net_device *dev, if (IS_ERR(ns->sdev)) return PTR_ERR(ns->sdev); - err = register_netdevice(dev); + ns->dev.id = nsim_dev_id++; + ns->dev.bus = &nsim_bus; + ns->dev.type = &nsim_dev_type; + err = device_register(&ns->dev); if (err) goto err_sdev_put; + + SET_NETDEV_DEV(dev, &ns->dev); + + err = register_netdevice(dev); + if (err) + goto err_unreg_dev; return 0; +err_unreg_dev: + device_unregister(&ns->dev); err_sdev_put: nsim_sdev_put(ns->sdev); return err;