projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-38-rc2' of git://codeaurora.org/quic/kernel/davidb/linux-msm
[deliverable/linux.git]
/
drivers
/
mfd
/
t7l66xb.c
diff --git
a/drivers/mfd/t7l66xb.c
b/drivers/mfd/t7l66xb.c
index 006c121f3f0d2f2bca2a87f05f6c65ca3a063987..9caeb4ac6ea6c2b1fa72eb63a8c678fefef28b14 100644
(file)
--- a/
drivers/mfd/t7l66xb.c
+++ b/
drivers/mfd/t7l66xb.c
@@
-199,37
+199,37
@@
static void t7l66xb_irq(unsigned int irq, struct irq_desc *desc)
generic_handle_irq(irq_base + i);
}
generic_handle_irq(irq_base + i);
}
-static void t7l66xb_irq_mask(
unsigned int irq
)
+static void t7l66xb_irq_mask(
struct irq_data *data
)
{
{
- struct t7l66xb *t7l66xb =
get_irq_chip_data(irq
);
+ struct t7l66xb *t7l66xb =
irq_data_get_irq_chip_data(data
);
unsigned long flags;
u8 imr;
spin_lock_irqsave(&t7l66xb->lock, flags);
imr = tmio_ioread8(t7l66xb->scr + SCR_IMR);
unsigned long flags;
u8 imr;
spin_lock_irqsave(&t7l66xb->lock, flags);
imr = tmio_ioread8(t7l66xb->scr + SCR_IMR);
- imr |= 1 << (irq - t7l66xb->irq_base);
+ imr |= 1 << (
data->
irq - t7l66xb->irq_base);
tmio_iowrite8(imr, t7l66xb->scr + SCR_IMR);
spin_unlock_irqrestore(&t7l66xb->lock, flags);
}
tmio_iowrite8(imr, t7l66xb->scr + SCR_IMR);
spin_unlock_irqrestore(&t7l66xb->lock, flags);
}
-static void t7l66xb_irq_unmask(
unsigned int irq
)
+static void t7l66xb_irq_unmask(
struct irq_data *data
)
{
{
- struct t7l66xb *t7l66xb =
get_irq_chip_data(irq
);
+ struct t7l66xb *t7l66xb =
irq_data_get_irq_chip_data(data
);
unsigned long flags;
u8 imr;
spin_lock_irqsave(&t7l66xb->lock, flags);
imr = tmio_ioread8(t7l66xb->scr + SCR_IMR);
unsigned long flags;
u8 imr;
spin_lock_irqsave(&t7l66xb->lock, flags);
imr = tmio_ioread8(t7l66xb->scr + SCR_IMR);
- imr &= ~(1 << (irq - t7l66xb->irq_base));
+ imr &= ~(1 << (
data->
irq - t7l66xb->irq_base));
tmio_iowrite8(imr, t7l66xb->scr + SCR_IMR);
spin_unlock_irqrestore(&t7l66xb->lock, flags);
}
static struct irq_chip t7l66xb_chip = {
tmio_iowrite8(imr, t7l66xb->scr + SCR_IMR);
spin_unlock_irqrestore(&t7l66xb->lock, flags);
}
static struct irq_chip t7l66xb_chip = {
- .name = "t7l66xb",
- .
ack
= t7l66xb_irq_mask,
- .
mask
= t7l66xb_irq_mask,
- .
unmask
= t7l66xb_irq_unmask,
+ .name
= "t7l66xb",
+ .
irq_ack
= t7l66xb_irq_mask,
+ .
irq_mask
= t7l66xb_irq_mask,
+ .
irq_unmask
= t7l66xb_irq_unmask,
};
/*--------------------------------------------------------------------------*/
};
/*--------------------------------------------------------------------------*/
This page took
0.024832 seconds
and
5
git commands to generate.