sh: Updates for IRQ handler changes.
Trivial fixes for build breakage introduced by IRQ handler changes. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
这个提交包含在:
@@ -51,7 +51,7 @@ static volatile struct g2_dma_info *g2_dma = (volatile struct g2_dma_info *)0xa0
|
||||
((g2_dma->channel[i].size - \
|
||||
g2_dma->status[i].size) & 0x0fffffff)
|
||||
|
||||
static irqreturn_t g2_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs)
|
||||
static irqreturn_t g2_dma_interrupt(int irq, void *dev_id)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
@@ -21,7 +21,7 @@
|
||||
static unsigned int xfer_complete;
|
||||
static int count;
|
||||
|
||||
static irqreturn_t pvr2_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs)
|
||||
static irqreturn_t pvr2_dma_interrupt(int irq, void *dev_id)
|
||||
{
|
||||
if (get_dma_residue(PVR2_CASCADE_CHAN)) {
|
||||
printk(KERN_WARNING "DMA: SH DMAC did not complete transfer "
|
||||
|
@@ -60,9 +60,9 @@ static inline unsigned int calc_xmit_shift(struct dma_channel *chan)
|
||||
* Besides that it needs to waken any waiting process, which should handle
|
||||
* setting up the next transfer.
|
||||
*/
|
||||
static irqreturn_t dma_tei(int irq, void *dev_id, struct pt_regs *regs)
|
||||
static irqreturn_t dma_tei(int irq, void *dev_id)
|
||||
{
|
||||
struct dma_channel *chan = (struct dma_channel *)dev_id;
|
||||
struct dma_channel *chan = dev_id;
|
||||
u32 chcr;
|
||||
|
||||
chcr = ctrl_inl(CHCR[chan->chan]);
|
||||
@@ -228,7 +228,7 @@ static inline int dmaor_reset(void)
|
||||
}
|
||||
|
||||
#if defined(CONFIG_CPU_SH4)
|
||||
static irqreturn_t dma_err(int irq, void *dev_id, struct pt_regs *regs)
|
||||
static irqreturn_t dma_err(int irq, void *dummy)
|
||||
{
|
||||
dmaor_reset();
|
||||
disable_irq(irq);
|
||||
|
在新工单中引用
屏蔽一个用户