commit: http://blackfin.uclinux.org/git/?p=linux-kernel;a=commitdiff;h=457499464cc9c62efa6abdbb763ce93058f53db3 branch: http://blackfin.uclinux.org/git/?p=linux-kernel;a=shortlog;h=refs/heads/trunk
Signed-off-by: Scott Jiang <[email protected]> --- drivers/media/video/blackfin/ppi.c | 12 ++++-------- include/media/blackfin/ppi.h | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/media/video/blackfin/ppi.c b/drivers/media/video/blackfin/ppi.c index b27fb61..e582227 100644 --- a/drivers/media/video/blackfin/ppi.c +++ b/drivers/media/video/blackfin/ppi.c @@ -50,8 +50,7 @@ static irqreturn_t ppi_irq_err(int irq, void *dev_id) unsigned short status; if (!strcmp(info->name, "ppi")) { - struct bfin_ppi_regs __iomem *reg = - (struct bfin_ppi_regs __iomem *)info->base; + struct bfin_ppi_regs *reg = info->base; status = bfin_read16(®->status); bfin_write16(®->status, 0xff00); } @@ -98,8 +97,7 @@ static int ppi_start(struct ppi_if *ppi) /* enable PPI */ ppi->ppi_control |= PORT_EN; if (!strcmp(info->name, "ppi")) { - struct bfin_ppi_regs __iomem *reg = - (struct bfin_ppi_regs __iomem *)info->base; + struct bfin_ppi_regs *reg = info->base; bfin_write16(®->control, ppi->ppi_control); } @@ -114,8 +112,7 @@ static int ppi_stop(struct ppi_if *ppi) /* disable PPI */ ppi->ppi_control &= ~PORT_EN; if (!strcmp(info->name, "ppi")) { - struct bfin_ppi_regs __iomem *reg = - (struct bfin_ppi_regs __iomem *)info->base; + struct bfin_ppi_regs *reg = info->base; bfin_write16(®->control, ppi->ppi_control); } @@ -153,8 +150,7 @@ static int ppi_set_params(struct ppi_if *ppi, struct ppi_params *params) /* config PPI */ ppi->ppi_control = params->ppi_control & ~PORT_EN; if (!strcmp(info->name, "ppi")) { - struct bfin_ppi_regs __iomem *reg = - (struct bfin_ppi_regs __iomem *)info->base; + struct bfin_ppi_regs *reg = info->base; bfin_write16(®->control, ppi->ppi_control); bfin_write16(®->count, ppi->bytes_per_line - 1); bfin_write16(®->frame, ppi->lines_per_frame); diff --git a/include/media/blackfin/ppi.h b/include/media/blackfin/ppi.h index 4e7711a..89d75ad 100644 --- a/include/media/blackfin/ppi.h +++ b/include/media/blackfin/ppi.h @@ -44,7 +44,7 @@ struct ppi_info { const char *name; /* ppi or eppi */ int dma_ch; int irq_err; - unsigned long base; + void __iomem *base; const unsigned short *pin_req; };
_______________________________________________ Linux-kernel-commits mailing list [email protected] https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
