From patchwork Mon Sep 26 11:09:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 12988659 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4FC2EC32771 for ; Mon, 26 Sep 2022 12:32:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239321AbiIZMcq (ORCPT ); Mon, 26 Sep 2022 08:32:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33936 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236865AbiIZMcN (ORCPT ); Mon, 26 Sep 2022 08:32:13 -0400 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3AE3CD8E1F for ; Mon, 26 Sep 2022 04:10:56 -0700 (PDT) Received: by mail-ej1-x62b.google.com with SMTP id nb11so13279665ejc.5 for ; Mon, 26 Sep 2022 04:10:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=wI7HrNRBO0d7dglUkU4iYvgRqefxDdj6o6r69HsSzz8=; b=W9RaSkLlrs36WEBXN/ckvIMaX7Zhs8hb0CRTNTkxRHCVMzICgRsxgFulJqn1O2TAm2 0S09n/3bFMN6GWAtykm6cqP4xTeN2nGv5p4Zknsr8Trwg1fzX6giSbOSwqMAxoFcJhp0 WAkO1de/zj68f0g+uBxoFCHkNUPS/kNHQFtKn001XOB7OPfpak/AkBylI/Ajs/Ug4SFw ZhkV8eBvrjYaA8AmIJeY0K07C3A87wjNIo/IFenMC5/m4UnbSbYsx0LY5m9IJ4kj4psF 9ubO92Dj8o0qvYpdONUsWA2EOa2OYQLaP+0x3wJSyztT+l9+lpZ7+CkfTo0yAFsQ4OLP 1vPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=wI7HrNRBO0d7dglUkU4iYvgRqefxDdj6o6r69HsSzz8=; b=XGUebFxLDLc52D/1jRrSLFXJKNF10HlqjgbBrPdX1YjP4E4p7RrpvtV995Ki5TVjpJ vBbYdfsm0bllYfmC/94jO9s1IXkIImm53m/r3fOVTbelNRZKCcuROjJ+MV72uw2APiD2 ZXMBf2O2IVutdWZxcIk/yAkO8F9OO+I77L3TXHkHUO19DKZ5nJgM5xmbBGXQE7dBNoPM lGIMnsRq8eNcw6ilXGYVmJPZj+Hf2kKFoyM+vglk9Yy8QRdREtBvW1MXvNtkFruG5dGB AkNbreLIhtk0Sw2J1cdURXNuLncvHfzjArMgBnNZtiq5zlaSzIz6JN1u/8RymYITop6j V2Cw== X-Gm-Message-State: ACrzQf1CZvjbpNLTh6wIXKVyrmfRmijNVFt3P2vVsBydyCN/QWAbmT/f PXkaadnCb1mRNEJHKxOJ9K7HCEf3kaVRsWcqNsI= X-Google-Smtp-Source: AMsMyM5/HBXehsaG1ccFSNmBAI12OhALHGotwKSUyKWaFKcd5RHg+Y+Q6CwDSxno1q+I5mX9nDdIlw== X-Received: by 2002:a17:906:845b:b0:770:86da:9702 with SMTP id e27-20020a170906845b00b0077086da9702mr17073179ejy.244.1664190581516; Mon, 26 Sep 2022 04:09:41 -0700 (PDT) Received: from localhost (host-213-179-129-39.customer.m-online.net. [213.179.129.39]) by smtp.gmail.com with ESMTPSA id f11-20020a056402068b00b004572df40700sm2880039edy.81.2022.09.26.04.09.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 04:09:41 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, dmichail@fungible.com, jesse.brandeburg@intel.com, anthony.l.nguyen@intel.com, snelson@pensando.io, drivers@pensando.io, f.fainelli@gmail.com, yangyingliang@huawei.com Subject: [patch net-next 1/3] funeth: unregister devlink port after netdevice unregister Date: Mon, 26 Sep 2022 13:09:36 +0200 Message-Id: <20220926110938.2800005-2-jiri@resnulli.us> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220926110938.2800005-1-jiri@resnulli.us> References: <20220926110938.2800005-1-jiri@resnulli.us> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Jiri Pirko Fix the order of destroy_netdev() flow and unregister the devlink port after calling unregister_netdev(). Signed-off-by: Jiri Pirko --- drivers/net/ethernet/fungible/funeth/funeth_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/fungible/funeth/funeth_main.c b/drivers/net/ethernet/fungible/funeth/funeth_main.c index b6de2ad82a32..6980455fb909 100644 --- a/drivers/net/ethernet/fungible/funeth/funeth_main.c +++ b/drivers/net/ethernet/fungible/funeth/funeth_main.c @@ -1829,8 +1829,8 @@ static void fun_destroy_netdev(struct net_device *netdev) fp = netdev_priv(netdev); devlink_port_type_clear(&fp->dl_port); - devlink_port_unregister(&fp->dl_port); unregister_netdev(netdev); + devlink_port_unregister(&fp->dl_port); fun_ktls_cleanup(fp); fun_free_stats_area(fp); fun_free_rss(fp); From patchwork Mon Sep 26 11:09:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 12988661 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 31335C32771 for ; Mon, 26 Sep 2022 12:32:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234694AbiIZMcs (ORCPT ); Mon, 26 Sep 2022 08:32:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33950 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237915AbiIZMcN (ORCPT ); Mon, 26 Sep 2022 08:32:13 -0400 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ADC29D98CD for ; Mon, 26 Sep 2022 04:10:58 -0700 (PDT) Received: by mail-ej1-x62a.google.com with SMTP id 13so13290860ejn.3 for ; Mon, 26 Sep 2022 04:10:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=wCtoNENIcVaIAAxqnqE2pnQR3bzcsl3wG7gZ1OCGir8=; b=vZJglMoRJphlFWUDNotdGAHMOBdIZZy0MY9ucyUv6VOwjAk6IDq7Er9EKenNn85jpS cSTuUCl9aKBevVdNCPu+jDAYAYcw1IOLCj2C6Fl0LSrZjAPIpJqDeavLFQnRIS6HmuTO dovsc47umZ2mu/W/pWPcQYlmj/ua7KI17mZNO76drHVD2Rs2q/3hW1dIjUNQLyyn9/cm 1ptJBG+hl+RpJ/lIBqUd6bM3xPCdAq6f8Jqbfs7YUWxVipiE496y1pcVMxrmP0PpY+zp qHawUMJIvkb0uZe5+0l+G/RoUE8y0qw3RTa6DK8p8KADMTsMbOSOP+zIfhjyOb3vnWo1 81MA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=wCtoNENIcVaIAAxqnqE2pnQR3bzcsl3wG7gZ1OCGir8=; b=CiOdpzNOk6SIsVdYIGOMwcmJ+BUamT1y/1XmXNaNff8/ZwI4DPTFKwLoeX4aZxb84z TdAgT5rUYn475W0j7Nkiod73MTkO6CJn52y6r5068tpxT/RIyH31agiLnJFvy4fNtzyo bpDRY9SSopdplTDNz+DFnlzKdj3LWuos1EdOCl5GW4j/PFkK0KaofxbourfTIue8K3sj vU/IGP2HA0Z/hdTU/s/xgGJBEsOhvElxU+F4IU1pJtSDX08KaY2UrE7gNx1l4h5+tWv6 whZ1aDZc2FdIJ8X7/PZMi7PfYwbga6vq4OQxndxzjl2/fUPs/dLPyrd/lG0XpaP7czSw E01A== X-Gm-Message-State: ACrzQf3gsTSocQpwiDdTFsWHFJwl8MWrg9L6/BSYySOcmCBDCGSp1+KL EXPAXIKJeYu59QzTMC14xOFZqRNaB3vFJJkkRzE= X-Google-Smtp-Source: AMsMyM4KmC5O21bX3YGbgxlmVFrG0Pta7osPlyqJq8AHNBoXl4qSLqKHDetouOSJ6agFrgAt4d/7RQ== X-Received: by 2002:a17:907:2bcf:b0:772:4b8e:6b29 with SMTP id gv15-20020a1709072bcf00b007724b8e6b29mr17112302ejc.412.1664190583221; Mon, 26 Sep 2022 04:09:43 -0700 (PDT) Received: from localhost (host-213-179-129-39.customer.m-online.net. [213.179.129.39]) by smtp.gmail.com with ESMTPSA id g6-20020a1709061c8600b00779a605c777sm8142164ejh.192.2022.09.26.04.09.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 04:09:42 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, dmichail@fungible.com, jesse.brandeburg@intel.com, anthony.l.nguyen@intel.com, snelson@pensando.io, drivers@pensando.io, f.fainelli@gmail.com, yangyingliang@huawei.com Subject: [patch net-next 2/3] ice: reorder PF/representor devlink port register/unregister flows Date: Mon, 26 Sep 2022 13:09:37 +0200 Message-Id: <20220926110938.2800005-3-jiri@resnulli.us> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220926110938.2800005-1-jiri@resnulli.us> References: <20220926110938.2800005-1-jiri@resnulli.us> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Jiri Pirko Make sure that netdevice is registered/unregistered while devlink port is registered. Signed-off-by: Jiri Pirko --- drivers/net/ethernet/intel/ice/ice_lib.c | 6 +++--- drivers/net/ethernet/intel/ice/ice_main.c | 12 ++++++------ drivers/net/ethernet/intel/ice/ice_repr.c | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c index 8a80da8e910e..938ba8c215cb 100644 --- a/drivers/net/ethernet/intel/ice/ice_lib.c +++ b/drivers/net/ethernet/intel/ice/ice_lib.c @@ -2988,9 +2988,6 @@ int ice_vsi_release(struct ice_vsi *vsi) clear_bit(ICE_VSI_NETDEV_REGISTERED, vsi->state); } - if (vsi->type == ICE_VSI_PF) - ice_devlink_destroy_pf_port(pf); - if (test_bit(ICE_FLAG_RSS_ENA, pf->flags)) ice_rss_clean(vsi); @@ -3048,6 +3045,9 @@ int ice_vsi_release(struct ice_vsi *vsi) } } + if (vsi->type == ICE_VSI_PF) + ice_devlink_destroy_pf_port(pf); + if (vsi->type == ICE_VSI_VF && vsi->agg_node && vsi->agg_node->valid) vsi->agg_node->num_vsis--; diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c index 0ccc8a750374..747f27c4e761 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c @@ -4599,6 +4599,10 @@ static int ice_register_netdev(struct ice_pf *pf) if (!vsi || !vsi->netdev) return -EIO; + err = ice_devlink_create_pf_port(pf); + if (err) + goto err_devlink_create; + err = register_netdev(vsi->netdev); if (err) goto err_register_netdev; @@ -4606,17 +4610,13 @@ static int ice_register_netdev(struct ice_pf *pf) set_bit(ICE_VSI_NETDEV_REGISTERED, vsi->state); netif_carrier_off(vsi->netdev); netif_tx_stop_all_queues(vsi->netdev); - err = ice_devlink_create_pf_port(pf); - if (err) - goto err_devlink_create; devlink_port_type_eth_set(&pf->devlink_port, vsi->netdev); return 0; -err_devlink_create: - unregister_netdev(vsi->netdev); - clear_bit(ICE_VSI_NETDEV_REGISTERED, vsi->state); err_register_netdev: + ice_devlink_destroy_pf_port(pf); +err_devlink_create: free_netdev(vsi->netdev); vsi->netdev = NULL; clear_bit(ICE_VSI_NETDEV_ALLOCD, vsi->state); diff --git a/drivers/net/ethernet/intel/ice/ice_repr.c b/drivers/net/ethernet/intel/ice/ice_repr.c index 0dac67cd9c77..bd31748aae1b 100644 --- a/drivers/net/ethernet/intel/ice/ice_repr.c +++ b/drivers/net/ethernet/intel/ice/ice_repr.c @@ -377,10 +377,10 @@ static void ice_repr_rem(struct ice_vf *vf) if (!vf->repr) return; - ice_devlink_destroy_vf_port(vf); kfree(vf->repr->q_vector); vf->repr->q_vector = NULL; unregister_netdev(vf->repr->netdev); + ice_devlink_destroy_vf_port(vf); free_netdev(vf->repr->netdev); vf->repr->netdev = NULL; #ifdef CONFIG_ICE_SWITCHDEV From patchwork Mon Sep 26 11:09:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 12988662 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A7F95C07E9D for ; Mon, 26 Sep 2022 12:33:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235599AbiIZMdC (ORCPT ); Mon, 26 Sep 2022 08:33:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45278 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236254AbiIZMcb (ORCPT ); Mon, 26 Sep 2022 08:32:31 -0400 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 552B1D98E3 for ; Mon, 26 Sep 2022 04:10:59 -0700 (PDT) Received: by mail-ej1-x634.google.com with SMTP id l14so13256627eja.7 for ; Mon, 26 Sep 2022 04:10:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=h2V8ELpIryQAbY8td0umQBuSPCmA0EOhyDXgC3lIzTw=; b=peKu1oV8oTIf9doG2i9KFDQc938nS8IXqQyUxoIizPbvdSWmyKTfOXmwtwh/ByIgzW JWX/ifpkouDtc5cQpynP+ilDAgNxJqmwn4m+gkNwVR6vrq5v6b+qTSfFRMV4i7h85ucW qLaseo49qzcDhrYqF6M/fs1yFh5soL9c8uKEmtLAWsy3XNm3aJOFUvBJycVCi+NrARmA c3KEWUcxEGtKKPkRJLaG3GxPFc0eSx1gUinZJrT6zkCuTgsnC6CWsGyZaq16U+nf07cK 4KCgIop2rH5D83kGy6mNDHeaNiuweWpvXeBwxwWML4hUGq9Y8NdUclnS8eji8vG9eg8x a/7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=h2V8ELpIryQAbY8td0umQBuSPCmA0EOhyDXgC3lIzTw=; b=LzUXfFP/kETd+HbUn3cdbFcY8NHeuqx7jsu9SKHOtOj1KgcxIp1qV7DyjOCPT1cl1A 2kIldWk1jf0I0o5pYkc9WhFxvyQT3AAjtXVbMsYyjg/jCQYBoxL+HoGEcSbP0JmzepQy VvwDoK/CINzNi9t5N0r3/fPGqbSSdyNfuzJZBtslgo2/T8N/Bgwy6B/Qw1rSSgaqEB4X YIjwOxfRJU5k4lP1gOI3K2Idma6fnJ9WIb9b7Nh+OEgTd9zEJBY4RufDdGjGXumIfqp7 4nod7IXlxiowJp7aS1H2MkfysUdXVfz8sAq4eTUJ/pRaOhRn2ZQkiWCfSNLXqhNV85eP k+IQ== X-Gm-Message-State: ACrzQf2SMcmM3KHwH/5UUc0cX5ruCjC5/2p0qC9pXNr0a5ntPWfN6cJf SjeGV9HfMngKsIKk1XxsLlxN5eCCQN6U0qqiN5Q= X-Google-Smtp-Source: AMsMyM5tDRgkg/VtM3mMlwLRXjJp85U1qhXaEzfMR3szfPyoX8t9j/7n330yxbttBd5IYd0J/tU3LQ== X-Received: by 2002:a17:907:3d94:b0:782:60bc:c896 with SMTP id he20-20020a1709073d9400b0078260bcc896mr16828319ejc.701.1664190584784; Mon, 26 Sep 2022 04:09:44 -0700 (PDT) Received: from localhost (host-213-179-129-39.customer.m-online.net. [213.179.129.39]) by smtp.gmail.com with ESMTPSA id r5-20020aa7cb85000000b0045467008dd0sm11219185edt.35.2022.09.26.04.09.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 04:09:44 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, dmichail@fungible.com, jesse.brandeburg@intel.com, anthony.l.nguyen@intel.com, snelson@pensando.io, drivers@pensando.io, f.fainelli@gmail.com, yangyingliang@huawei.com Subject: [patch net-next 3/3] ionic: change order of devlink port register and netdev register Date: Mon, 26 Sep 2022 13:09:38 +0200 Message-Id: <20220926110938.2800005-4-jiri@resnulli.us> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220926110938.2800005-1-jiri@resnulli.us> References: <20220926110938.2800005-1-jiri@resnulli.us> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Jiri Pirko Make sure that devlink port is registered first and register netdev after. Unregister netdev before devlnk port unregister. Signed-off-by: Jiri Pirko Acked-by: Shannon Nelson --- .../net/ethernet/pensando/ionic/ionic_bus_pci.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c b/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c index 0a7a757494bc..ce436e97324a 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c @@ -320,16 +320,16 @@ static int ionic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) dev_err(dev, "Cannot enable existing VFs: %d\n", err); } - err = ionic_lif_register(ionic->lif); + err = ionic_devlink_register(ionic); if (err) { - dev_err(dev, "Cannot register LIF: %d, aborting\n", err); + dev_err(dev, "Cannot register devlink: %d\n", err); goto err_out_deinit_lifs; } - err = ionic_devlink_register(ionic); + err = ionic_lif_register(ionic->lif); if (err) { - dev_err(dev, "Cannot register devlink: %d\n", err); - goto err_out_deregister_lifs; + dev_err(dev, "Cannot register LIF: %d, aborting\n", err); + goto err_out_deregister_devlink; } mod_timer(&ionic->watchdog_timer, @@ -337,8 +337,8 @@ static int ionic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) return 0; -err_out_deregister_lifs: - ionic_lif_unregister(ionic->lif); +err_out_deregister_devlink: + ionic_devlink_unregister(ionic); err_out_deinit_lifs: ionic_vf_dealloc(ionic); ionic_lif_deinit(ionic->lif); @@ -380,8 +380,8 @@ static void ionic_remove(struct pci_dev *pdev) del_timer_sync(&ionic->watchdog_timer); if (ionic->lif) { - ionic_devlink_unregister(ionic); ionic_lif_unregister(ionic->lif); + ionic_devlink_unregister(ionic); ionic_lif_deinit(ionic->lif); ionic_lif_free(ionic->lif); ionic->lif = NULL;