From patchwork Thu Nov 17 16:40:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 696247 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3tKSzg5vZHz9t9b for ; Fri, 18 Nov 2016 04:39:11 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="CSacDpNx"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754815AbcKQRi7 (ORCPT ); Thu, 17 Nov 2016 12:38:59 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:34981 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751598AbcKQRiy (ORCPT ); Thu, 17 Nov 2016 12:38:54 -0500 Received: by mail-wm0-f66.google.com with SMTP id a20so23454515wme.2; Thu, 17 Nov 2016 09:38:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=qfaJsBJ6SlsEdVx/7hRG/GYLAKL4A2CnmQrMO31IZg0=; b=CSacDpNxoRnVPSLPpMA7ZT1cDTyxjK3tfBHM38PpsjQ9qFIonTOLjQJkmqdZYBnIhk OtteEMdNyLOd5PR9PBPvi00Y2gGI6RsxBvbeMFYztGpJ6UlHTFA+IhvltfI0RgVxZge8 Ns5DWvcblpt6fHTQvJ8BqabCvH1hMsyRY0qjzEjTxaEsbw169qw0Vtc6+y9q0ew1S+UL x239qh2DlRdmevthmgcTjGb1OHICZllssHp6lwaMPpPV/7ZYhsAvegAVNGoSJZ+AMJoV 8K4WLbOiGLeFBtBTvLPP1UEKfKetZKMwc93MZtEDNol3xEC9Uu0G32cWIkFM5zk03dmy Ge+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=qfaJsBJ6SlsEdVx/7hRG/GYLAKL4A2CnmQrMO31IZg0=; b=loXY2O4GUiDcgzFsr7P+7T2UPy8Ih0kuK/u8FUqp2VIk1feuYUpkgBqwlhKo3vZ/98 DGwav3CwVNKxyYoOt1eZFNw52HFq+CFy5UGa/u6+e+4atDZ5tMslSJhLhRk4vSs4NJGf H+NyREwKaFbO72fgkYmoB/IfKmY1JqgAbrx/Zex6QZoZCxVhIuF/+vZ/3uPV9UQQ0OaM p8oDpH1vB8cnt6CZMH+betq/8kKeVmPoAeN0Fw4r/HsPw41QO89N9T/jT4VNDNbe3jJF ldy88faxB8QSsAEPIGMfVLKz3NGtl8wL4icXb3H0rlYx1kW9b0/2bNrP5ihDMApxkazl CZmg== X-Gm-Message-State: AKaTC00YOpks6jPr4Iu52K/uE4sgQhYjvv39l6vU0aTSn6M6vP4N9FOSxeQJTn+LU7cEoQ== X-Received: by 10.46.69.69 with SMTP id s66mr1831686lja.71.1479400817634; Thu, 17 Nov 2016 08:40:17 -0800 (PST) Received: from xi.terra (c-04aadb54.07-184-6d6c6d4.cust.bredbandsbolaget.se. [84.219.170.4]) by smtp.gmail.com with ESMTPSA id e94sm974699lji.40.2016.11.17.08.40.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Nov 2016 08:40:15 -0800 (PST) Received: from johan by xi.terra with local (Exim 4.87) (envelope-from ) id 1c7PjU-0002Zu-IS; Thu, 17 Nov 2016 17:40:16 +0100 From: Johan Hovold To: Mugunthan V N Cc: Grygorii Strashko , linux-omap@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH net v2 4/7] net: ethernet: ti: cpsw: fix of_node and phydev leaks Date: Thu, 17 Nov 2016 17:40:01 +0100 Message-Id: <1479400804-9847-5-git-send-email-johan@kernel.org> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1479400804-9847-1-git-send-email-johan@kernel.org> References: <1479400804-9847-1-git-send-email-johan@kernel.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Make sure to drop references taken and deregister devices registered during probe on probe errors (including deferred probe) and driver unbind. Specifically, PHY of-node references were never released and fixed-link PHY devices were never deregistered. Fixes: 9e42f715264f ("drivers: net: cpsw: add phy-handle parsing") Fixes: 1f71e8c96fc6 ("drivers: net: cpsw: Add support for fixed-link PHY") Signed-off-by: Johan Hovold --- drivers/net/ethernet/ti/cpsw.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index 5d14abb06486..c3b78bc4fe58 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -2443,6 +2443,41 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data, static void cpsw_remove_dt(struct platform_device *pdev) { + struct net_device *ndev = platform_get_drvdata(pdev); + struct cpsw_common *cpsw = ndev_to_cpsw(ndev); + struct cpsw_platform_data *data = &cpsw->data; + struct device_node *node = pdev->dev.of_node; + struct device_node *slave_node; + int i = 0; + + for_each_available_child_of_node(node, slave_node) { + struct cpsw_slave_data *slave_data = &data->slave_data[i]; + + if (strcmp(slave_node->name, "slave")) + continue; + + if (of_phy_is_fixed_link(slave_node)) { + struct phy_device *phydev; + + phydev = of_phy_find_device(slave_node); + if (phydev) { + fixed_phy_unregister(phydev); + /* Put references taken by + * of_phy_find_device() and + * of_phy_register_fixed_link(). + */ + phy_device_free(phydev); + phy_device_free(phydev); + } + } + + of_node_put(slave_data->phy_node); + + i++; + if (i == data->slaves) + break; + } + of_platform_depopulate(&pdev->dev); }