From patchwork Wed Apr 1 14:11:07 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 15689 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n31EEqbJ013186 for ; Wed, 1 Apr 2009 14:14:52 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932382AbZDAON7 (ORCPT ); Wed, 1 Apr 2009 10:13:59 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932775AbZDAON7 (ORCPT ); Wed, 1 Apr 2009 10:13:59 -0400 Received: from ti-out-0910.google.com ([209.85.142.190]:39235 "EHLO ti-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932382AbZDAON4 (ORCPT ); Wed, 1 Apr 2009 10:13:56 -0400 Received: by ti-out-0910.google.com with SMTP id i7so43880tid.23 for ; Wed, 01 Apr 2009 07:13:51 -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=x50003M4i2AUlHBjy+VBQ8a6jqJUpjw53B82rPQrKD0=; b=JVPAnXo0Y+GpKWoX3Ev2uI0AFj34GsW7pQO9Ve1I+moxnOUj3nX6pZ1VEX+4EXWu5+ DvJMLaDdxlb/MTXw64LxrgzJEuJT/uBRRWpaHRZ+C1ZKJcW7WAWfAk50sl9pSYKxZkcs BefqwcwWkbPMMc4g6/C58gGClXGBMbG2NUiUo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:date:message-id:subject; b=AXiHfM8o4LDgYJcV1zL3TyT3xNj86xreA9f7sSvsaECmVjCn9zbSnrspDLFdOeppzm GIkumscl9auiVZos075OXAkEMGlOvzgWw/v7sS8+tQoWhPdLfah3/bIGyVNB2tDo6Ln5 wIy/esIwYPShcajYuLT9ZPH3MVRVlwH0cLOjs= Received: by 10.110.63.17 with SMTP id l17mr1013617tia.51.1238595231340; Wed, 01 Apr 2009 07:13:51 -0700 (PDT) Received: from rx1.opensource.se (210.5.32.202.bf.2iij.net [202.32.5.210]) by mx.google.com with ESMTPS id w5sm554319tib.25.2009.04.01.07.13.43 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 01 Apr 2009 07:13:45 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: Magnus Damm , lethal@linux-sh.org Date: Wed, 01 Apr 2009 23:11:07 +0900 Message-Id: <20090401141107.32445.63752.sendpatchset@rx1.opensource.se> Subject: [PATCH] sh_cmt: use remove_irq() and remove clockevent workaround Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org From: Magnus Damm Update the sh_cmt driver to make use of recent irq and clockevent changes: - use remove_irq() together with setup_irq() - remove mult workaround since WARN_ON() now has been moved Signed-off-by: Magnus Damm --- drivers/clocksource/sh_cmt.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 0001/drivers/clocksource/sh_cmt.c +++ work/drivers/clocksource/sh_cmt.c 2009-04-01 23:01:39.000000000 +0900 @@ -465,7 +465,6 @@ static void sh_cmt_register_clockevent(s ced->set_mode = sh_cmt_clock_event_mode; pr_info("sh_cmt: %s used for clock events\n", ced->name); - ced->mult = 1; /* work around misplaced WARN_ON() in clockevents.c */ clockevents_register_device(ced); } @@ -557,7 +556,7 @@ static int sh_cmt_setup(struct sh_cmt_pr cfg->clockevent_rating, cfg->clocksource_rating); err2: - free_irq(irq, p); + remove_irq(irq, &p->irqaction); err1: iounmap(p->mapbase); err0: