From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754184AbcIVGVh (ORCPT ); Thu, 22 Sep 2016 02:21:37 -0400 Received: from mout.web.de ([212.227.15.4]:54461 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750770AbcIVGVg (ORCPT ); Thu, 22 Sep 2016 02:21:36 -0400 Subject: [PATCH 2/4] GPU-DRM-QXL: Move three assignments in qxl_device_init() To: dri-devel@lists.freedesktop.org, Bhaktipriya Shridhar , Daniel Vetter , David Airlie , =?UTF-8?Q?Noralf_Tr=c3=b8nnes?= , Tejun Heo , Thierry Reding References: Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: Date: Thu, 22 Sep 2016 08:21:14 +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: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:OWn6ksd5uO98Zsa/J1zBT6qmcAn+2+n5u7frn4T36oUAIcfvoDX zd+MmDZ8W/R66xitvg1v/sJYaV5QfVn+wnJk5eKYPU/s+BYYAVcD2D42M8Pvz8CMq9qETBS Wq5LplouDzzVsdv32Fq6RbMMRJlOt6c6aQ/iCSSGQs/Rw1zJ6ba+LnfOsmtTbMbLz8kq3Wt k4mEzQj6OuavLBP9FziSA== X-UI-Out-Filterresults: notjunk:1;V01:K0:kB8dFQWSE4A=:zxE5EApx+VMyx3x5ePCsKA mf70ieu9jchKvUXtML7Dd1wc+tPtIQFlw8XmReTXzFU+kUcPOIAli4KBiDUb67ncnmlHT+XFW Ieu/3qKYYAaqG8XDBrgBKygm4RU3D1rec83mFzp5NhZxekv/AXrUq889cE7jspf+biqk22Xu9 GfMhgNycpkjwDoKqOOEstio0ZYQ5Dr4rUqE+++v5kxU1W6bLZ+ryX0gyELTXCzUrOEFpYiuIp WO2/poilQ3TC8mArD6bXv4fkQRH5fG/oc8mp1RIsQyHX27W1BBdvIEDtFwRVXdrYsgl/vKFRa 6IixwQO0GJnqGKqgkbfq2ZTGy4sMwPEdAlqbq79IJgdXvMI644I6yPhDCh3xCcUHIc/g3WLw4 PO+tEj6RtkK8oeSg3rF0WAuewCZAU+EUpq0bVuQbDcF9NuG4JGv7Uw5QDuvBWe39esDtmCvG/ wsth7TfrJdZHoC9t7VIJdkHYIznTjdOcnczpV8vJ98wTgDtW07Eeh5bfNotvhbu7gk9QEkwBn ZX5lWEqadHxcjaxtAnk/uCjPS82Jaz2uAEc4qpFN0R8qIplnrDGtOIUfQbaPJsmz9MZ9zhRAr zx9vmuyeBvYOGZ5VVJA6ItHKeRxweAqbTewbpD0ViYA2ikmkK69RZA1/qg7vstEVyuztfZgBz kFS+bK1VnzTBMfVnnnpjUlxU170tI8lWW1hGSU/Xgp4YazqfwFQMutT/l0OfIjWRc9sT7ezHK MX97uddIsxnSPboeQLyVE97+duC2+wsX6MQO9t2Ky1jcf6wiwgrKRw/q1EpzuPsLJlTvtTu0K eFhSHgU Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Wed, 21 Sep 2016 22:33:54 +0200 Move the assignments for three data structure members to the end so that they will only be performed if the desired resource allocations succeeded by this function. Signed-off-by: Markus Elfring --- drivers/gpu/drm/qxl/qxl_kms.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/qxl/qxl_kms.c b/drivers/gpu/drm/qxl/qxl_kms.c index 76852f1..76780c2 100644 --- a/drivers/gpu/drm/qxl/qxl_kms.c +++ b/drivers/gpu/drm/qxl/qxl_kms.c @@ -212,10 +212,6 @@ static int qxl_device_init(struct qxl_device *qdev, /* TODO - slot initialization should happen on reset. where is our * reset handler? */ qdev->n_mem_slots = qdev->rom->slots_end; - qdev->slot_gen_bits = qdev->rom->slot_gen_bits; - qdev->slot_id_bits = qdev->rom->slot_id_bits; - qdev->va_slot_mask = - (~(uint64_t)0) >> (qdev->slot_id_bits + qdev->slot_gen_bits); qdev->mem_slots = kmalloc_array(qdev->n_mem_slots, sizeof(*qdev->mem_slots), GFP_KERNEL); @@ -260,7 +256,10 @@ static int qxl_device_init(struct qxl_device *qdev, INIT_WORK(&qdev->gc_work, qxl_gc_work); - + qdev->slot_gen_bits = qdev->rom->slot_gen_bits; + qdev->slot_id_bits = qdev->rom->slot_id_bits; + qdev->va_slot_mask = + (~(uint64_t)0) >> (qdev->slot_id_bits + qdev->slot_gen_bits); return 0; } -- 2.10.0