Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=3fb99ce4e2748dafe3f10dba2932f0d13f577623
Commit: 3fb99ce4e2748dafe3f10dba2932f0d13f577623
Parent: 3cb3ec2c26473d8123a468abfaca1e926344b1c2
Author: Grant Likely <[EMAIL PROTECTED]>
AuthorDate: Thu Oct 4 10:48:37 2007 -0600
Committer: Grant Likely <[EMAIL PROTECTED]>
CommitDate: Tue Oct 9 18:11:29 2007 -0600
[POWERPC] XilinxFB: rename failout labels to reflect failure
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 <[EMAIL PROTECTED]>
Acked-by: Andrei Konovalov <[EMAIL PROTECTED]>
---
drivers/video/xilinxfb.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c
index e63cbd1..9aa754a 100644
--- a/drivers/video/xilinxfb.c
+++ b/drivers/video/xilinxfb.c
@@ -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;
@@ -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 */
@@ -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;
@@ -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) */
@@ -294,10 +294,10 @@ 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);
@@ -305,10 +305,10 @@ failed3:
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);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
