From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932368AbcITJB7 (ORCPT ); Tue, 20 Sep 2016 05:01:59 -0400 Received: from mout.web.de ([212.227.17.12]:49688 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753997AbcITJB5 (ORCPT ); Tue, 20 Sep 2016 05:01:57 -0400 Subject: [PATCH 6/6] GPU-DRM-GMA500: Rename a jump label in mid_get_vbt_data() To: dri-devel@lists.freedesktop.org, Daniel Vetter , David Airlie , Patrik Jakobsson References: <566ABCD9.1060404@users.sourceforge.net> <3c9785ef-4553-2e3d-2cb2-5cf6d1f31ccd@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <64e06a00-42d1-e7a8-1fe7-1b5de026b060@users.sourceforge.net> Date: Tue, 20 Sep 2016 11:01:50 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <3c9785ef-4553-2e3d-2cb2-5cf6d1f31ccd@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:ksAih8+SMFITM6dtKY8v46YMC2inCaH88F344HVcZJOKQ6LITPe uyKiHHSzE13HfTBmZ3+5pUNxhbOKTAYXFuT4ZW0o8RVE49Dta5qyNk9MkxpZkPtCLViIfLT mH8+E+kdLz+cA5ozIaCqIwP9AqF42KTY6ih8Bh3Yls3QIyuAMP0eGr+Sqbnxbe3aIJKamWw jW/ZUrQTbrvZAHy3fut6w== X-UI-Out-Filterresults: notjunk:1;V01:K0:M1VRooicLoY=:pnZ8f2aSdvF1+goye+3+Z5 ek9HQQ7UzynKxUMd2W6DqcOErn9r5sQY+Mbnrz1yhpi/4S8R8lX2KwZ8xKtziNdhntPHniNx0 jAkpncdxjbAEuPXTVB5WdyIZxKVBPGA5rFZWF5P6HixDnegeMMqmgwhNCN69uw76NNl4niHmN KxiVsf+hsWSSi1K4og/20IkGA/pJ5nvbEmz2P5yYuDMNb9gzfSH+aQzb3Hb9BiPzs2iHkvtpD EgUn1wOVgPCEQ4mjBUhXu/5QLTXpYZ/MVVA+uGjQJhUy5tw24lY6OTEA4xHCstCit6dy0r2w1 K6I5tz0RImu32IpvN7l7zTJ2+ZWOJwk6RDmFnv4xObS0n7XQRrnOethrdQ1h+JavFZ7tc6CVS rdTWBQo8xntvmj/Hg4rPhMOeD7sfoJXucIvKS8q56VjMWUmdihqBrUOzVJLjhxMFXhb3qPzbW sWBFqkUBHZCCHa4ZiHoenyD69e7KDkwzpRMEM/Nar6lczYe8iRi/+64kpoDqRCqFoYfE6435q ukhlPl+oL0pWOwdPQFXhQ/hlyzLrP3SqRGLxwTGxt/MymmxUWOiJif5NuV4YOdRk8pWltvcrC pugijfdoci6sDRewklo39SkEHNs9Qfi6cEVqHlA5XEwE4bH4jxfGQNtGlEoH/crwkgMsZ+1Kn jQGe+5iaaP6fJzcosCYZGC4Ci4WB38w95nZ8twnKqF5/IjqcwDMLEiRISEdWCZfwso8ICYajR la24LeDZW6OzEAw7SLfu25JUTMNJBqUirbfXV/ZEoiYj3o34XGYlVWHK68yrzD9rAfTNXyXmg +VLu0dj Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring 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 --- 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