Skip to content

Commit 6a4a5b3

Browse files
Jiang LiuKAGA-KOKO
authored andcommitted
sparc/irq: Use helper irq_data_get_irq_handler_data()
Use helper function irq_data_get_irq_handler_data() to hide irq_desc implementation details. This allows to move irq_data->handler_data to irq_data_common, once all usage sites are converted. Signed-off-by: Jiang Liu <[email protected]> Cc: David S. Miller <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Thomas Gleixner <[email protected]>
1 parent d2109a1 commit 6a4a5b3

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

arch/sparc/kernel/irq_64.c

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -210,21 +210,21 @@ struct irq_handler_data {
210210

211211
static inline unsigned int irq_data_to_handle(struct irq_data *data)
212212
{
213-
struct irq_handler_data *ihd = data->handler_data;
213+
struct irq_handler_data *ihd = irq_data_get_irq_handler_data(data);
214214

215215
return ihd->dev_handle;
216216
}
217217

218218
static inline unsigned int irq_data_to_ino(struct irq_data *data)
219219
{
220-
struct irq_handler_data *ihd = data->handler_data;
220+
struct irq_handler_data *ihd = irq_data_get_irq_handler_data(data);
221221

222222
return ihd->dev_ino;
223223
}
224224

225225
static inline unsigned long irq_data_to_sysino(struct irq_data *data)
226226
{
227-
struct irq_handler_data *ihd = data->handler_data;
227+
struct irq_handler_data *ihd = irq_data_get_irq_handler_data(data);
228228

229229
return ihd->sysino;
230230
}
@@ -370,8 +370,9 @@ static int irq_choose_cpu(unsigned int irq, const struct cpumask *affinity)
370370

371371
static void sun4u_irq_enable(struct irq_data *data)
372372
{
373-
struct irq_handler_data *handler_data = data->handler_data;
373+
struct irq_handler_data *handler_data;
374374

375+
handler_data = irq_data_get_irq_handler_data(data);
375376
if (likely(handler_data)) {
376377
unsigned long cpuid, imap, val;
377378
unsigned int tid;
@@ -393,8 +394,9 @@ static void sun4u_irq_enable(struct irq_data *data)
393394
static int sun4u_set_affinity(struct irq_data *data,
394395
const struct cpumask *mask, bool force)
395396
{
396-
struct irq_handler_data *handler_data = data->handler_data;
397+
struct irq_handler_data *handler_data;
397398

399+
handler_data = irq_data_get_irq_handler_data(data);
398400
if (likely(handler_data)) {
399401
unsigned long cpuid, imap, val;
400402
unsigned int tid;
@@ -438,8 +440,9 @@ static void sun4u_irq_disable(struct irq_data *data)
438440

439441
static void sun4u_irq_eoi(struct irq_data *data)
440442
{
441-
struct irq_handler_data *handler_data = data->handler_data;
443+
struct irq_handler_data *handler_data;
442444

445+
handler_data = irq_data_get_irq_handler_data(data);
443446
if (likely(handler_data))
444447
upa_writeq(ICLR_IDLE, handler_data->iclr);
445448
}

arch/sparc/kernel/sun4d_irq.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ void sun4d_handler_irq(unsigned int pil, struct pt_regs *regs)
188188

189189
static void sun4d_mask_irq(struct irq_data *data)
190190
{
191-
struct sun4d_handler_data *handler_data = data->handler_data;
191+
struct sun4d_handler_data *handler_data = irq_data_get_irq_handler_data(data);
192192
unsigned int real_irq;
193193
#ifdef CONFIG_SMP
194194
int cpuid = handler_data->cpuid;
@@ -206,7 +206,7 @@ static void sun4d_mask_irq(struct irq_data *data)
206206

207207
static void sun4d_unmask_irq(struct irq_data *data)
208208
{
209-
struct sun4d_handler_data *handler_data = data->handler_data;
209+
struct sun4d_handler_data *handler_data = irq_data_get_irq_handler_data(data);
210210
unsigned int real_irq;
211211
#ifdef CONFIG_SMP
212212
int cpuid = handler_data->cpuid;

arch/sparc/kernel/sun4m_irq.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,10 @@ static unsigned long sun4m_imask[0x50] = {
188188

189189
static void sun4m_mask_irq(struct irq_data *data)
190190
{
191-
struct sun4m_handler_data *handler_data = data->handler_data;
191+
struct sun4m_handler_data *handler_data;
192192
int cpu = smp_processor_id();
193193

194+
handler_data = irq_data_get_irq_handler_data(data);
194195
if (handler_data->mask) {
195196
unsigned long flags;
196197

@@ -206,9 +207,10 @@ static void sun4m_mask_irq(struct irq_data *data)
206207

207208
static void sun4m_unmask_irq(struct irq_data *data)
208209
{
209-
struct sun4m_handler_data *handler_data = data->handler_data;
210+
struct sun4m_handler_data *handler_data;
210211
int cpu = smp_processor_id();
211212

213+
handler_data = irq_data_get_irq_handler_data(data);
212214
if (handler_data->mask) {
213215
unsigned long flags;
214216

0 commit comments

Comments
 (0)