From 1ea6318bf654baeb560af90cc9dd439d91f20744 Mon Sep 17 00:00:00 2001
From: Nicolas Palix <npalix@diku.dk>
Date: Mon, 7 Dec 2009 10:38:55 +0100
Subject: [PATCH] --- yaml --- r: 177011 b: refs/heads/master c:
 f701b3999890b867f87733c146d4cdf9319ead05 h: refs/heads/master i:   177009:
 557ccf1a002e9c46fb27f63381f6f0ace709fcd1   177007:
 6a396cf2320a4b89b5c6c43e4bbb2b82384b6cad v: v3

---
 [refs]                             | 2 +-
 trunk/arch/sh/kernel/cpu/irq/ipr.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index bd322f9123b3..8e0ca1d2d96d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87a705dde49d0c482fa818f0923af59ed0954d5d
+refs/heads/master: f701b3999890b867f87733c146d4cdf9319ead05
diff --git a/trunk/arch/sh/kernel/cpu/irq/ipr.c b/trunk/arch/sh/kernel/cpu/irq/ipr.c
index c1508a90fc6a..9282d965a1b6 100644
--- a/trunk/arch/sh/kernel/cpu/irq/ipr.c
+++ b/trunk/arch/sh/kernel/cpu/irq/ipr.c
@@ -17,16 +17,17 @@
  * for more details.
  */
 #include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
 #include <linux/irq.h>
+#include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/io.h>
-#include <linux/interrupt.h>
 #include <linux/topology.h>
 
 static inline struct ipr_desc *get_ipr_desc(unsigned int irq)
 {
 	struct irq_chip *chip = get_irq_chip(irq);
-	return (void *)((char *)chip - offsetof(struct ipr_desc, chip));
+	return container_of(chip, struct ipr_desc, chip);
 }
 
 static void disable_ipr_irq(unsigned int irq)