Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1487174
| From | SF Markus Elfring <elfring@users.sourceforge.net> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 6/6] GPU-DRM-GMA500: Rename a jump label in mid_get_vbt_data() |
| Date | 2016-09-20 11:10 +0200 |
| Message-ID | <sjpdT-WX-5@gated-at.bofh.it> (permalink) |
| References | <qEuGl-43C-5@gated-at.bofh.it> <sjp4d-EF-5@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
From: Markus Elfring <elfring@users.sourceforge.net> Date: Tue, 20 Sep 2016 10:40:22 +0200 * Adjust a jump target. * Delete the explicit initialisation for the local variable "ret" which became unnecessary with this refactoring. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> --- drivers/gpu/drm/gma500/mid_bios.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/gma500/mid_bios.c b/drivers/gpu/drm/gma500/mid_bios.c index e5cece0..602d16f 100644 --- a/drivers/gpu/drm/gma500/mid_bios.c +++ b/drivers/gpu/drm/gma500/mid_bios.c @@ -284,7 +284,7 @@ static void mid_get_vbt_data(struct drm_psb_private *dev_priv) u8 __iomem *vbt_virtual; struct mid_vbt_header vbt_header; struct pci_dev *pci_gfx_root = pci_get_bus_and_slot(0, PCI_DEVFN(2, 0)); - int ret = -1; + int ret; /* Get the address of the platform config vbt */ pci_read_config_dword(pci_gfx_root, 0xFC, &addr); @@ -293,18 +293,18 @@ static void mid_get_vbt_data(struct drm_psb_private *dev_priv) dev_dbg(dev->dev, "drm platform config address is %x\n", addr); if (!addr) - goto out; + goto report_failure; /* get the virtual address of the vbt */ vbt_virtual = ioremap(addr, sizeof(vbt_header)); if (!vbt_virtual) - goto out; + goto report_failure; memcpy_fromio(&vbt_header, vbt_virtual, sizeof(vbt_header)); iounmap(vbt_virtual); if (memcmp(&vbt_header.signature, "$GCT", 4)) - goto out; + goto report_failure; dev_dbg(dev->dev, "GCT revision is %02x\n", vbt_header.revision); @@ -322,9 +322,8 @@ static void mid_get_vbt_data(struct drm_psb_private *dev_priv) dev_err(dev->dev, "Unknown revision of GCT!\n"); return; } - -out: if (ret) + report_failure: dev_err(dev->dev, "Unable to read GCT!"); else dev_priv->has_gct = true; -- 2.10.0
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 0/6] GPU-DRM-GMA500: Fine-tuning for two function implementations SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-20 11:00 +0200
[PATCH 2/6] GPU-DRM-GMA500: Rename a jump label in mid_get_vbt_data_r10() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-20 11:00 +0200
Re: [PATCH 2/6] GPU-DRM-GMA500: Rename a jump label in mid_get_vbt_data_r10() Jani Nikula <jani.nikula@linux.intel.com> - 2016-09-20 12:10 +0200
[PATCH 3/6] GPU-DRM-GMA500: Move a variable assignment in mid_get_vbt_data_r10() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-20 11:00 +0200
[PATCH 4/6] GPU-DRM-GMA500: Fix indentation for a function call parameter in mid_get_vbt_data_r10() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-20 11:10 +0200
[PATCH 5/6] GPU-DRM-GMA500: One error message less for a GCT revision mismatch in mid_get_vbt_data() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-20 11:10 +0200
Re: [PATCH 5/6] GPU-DRM-GMA500: One error message less for a GCT revision mismatch in mid_get_vbt_data() Jani Nikula <jani.nikula@linux.intel.com> - 2016-09-20 12:10 +0200
Re: GPU-DRM-GMA500: One error message less for a GCT revision mismatch in mid_get_vbt_data() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-20 12:40 +0200
Re: [PATCH 5/6] GPU-DRM-GMA500: One error message less for a GCT revision mismatch in mid_get_vbt_data() Dan Carpenter <dan.carpenter@oracle.com> - 2016-09-20 13:00 +0200
Re: GPU-DRM-GMA500: One error message less for a GCT revision mismatch in mid_get_vbt_data() Dan Carpenter <dan.carpenter@oracle.com> - 2016-09-20 13:20 +0200
Re: GPU-DRM-GMA500: One error message less for a GCT revision mismatch in mid_get_vbt_data() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-20 13:40 +0200
Re: GPU-DRM-GMA500: One error message less for a GCT revision mismatch in mid_get_vbt_data() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-20 13:20 +0200
Re: [PATCH 5/6] GPU-DRM-GMA500: One error message less for a GCT revision mismatch in mid_get_vbt_data() Jani Nikula <jani.nikula@linux.intel.com> - 2016-09-20 14:10 +0200
Re: [PATCH 5/6] GPU-DRM-GMA500: One error message less for a GCT revision mismatch in mid_get_vbt_data() Patrik Jakobsson <patrik.r.jakobsson@gmail.com> - 2016-09-20 22:30 +0200
[PATCH 6/6] GPU-DRM-GMA500: Rename a jump label in mid_get_vbt_data() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-20 11:10 +0200
Re: [PATCH 6/6] GPU-DRM-GMA500: Rename a jump label in mid_get_vbt_data() Jani Nikula <jani.nikula@linux.intel.com> - 2016-09-20 12:10 +0200
Re: [PATCH 6/6] GPU-DRM-GMA500: Rename a jump label in mid_get_vbt_data() Dan Carpenter <dan.carpenter@oracle.com> - 2016-09-20 14:50 +0200
csiph-web