From patchwork Sat Dec 22 19:41:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Cochran X-Patchwork-Id: 1906281 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 F17623FC64 for ; Sat, 22 Dec 2012 19:41:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752127Ab2LVTl2 (ORCPT ); Sat, 22 Dec 2012 14:41:28 -0500 Received: from mail-bk0-f48.google.com ([209.85.214.48]:43238 "EHLO mail-bk0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751034Ab2LVTl1 (ORCPT ); Sat, 22 Dec 2012 14:41:27 -0500 Received: by mail-bk0-f48.google.com with SMTP id jc3so2928127bkc.35 for ; Sat, 22 Dec 2012 11:41:25 -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=dkeE2UA3ZnI7U5lOAeDcrHx7w5z7wEoshsuIwTKaNAlgf0uYVWdhs1UycnXIOySc3/ sAHFbMQSsEt3scPDz79ZQBxvbq4nbpAR/lVLZK+ds3c5BkL5aCfbcxcZeUz92E/SFUzm aTFJUtcwEEM2PVS+njC/p7EmKlfXcujSeYd7C7UPoaBscC0ftv6xjq3Iwwu8kT52ggjR VHD371ELHewsN6Wu7DnOWlD/SwhMS0EKJNw0IDbDHRUKqaBbjc9Mb0+3cY8e20o8TYdQ +mtt8UxtcCRIo1uyiTWqaXs4fs5XNyLTY9yJ4Bn+1of1iIUE5nUajL3P+6hUIbCS6dDK 977g== X-Received: by 10.204.8.17 with SMTP id f17mr8256928bkf.110.1356205285495; Sat, 22 Dec 2012 11:41:25 -0800 (PST) Received: from localhost.localdomain (089144206100.atnat0015.highway.a1.net. [89.144.206.100]) by mx.google.com with ESMTPS id q22sm12531039bkv.16.2012.12.22.11.41.20 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 22 Dec 2012 11:41:24 -0800 (PST) From: Richard Cochran To: Cc: , , David Miller , Cyril Chemparathy , Mugunthan V N Subject: [PATCH 1/2] cpts: fix build error by removing useless code. Date: Sat, 22 Dec 2012 20:41:08 +0100 Message-Id: <2cc4445dc92ddadb69b3e2feb9d8de38727ea0d4.1356204860.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];