From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S938712AbcIVRls (ORCPT ); Thu, 22 Sep 2016 13:41:48 -0400 Received: from mout.web.de ([212.227.15.4]:51103 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936526AbcIVRl2 (ORCPT ); Thu, 22 Sep 2016 13:41:28 -0400 Subject: [PATCH 09/14] GPU-DRM-TTM: Return directly after a failed kzalloc() in ttm_dma_page_alloc_init() To: dri-devel@lists.freedesktop.org, Daniel Vetter , David Airlie , Emil Velikov References: <566ABCD9.1060404@users.sourceforge.net> <4d34446f-05ad-c3ce-5d33-8fb4f25af25c@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <30cd1943-7762-65b7-4307-39ae0acdf699@users.sourceforge.net> Date: Thu, 22 Sep 2016 19:41:20 +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: <4d34446f-05ad-c3ce-5d33-8fb4f25af25c@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:Iw15nIMYZPek+qhlptgHfU/cf6VznkylcOXsFJwJ8upiQZU0X/S +IQpTozuF6u9IizPWVa/XI5xSoR6KyNJR6WswMcA7m/KS9SQIFDxQSMjzS6on3+E5VKqyBX Nbr4XJ0xqgPioPTlbvxpAK3mHwhFTedUuY8W4EoGYflmIWPBXh+L6pK1dl1DH4sHTv4DwMi 5BXus20z/o4PN4DPDIAsw== X-UI-Out-Filterresults: notjunk:1;V01:K0:yHU3yPHjcGk=:TfzgbmwN0BfWkKlrQR8fSw 26SoI8aLgDz9tGOuVtnRuzBZlqUeV/el1oudn5abpxklSvevPB0PaZfxzyTqccWemXIlo32e2 uP+kq3vgjH/hISPrDyRWlR6uQjO5ntQpoJfQ8mFnXREQ66LxeepZSGfcLC4MfCw02olxJnM0O 9ZsWdOIW+U2yywfszjuz7s1cGz712MON077lT5loYJXQsxnxHkKhPCEKR3FWgzktYhw06ItFZ 4hNemRAUPQ1HWUeRFLTiooFN6CFKkVGtBMHN4qQl6QAKw3rD2udvYlv9EWcUpWUS+WR0PifuZ ku+gWP/YGs9B/nhRETjCjDmlfA6Nlb7NI3D23kC3rAgCkc/dE2MkH8yXbosrVvIq4KV0KTlJa 9DkregnuP15VEhl2DONTfDbX3KzTdaNNGSxEWaGFymylpP9+Jw0/P0syY47FkfpSnL52TBh/n 3Grue4aYcMDQff3a95+Yf9S1o86WEjSi7quxxPYArpdjpE1k5UjgGQD+8OD0UB8atQm60kwg+ nEGzh5Inwxd4ulAn9JAGbnBG1zdrhrbmQC1PKZrGvLZnAo9y0c1oM5UlfuUgl/X3TetC/XTQJ Ox+nhlkY6acJ9PhoSaf76rjC23kOygJknFwv/7F1mjOlTCSBLcw1S9tPjGI20jdE+Jfn8vRMq 5J7JlPgU43sJxsaSre7V3DS1an4ZbRbofDksTPk9mJLZetpvnT1TrhPuk5J/V+kCUUsxiEzls Wt8AhtKox79RB/px7LGDOaOipjIC8qLOtGU77WdTfedOD7XH1er1v383BEyaqBUv+up24atun HBzELMQ Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Thu, 22 Sep 2016 16:16:36 +0200 * Return directly after a memory allocation failed in this function at the beginning. * Delete the explicit initialisation for the local variable "ret" which became unnecessary with this refactoring. Signed-off-by: Markus Elfring --- drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c index e3f5542..feba278 100644 --- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c +++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c @@ -1080,7 +1080,7 @@ static void ttm_dma_pool_mm_shrink_fini(struct ttm_pool_manager *manager) int ttm_dma_page_alloc_init(struct ttm_mem_global *glob, unsigned max_pages) { - int ret = -ENOMEM; + int ret; WARN_ON(_manager); @@ -1088,7 +1088,7 @@ int ttm_dma_page_alloc_init(struct ttm_mem_global *glob, unsigned max_pages) _manager = kzalloc(sizeof(*_manager), GFP_KERNEL); if (!_manager) - goto err; + return -ENOMEM; mutex_init(&_manager->lock); INIT_LIST_HEAD(&_manager->pools); -- 2.10.0