summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Cochran <richardcochran@gmail.com>2012-12-23 21:19:09 +0000
committerDavid S. Miller <davem@davemloft.net>2012-12-26 14:15:09 -0800
commitcbc44dbe1fc5df0959bf075405dcef07989fed37 (patch)
treeb56613a3b5eb22ad90961c53c7cc5ba9addff6c3
parent143cdd8f33909ff5a153e3f02048738c5964ba26 (diff)
downloadlinux-3.10-cbc44dbe1fc5df0959bf075405dcef07989fed37.tar.gz
linux-3.10-cbc44dbe1fc5df0959bf075405dcef07989fed37.tar.bz2
linux-3.10-cbc44dbe1fc5df0959bf075405dcef07989fed37.zip
cpts: fix build error by removing useless code.
The cpts driver tries to obtain the input clock frequency by calling the clock's internal 'recalc' method. Since <plat/clock.h> 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 <richardcochran@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/ti/cpts.c1
-rw-r--r--drivers/net/ethernet/ti/cpts.h1
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ethernet/ti/cpts.c b/drivers/net/ethernet/ti/cpts.c
index 5e62c1aeeff..5ab8fb4037f 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 e1bba3a496b..fe993cdd7e2 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];