Skip to content

Commit

Permalink
drivers/video: fsl-diu-fb: improve local variable usage in some funct…
Browse files Browse the repository at this point in the history
…ions

Clean up the local variable usage in request_irq_local() and allocate_buf().
This streamlines the code without affecting functionality.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
  • Loading branch information
Timur Tabi authored and Florian Tobias Schandinat committed Sep 18, 2011
1 parent 63cf8df commit bada04f
Showing 1 changed file with 10 additions and 13 deletions.
23 changes: 10 additions & 13 deletions drivers/video/fsl-diu-fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1265,14 +1265,14 @@ static irqreturn_t fsl_diu_isr(int irq, void *dev_id)

static int request_irq_local(int irq)
{
unsigned long status, ints;
u32 ints;
struct diu *hw;
int ret;

hw = dr.diu_reg;

/* Read to clear the status */
status = in_be32(&hw->int_status);
in_be32(&hw->int_status);

ret = request_irq(irq, fsl_diu_isr, 0, "diu", NULL);
if (!ret) {
Expand All @@ -1285,7 +1285,7 @@ static int request_irq_local(int irq)
ints |= INT_VSYNC_WB;

/* Read to clear the status */
status = in_be32(&hw->int_status);
in_be32(&hw->int_status);
out_be32(&hw->int_mask, ints);
}

Expand Down Expand Up @@ -1336,23 +1336,20 @@ static int fsl_diu_resume(struct platform_device *ofdev)
static int allocate_buf(struct device *dev, struct diu_addr *buf, u32 size,
u32 bytes_align)
{
u32 offset, ssize;
u32 mask;
dma_addr_t paddr = 0;
u32 offset;
dma_addr_t mask;

ssize = size + bytes_align;
buf->vaddr = dma_alloc_coherent(dev, ssize, &paddr, GFP_DMA |
__GFP_ZERO);
buf->vaddr =
dma_alloc_coherent(dev, size + bytes_align, &buf->paddr,
GFP_DMA | __GFP_ZERO);
if (!buf->vaddr)
return -ENOMEM;

buf->paddr = (__u32) paddr;

mask = bytes_align - 1;
offset = (u32)buf->paddr & mask;
offset = buf->paddr & mask;
if (offset) {
buf->offset = bytes_align - offset;
buf->paddr = (u32)buf->paddr + offset;
buf->paddr = buf->paddr + offset;
} else
buf->offset = 0;

Expand Down

0 comments on commit bada04f

Please sign in to comment.