From patchwork Wed Oct 13 07:36:38 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 249841 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9D7YTTB010467 for ; Wed, 13 Oct 2010 07:34:29 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753225Ab0JMHeV (ORCPT ); Wed, 13 Oct 2010 03:34:21 -0400 Received: from mail-px0-f174.google.com ([209.85.212.174]:53861 "EHLO mail-px0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753148Ab0JMHeV (ORCPT ); Wed, 13 Oct 2010 03:34:21 -0400 Received: by pxi16 with SMTP id 16so686742pxi.19 for ; Wed, 13 Oct 2010 00:34:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:date:message-id :subject; bh=x1O1iDnnHlIIE1QsmZ84zXwVcCCxDRumYx0aOYiyRcs=; b=QpBND4OpAzC4KrGf0oK5dHWsOKTdqDuf2CEmv2/+WnQ/fQXG+BOYDi3sKSDSe2Rw12 jAb3kdpFG4AZXVY3bNEknmgK3G25kEksgzGmD99P8PzR5MRYtpUMx2UxH3/ZEiknaYmK Z90VLDup3Wr3sJtD1ysVn+XWLcS1+qXlEM5OM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:date:message-id:subject; b=sTC6/CQT6FPuplaB4z8PV6lMuHpCYPXOq35qKUbMYHcVIbenWt7LT26bv/DaVRJdot vNj9lrO9Bc30tVw5tvvwzzxcNvsC8YQgStoCYRdKS+UEDYioDvpWR3ekaWbHASV6BlUb EsMKvXLJHLr/jmwyhOvoawgVEsbdvMEdKUcek= Received: by 10.142.140.15 with SMTP id n15mr4340537wfd.247.1286955261042; Wed, 13 Oct 2010 00:34:21 -0700 (PDT) Received: from [127.0.0.1] (49.14.32.202.bf.2iij.net [202.32.14.49]) by mx.google.com with ESMTPS id x13sm1909077wfd.7.2010.10.13.00.34.19 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 13 Oct 2010 00:34:20 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: johnstul@us.ibm.com, Magnus Damm , lethal@linux-sh.org Date: Wed, 13 Oct 2010 16:36:38 +0900 Message-Id: <20101013073638.19764.20402.sendpatchset@t400s> Subject: [PATCH] ARM: shmobile: remove sh_timer_config clk member Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 13 Oct 2010 07:34:29 +0000 (UTC) --- 0007/drivers/clocksource/sh_cmt.c +++ work/drivers/clocksource/sh_cmt.c 2010-10-13 15:51:52.000000000 +0900 @@ -616,13 +616,9 @@ static int sh_cmt_setup(struct sh_cmt_pr /* get hold of clock */ p->clk = clk_get(&p->pdev->dev, "cmt_fck"); if (IS_ERR(p->clk)) { - dev_warn(&p->pdev->dev, "using deprecated clock lookup\n"); - p->clk = clk_get(&p->pdev->dev, cfg->clk); - if (IS_ERR(p->clk)) { - dev_err(&p->pdev->dev, "cannot get clock\n"); - ret = PTR_ERR(p->clk); - goto err1; - } + dev_err(&p->pdev->dev, "cannot get clock\n"); + ret = PTR_ERR(p->clk); + goto err1; } if (resource_size(res) == 6) { --- 0001/drivers/clocksource/sh_mtu2.c +++ work/drivers/clocksource/sh_mtu2.c 2010-10-13 15:52:20.000000000 +0900 @@ -287,13 +287,9 @@ static int sh_mtu2_setup(struct sh_mtu2_ /* get hold of clock */ p->clk = clk_get(&p->pdev->dev, "mtu2_fck"); if (IS_ERR(p->clk)) { - dev_warn(&p->pdev->dev, "using deprecated clock lookup\n"); - p->clk = clk_get(&p->pdev->dev, cfg->clk); - if (IS_ERR(p->clk)) { - dev_err(&p->pdev->dev, "cannot get clock\n"); - ret = PTR_ERR(p->clk); - goto err1; - } + dev_err(&p->pdev->dev, "cannot get clock\n"); + ret = PTR_ERR(p->clk); + goto err1; } return sh_mtu2_register(p, (char *)dev_name(&p->pdev->dev), --- 0001/drivers/clocksource/sh_tmu.c +++ work/drivers/clocksource/sh_tmu.c 2010-10-13 15:52:09.000000000 +0900 @@ -393,13 +393,9 @@ static int sh_tmu_setup(struct sh_tmu_pr /* get hold of clock */ p->clk = clk_get(&p->pdev->dev, "tmu_fck"); if (IS_ERR(p->clk)) { - dev_warn(&p->pdev->dev, "using deprecated clock lookup\n"); - p->clk = clk_get(&p->pdev->dev, cfg->clk); - if (IS_ERR(p->clk)) { - dev_err(&p->pdev->dev, "cannot get clock\n"); - ret = PTR_ERR(p->clk); - goto err1; - } + dev_err(&p->pdev->dev, "cannot get clock\n"); + ret = PTR_ERR(p->clk); + goto err1; } return sh_tmu_register(p, (char *)dev_name(&p->pdev->dev), --- 0001/include/linux/sh_timer.h +++ work/include/linux/sh_timer.h 2010-10-13 15:49:08.000000000 +0900 @@ -5,7 +5,6 @@ struct sh_timer_config { char *name; long channel_offset; int timer_bit; - char *clk; unsigned long clockevent_rating; unsigned long clocksource_rating; };