From patchwork Wed Sep 21 16:48:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 9343899 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 25B1A6077A for ; Wed, 21 Sep 2016 16:48:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 26B302A6B8 for ; Wed, 21 Sep 2016 16:48:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1B0A72A6E5; Wed, 21 Sep 2016 16:48:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8D57D2A6B8 for ; Wed, 21 Sep 2016 16:48:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C17AB6E871; Wed, 21 Sep 2016 16:48:49 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.web.de (mout.web.de [212.227.15.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id B6D9F6E871 for ; Wed, 21 Sep 2016 16:48:47 +0000 (UTC) Received: from [192.168.1.2] ([77.182.212.253]) by smtp.web.de (mrweb004) with ESMTPSA (Nemesis) id 0LlJzS-1bDyNb0SwA-00b728; Wed, 21 Sep 2016 18:48:41 +0200 Subject: [PATCH 07/14] GPU-DRM-OMAP: Rename a jump label in omap_dmm_probe() To: dri-devel@lists.freedesktop.org, David Airlie , Laurent Pinchart , Tomi Valkeinen References: <566ABCD9.1060404@users.sourceforge.net> <0ea38611-3d93-0ade-a1fb-f8cc2e0b8d61@users.sourceforge.net> From: SF Markus Elfring Message-ID: Date: Wed, 21 Sep 2016 18:48:40 +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: <0ea38611-3d93-0ade-a1fb-f8cc2e0b8d61@users.sourceforge.net> X-Provags-ID: V03:K0:LAZCTmnEYB3ItlvVtPsPfe5yfLQ6Wk9ZYhvFrpmpCRJN1s8U9di 05fJ7h7VvT3uaVylZnm2FO7yMwSmcMEmydg74zlbgll5OEC54TDSSz7P+YQDdRcsd/bHKO1 Pkxycukgq5aq6TTbNn4L+A+U6L6QWshfWoH8G21ox9R/GozMWtEEa/QMDFWvJocXdnwEQiJ IJtNaG7LkT4rrFcGBTJKg== X-UI-Out-Filterresults: notjunk:1; V01:K0:hLKQ7eyBiBE=:y8kOq794EswdeHHrplg1T+ wkAuyVgNw83VBfHGQnXL5/y7ZRiOUFM5ap1jJkIW+qLTT2tc34PHjVY5fQRqfrj44PynCdmtN CRrqlvVzXiCGLAoKXRV45iQSkp1t+dZLVsJtYYfSUMBgxo3ejOEsz1vFr7Fs7WQfmgRPKlhnU 5vT1in5v0I01zqWI+74C0o64UcRf15muiYA4V5qBCsV0ltyQPcyZH6g+j4m/9Q7iVWJaezGfz CBfJubdIzh63ulvo5bxeJjz2T59u4cvKF/ZkZJiJaGvHUT5uk2rafHnXMHAHfDd3L+KaH01HL T/D0z9unmZMy474zwHWuoJc0F+FEz/KPqhE4EDT68ROrl6UOjmBKylFAkLyxjPwPyi8PJVnYu qg14oWCP/N4QwVRDsX1NgzcABHGZwT4qOKIyokrdPTU+DMBGsie+6l9Tz4Ayn/illSwTbd/a0 fDsczO0MMXY3N+oKisM6jKTc1QQjuOOWLscmscXL+Pi7ttwq+io0bbF+BqJ81KGqfA5EljqXO F7s/X6m6eOJatjLdHOpcIUDTfrw5+DLDAcS+el+AvKLWMoFqUZdd9VAYSrYhCXM8kT4znsDx+ CptaRKa9hlq+cS5F08HRMF8wfbYDuQa291ahtTSdUSjTt8dG7qYJDfeIUNb8qHmPkl386r/Tt nDTDsAmtMtP0bSt0pGn5dRkNTflM33BCGEpOOTL7u360Mg9iBcoueF/EjpAUjzcHHKMjFubY/ LNX+dPaOSdRfPIg7HXfVEQKPDm1/KKpC/+cAybRF3uJM1MaBP97b/A8DmqfCUwobvI9c7B/2H vytXk6V Cc: Julia Lawall , kernel-janitors@vger.kernel.org, LKML X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring Date: Wed, 21 Sep 2016 17:30:25 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c index c6a7197..5f6f21b 100644 --- a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c +++ b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c @@ -624,7 +624,7 @@ static int omap_dmm_probe(struct platform_device *dev) omap_dmm = kzalloc(sizeof(*omap_dmm), GFP_KERNEL); if (!omap_dmm) - goto fail; + goto check_dmm_removal; /* initialize lists */ INIT_LIST_HEAD(&omap_dmm->alloc_head); @@ -648,20 +648,20 @@ static int omap_dmm_probe(struct platform_device *dev) mem = platform_get_resource(dev, IORESOURCE_MEM, 0); if (!mem) { dev_err(&dev->dev, "failed to get base address resource\n"); - goto fail; + goto check_dmm_removal; } omap_dmm->base = ioremap(mem->start, SZ_2K); if (!omap_dmm->base) { dev_err(&dev->dev, "failed to get dmm base address\n"); - goto fail; + goto check_dmm_removal; } omap_dmm->irq = platform_get_irq(dev, 0); if (omap_dmm->irq < 0) { dev_err(&dev->dev, "failed to get IRQ resource\n"); - goto fail; + goto check_dmm_removal; } omap_dmm->dev = &dev->dev; @@ -699,7 +699,7 @@ static int omap_dmm_probe(struct platform_device *dev) dev_err(&dev->dev, "couldn't register IRQ %d, error %d\n", omap_dmm->irq, ret); omap_dmm->irq = -1; - goto fail; + goto check_dmm_removal; } /* Enable all interrupts for each refill engine except @@ -714,13 +714,13 @@ static int omap_dmm_probe(struct platform_device *dev) if (!omap_dmm->dummy_page) { dev_err(&dev->dev, "could not allocate dummy page\n"); ret = -ENOMEM; - goto fail; + goto check_dmm_removal; } /* set dma mask for device */ ret = dma_set_coherent_mask(&dev->dev, DMA_BIT_MASK(32)); if (ret) - goto fail; + goto check_dmm_removal; omap_dmm->dummy_pa = page_to_phys(omap_dmm->dummy_page); @@ -730,7 +730,7 @@ static int omap_dmm_probe(struct platform_device *dev) &omap_dmm->refill_pa, GFP_KERNEL); if (!omap_dmm->refill_va) { dev_err(&dev->dev, "could not allocate refill memory\n"); - goto fail; + goto check_dmm_removal; } /* alloc engines */ @@ -739,7 +739,7 @@ static int omap_dmm_probe(struct platform_device *dev) GFP_KERNEL); if (!omap_dmm->engines) { ret = -ENOMEM; - goto fail; + goto check_dmm_removal; } for (i = 0; i < omap_dmm->num_engines; i++) { @@ -758,7 +758,7 @@ static int omap_dmm_probe(struct platform_device *dev) GFP_KERNEL); if (!omap_dmm->tcm) { ret = -ENOMEM; - goto fail; + goto check_dmm_removal; } /* init containers */ @@ -772,7 +772,7 @@ static int omap_dmm_probe(struct platform_device *dev) if (!omap_dmm->tcm[i]) { dev_err(&dev->dev, "failed to allocate container\n"); ret = -ENOMEM; - goto fail; + goto check_dmm_removal; } omap_dmm->tcm[i]->lut_id = i; @@ -812,8 +812,7 @@ static int omap_dmm_probe(struct platform_device *dev) dev_info(omap_dmm->dev, "initialized all PAT entries\n"); return 0; - -fail: + check_dmm_removal: if (omap_dmm_remove(dev)) dev_err(&dev->dev, "cleanup failed\n"); return ret;