From patchwork Mon Dec 24 07:19:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Cochran X-Patchwork-Id: 1908191 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 135C7400EC for ; Mon, 24 Dec 2012 07:19:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752793Ab2LXHTZ (ORCPT ); Mon, 24 Dec 2012 02:19:25 -0500 Received: from mail-bk0-f51.google.com ([209.85.214.51]:41453 "EHLO mail-bk0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752682Ab2LXHTY (ORCPT ); Mon, 24 Dec 2012 02:19:24 -0500 Received: by mail-bk0-f51.google.com with SMTP id ik5so3237810bkc.38 for ; Sun, 23 Dec 2012 23:19:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:in-reply-to:references; bh=u6oVmRKZu5L7j0iCH/0/O6VHibgAh58/LbzElT6h9aM=; b=EB5qSdbog80KjlQ1itvgiwXDB944QopXgjQxGGS4aIZpssZvN33QzzQt04TzEzRfgG JMmzmKTPG5pGrOOfCa196FzwFZ1yHrju2Qu+z2kL2s4Pt26XLifseAHdFTNI6sGoqfIV 2kzDDHhJn0Um/dydOsods/G9n2GXKhuXeImKGq6e3oWXMGQjOXhWmHeLEFFBu/J36Cw0 G7NO7iYH4CIE5WuuDwDJa35K+EcaAsLktJ9QnARWWBckZmK/ZkK8UO3i8aMZJ7MNbGc1 nO61eSLXnarGnZJ7X3HDfoyGJBdP7QhATmuOmbZm5oSB0diTeKrwiMqErneHy7UGgVHv LeeQ== X-Received: by 10.204.9.139 with SMTP id l11mr9828118bkl.133.1356333562709; Sun, 23 Dec 2012 23:19:22 -0800 (PST) Received: from localhost.localdomain (089144206067.atnat0015.highway.a1.net. [89.144.206.67]) by mx.google.com with ESMTPS id 18sm14377645bkv.0.2012.12.23.23.19.20 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 23 Dec 2012 23:19:22 -0800 (PST) From: Richard Cochran To: Cc: , , David Miller , Cyril Chemparathy , Mugunthan V N , Sergei Shtylyov Subject: [PATCH v2 1/2] cpts: fix build error by removing useless code. Date: Mon, 24 Dec 2012 08:19:09 +0100 Message-Id: <2cc4445dc92ddadb69b3e2feb9d8de38727ea0d4.1356331925.git.richardcochran@gmail.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: References: In-Reply-To: References: Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org The cpts driver tries to obtain the input clock frequency by calling the clock's internal 'recalc' method. Since has been removed, this code can no longer compile. However, the driver never makes use of the frequency value, so this patch fixes the issue by removing the offending code altogether. Signed-off-by: Richard Cochran --- drivers/net/ethernet/ti/cpts.c | 1 - drivers/net/ethernet/ti/cpts.h | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/ti/cpts.c b/drivers/net/ethernet/ti/cpts.c index 5e62c1a..5ab8fb4 100644 --- a/drivers/net/ethernet/ti/cpts.c +++ b/drivers/net/ethernet/ti/cpts.c @@ -248,7 +248,6 @@ static void cpts_clk_init(struct cpts *cpts) return; } clk_enable(cpts->refclk); - cpts->freq = cpts->refclk->recalc(cpts->refclk); } static void cpts_clk_release(struct cpts *cpts) diff --git a/drivers/net/ethernet/ti/cpts.h b/drivers/net/ethernet/ti/cpts.h index e1bba3a..fe993cd 100644 --- a/drivers/net/ethernet/ti/cpts.h +++ b/drivers/net/ethernet/ti/cpts.h @@ -120,7 +120,6 @@ struct cpts { struct delayed_work overflow_work; int phc_index; struct clk *refclk; - unsigned long freq; struct list_head events; struct list_head pool; struct cpts_event pool_data[CPTS_MAX_EVENTS];