From patchwork Sun Mar 16 15:36:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benedikt Spranger X-Patchwork-Id: 330713 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 ABC062C00AC for ; Mon, 17 Mar 2014 02:37:01 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752878AbaCPPgw (ORCPT ); Sun, 16 Mar 2014 11:36:52 -0400 Received: from www.linutronix.de ([62.245.132.108]:40195 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751122AbaCPPgv (ORCPT ); Sun, 16 Mar 2014 11:36:51 -0400 Received: from p5492f2a9.dip0.t-ipconnect.de ([84.146.242.169] helo=mitra.tec.linutronix.de ident=mdkuser) by Galois.linutronix.de with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA256:128) (Exim 4.80) (envelope-from ) id 1WPD7I-0003qE-Dq; Sun, 16 Mar 2014 16:36:48 +0100 From: Benedikt Spranger To: netdev@vger.kernel.org Cc: tglx@linutronix.de, Mugunthan V N , Felipe Balbi , "David S. Miller" , Benedikt Spranger Subject: [PATCH] net: cpsw: do not register cpts twice Date: Sun, 16 Mar 2014 16:36:29 +0100 Message-Id: <1394984189-1659-2-git-send-email-b.spranger@linutronix.de> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1394984189-1659-1-git-send-email-b.spranger@linutronix.de> References: <1394984189-1659-1-git-send-email-b.spranger@linutronix.de> X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1, SHORTCIRCUIT=-0.0001 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org commit f280e89a (drivers: net: cpsw: fix for cpsw crash when build as modules) moved cpts_register()/cpts_unregister() to ndo_open()/ndo_stop(), but failed to remove cpts_register in cpsw_probe() which leads to a double registration and the following debug object splat. [ 18.991902] ODEBUG: init active (active state 0) object type: timer_list hint: delayed_work_timer_fn+0x0/0x2c [ 19.082249] [] (init_timer_key) from [] (cpts_register+0x1f0/0x2c4) [ 19.090642] [] (cpts_register) from [] (cpsw_ndo_open+0x780/0x81c) [ 19.098948] [] (cpsw_ndo_open) from [] (__dev_open+0xb4/0x118) Signed-off-by: Benedikt Spranger --- drivers/net/ethernet/ti/cpsw.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index ffd4d12..7d6d8ec 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -2229,10 +2229,6 @@ static int cpsw_probe(struct platform_device *pdev) goto clean_ale_ret; } - if (cpts_register(&pdev->dev, priv->cpts, - data->cpts_clock_mult, data->cpts_clock_shift)) - dev_err(priv->dev, "error registering cpts device\n"); - cpsw_notice(priv, probe, "initialized device (regs %pa, irq %d)\n", &ss_res->start, ndev->irq);