Skip to content

Commit

Permalink
[POWERPC] XilinxFB: rename failout labels to reflect failure
Browse files Browse the repository at this point in the history
Labels and gotos are used in xilinxfb_assign to unwind allocations
on device registration failures.  Rename the labels to reflect the
error which occured.  This change is being made to make it easier
to add new failout paths (which occurs in a subsuquent patch) and
to make reviewing the failout path easier.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Andrei Konovalov <akonovalov@ru.mvista.com>
  • Loading branch information
Grant Likely committed Oct 10, 2007
1 parent 3cb3ec2 commit 3fb99ce
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions drivers/video/xilinxfb.c
Original file line number Diff line number Diff line change
Expand Up @@ -225,14 +225,14 @@ xilinxfb_drv_probe(struct device *dev)
if (!regs_res || (regs_res->end - regs_res->start + 1 < 8)) {
dev_err(dev, "Couldn't get registers resource\n");
retval = -EFAULT;
goto failed1;
goto err_region;
}

if (!request_mem_region(regs_res->start, 8, DRIVER_NAME)) {
dev_err(dev, "Couldn't lock memory region at 0x%08X\n",
regs_res->start);
retval = -EBUSY;
goto failed1;
goto err_region;
}
drvdata->regs = (u32 __iomem*) ioremap(regs_res->start, 8);
drvdata->regs_phys = regs_res->start;
Expand All @@ -243,7 +243,7 @@ xilinxfb_drv_probe(struct device *dev)
if (!drvdata->fb_virt) {
dev_err(dev, "Could not allocate frame buffer memory\n");
retval = -ENOMEM;
goto failed2;
goto err_fbmem;
}

/* Clear (turn to black) the framebuffer */
Expand All @@ -270,7 +270,7 @@ xilinxfb_drv_probe(struct device *dev)
dev_err(dev, "Fail to allocate colormap (%d entries)\n",
PALETTE_ENTRIES_NO);
retval = -EFAULT;
goto failed3;
goto err_cmap;
}

drvdata->info.flags = FBINFO_DEFAULT;
Expand All @@ -284,7 +284,7 @@ xilinxfb_drv_probe(struct device *dev)
if (register_framebuffer(&drvdata->info) < 0) {
dev_err(dev, "Could not register frame buffer\n");
retval = -EINVAL;
goto failed4;
goto err_regfb;
}

/* Put a banner in the log (for DEBUG) */
Expand All @@ -294,21 +294,21 @@ xilinxfb_drv_probe(struct device *dev)
(void*)drvdata->fb_phys, drvdata->fb_virt, FB_SIZE);
return 0; /* success */

failed4:
err_regfb:
fb_dealloc_cmap(&drvdata->info.cmap);

failed3:
err_cmap:
dma_free_coherent(dev, PAGE_ALIGN(FB_SIZE), drvdata->fb_virt,
drvdata->fb_phys);

/* Turn off the display */
xilinx_fb_out_be32(drvdata, REG_CTRL, 0);
iounmap(drvdata->regs);

failed2:
err_fbmem:
release_mem_region(regs_res->start, 8);

failed1:
err_region:
kfree(drvdata);
dev_set_drvdata(dev, NULL);

Expand Down

0 comments on commit 3fb99ce

Please sign in to comment.