From: Jarkko Nikula <jhnikula@gmail.com>
To: linux-omap@vger.kernel.org
Cc: Tony Lindgren <tony@atomide.com>, Felipe Balbi <balbi@ti.com>,
Jarkko Nikula <jhnikula@gmail.com>
Subject: [PATCH 2/3] cbus: retu: Fix build breakage caused by recent genirq commits
Date: Mon, 18 Apr 2011 22:21:31 +0300 [thread overview]
Message-ID: <1303154492-13520-2-git-send-email-jhnikula@gmail.com> (raw)
In-Reply-To: <1303154492-13520-1-git-send-email-jhnikula@gmail.com>
Convert retu.c to use updated irq function names after the genirq cleanup
commits 0c6f8a8 "genirq: Remove compat code" and
a0cd9ca "genirq: Namespace cleanup".
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
---
drivers/cbus/retu.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/cbus/retu.c b/drivers/cbus/retu.c
index f271e57..ec108f3 100644
--- a/drivers/cbus/retu.c
+++ b/drivers/cbus/retu.c
@@ -298,10 +298,10 @@ static void retu_irq_init(struct retu *retu)
int irq;
for (irq = base; irq < end; irq++) {
- set_irq_chip_data(irq, retu);
- set_irq_chip_and_handler(irq, &retu_irq_chip,
+ irq_set_chip_data(irq, retu);
+ irq_set_chip_and_handler(irq, &retu_irq_chip,
handle_simple_irq);
- set_irq_nested_thread(irq, 1);
+ irq_set_nested_thread(irq, 1);
retu_irq_setup(irq);
}
}
@@ -316,8 +316,8 @@ static void retu_irq_exit(struct retu *retu)
#ifdef CONFIG_ARM
set_irq_flags(irq, 0);
#endif
- set_irq_chip_and_handler(irq, NULL, NULL);
- set_irq_chip_data(irq, NULL);
+ irq_set_chip_and_handler(irq, NULL, NULL);
+ irq_set_chip_data(irq, NULL);
}
}
@@ -479,7 +479,7 @@ static int __init retu_probe(struct platform_device *pdev)
goto err1;
}
- set_irq_wake(retu->irq, 1);
+ irq_set_irq_wake(retu->irq, 1);
/* Register power off function */
pm_power_off = retu_power_off;
--
1.7.0.4
next prev parent reply other threads:[~2011-04-18 19:21 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-18 19:21 [PATCH 1/3] cbus: tahvo: Fix build breakage caused by deprecated initializer removal Jarkko Nikula
2011-04-18 19:21 ` Jarkko Nikula [this message]
2011-04-18 19:21 ` [PATCH 3/3] omap: Fix board-nokia770.c and board-n8x0 cbus build breakage Jarkko Nikula
2011-04-19 7:07 ` [PATCH 1/3] cbus: tahvo: Fix build breakage caused by deprecated initializer removal Tony Lindgren
2011-04-19 7:53 ` Jarkko Nikula
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1303154492-13520-2-git-send-email-jhnikula@gmail.com \
--to=jhnikula@gmail.com \
--cc=balbi@ti.com \
--cc=linux-omap@vger.kernel.org \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.