From f493f8f982906fe7f3ce01dc3a3eb10009d36f60 Mon Sep 17 00:00:00 2001 From: Richard Cochran Date: Sun, 23 Dec 2012 21:19:09 +0000 Subject: [PATCH] --- yaml --- r: 348022 b: refs/heads/master c: cbc44dbe1fc5df0959bf075405dcef07989fed37 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/ti/cpts.c | 1 - trunk/drivers/net/ethernet/ti/cpts.h | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 98718634e4a2..31bf867eb1b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 143cdd8f33909ff5a153e3f02048738c5964ba26 +refs/heads/master: cbc44dbe1fc5df0959bf075405dcef07989fed37 diff --git a/trunk/drivers/net/ethernet/ti/cpts.c b/trunk/drivers/net/ethernet/ti/cpts.c index 5e62c1aeeffb..5ab8fb4037fa 100644 --- a/trunk/drivers/net/ethernet/ti/cpts.c +++ b/trunk/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/trunk/drivers/net/ethernet/ti/cpts.h b/trunk/drivers/net/ethernet/ti/cpts.h index e1bba3a496b2..fe993cdd7e23 100644 --- a/trunk/drivers/net/ethernet/ti/cpts.h +++ b/trunk/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];