From patchwork Wed Apr 15 07:40:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11490223 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 40F0B6CA for ; Wed, 15 Apr 2020 07:43:22 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1F9BB206D9 for ; Wed, 15 Apr 2020 07:43:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="COiUy+78" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1F9BB206D9 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AD4A86E8B0; Wed, 15 Apr 2020 07:41:47 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by gabe.freedesktop.org (Postfix) with ESMTPS id 065A06E8CE for ; Wed, 15 Apr 2020 07:41:40 +0000 (UTC) Received: by mail-wm1-x344.google.com with SMTP id y24so17675458wma.4 for ; Wed, 15 Apr 2020 00:41:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZWa+0Oys+vMQm0MRzpu+zoysYIM61WV8KWl6BOTV5TM=; b=COiUy+78SV03+5BB4HxAfAXqTsH3Aug+6v795tyzUOTzplfzbun9T8hiRT+MdVCQty 2VB5ugeoidB2RaLFMz5jr7/F7TdlcaJgL/5VVWQMlWilA/rIQY7N3j/L91YLypZMvNT+ 4BPDkLoLa6sS6q3ET4EIjOziuXV/47BS83tpY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZWa+0Oys+vMQm0MRzpu+zoysYIM61WV8KWl6BOTV5TM=; b=uJEvXuW4tKv5FEPBIv7+JvQvI0xWATkalELGGGdAIRtIQ0NSggpWLbNQCzFv1VPIbb 4WHcfc9dWnzJAPhPmoUakVEu9XLO6OcE3hD7idiHob1+NRM7EMLajTfSVShGR4VgR1gp Lao1K2pojkTcbmCOSbD551YGGTnxaXVofUX+ItnPdSqXZLdfQNzQzqqMKmMJmv10kKMS AOOr/a7FR+q/9bFyEKcPrFz0jybPUgl0BJFQrq9zv6Ekn9hkZsN226rJjkk0Qui9c5LO 6PFdrMcs1bcg0CMgRi3d2dd/ocrYgtLI+su1E7B4ZJiDhXhIl2vy1lUPXx8bThfmDHS4 KEXQ== X-Gm-Message-State: AGi0PuZ6083DdU0lK1c3w0isBxCgIsCAkOQE86fhQmYoQIsrgkJ3OQfH AE1NrWTA3hNczKDQRiYeXet0wg== X-Google-Smtp-Source: APiQypIQlrmcnQ3TzOri+kZR478vwbjnd+j6WkNeCyzansv5PLdEwvtlt1jQ56O3dub3FqnsMnX3zQ== X-Received: by 2002:a7b:c404:: with SMTP id k4mr3575540wmi.37.1586936498669; Wed, 15 Apr 2020 00:41:38 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id u30sm1878552wru.13.2020.04.15.00.41.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Apr 2020 00:41:38 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Subject: [PATCH 57/59] drm/ast: Use managed pci functions Date: Wed, 15 Apr 2020 09:40:32 +0200 Message-Id: <20200415074034.175360-58-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200415074034.175360-1-daniel.vetter@ffwll.ch> References: <20200415074034.175360-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , DRI Development , Gerd Hoffmann , Thomas Zimmermann , Daniel Vetter , Dave Airlie , Sam Ravnborg , =?utf-8?q?Christian_K=C3=B6nig?= , Emil Velikov Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Allows us to remove a bit of cleanup code. Signed-off-by: Daniel Vetter Cc: Dave Airlie Cc: Thomas Zimmermann Cc: Gerd Hoffmann Cc: Daniel Vetter Cc: Emil Velikov Cc: "Noralf Trønnes" Cc: Sam Ravnborg Cc: "Christian König" Cc: "Y.C. Chen" Reviewed-by: Thomas Zimmermann --- drivers/gpu/drm/ast/ast_drv.c | 10 +++------- drivers/gpu/drm/ast/ast_main.c | 3 --- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c index b7ba22dddcad..48a9cc4e080a 100644 --- a/drivers/gpu/drm/ast/ast_drv.c +++ b/drivers/gpu/drm/ast/ast_drv.c @@ -91,15 +91,13 @@ static int ast_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ast_kick_out_firmware_fb(pdev); - ret = pci_enable_device(pdev); + ret = pcim_enable_device(pdev); if (ret) return ret; dev = drm_dev_alloc(&driver, &pdev->dev); - if (IS_ERR(dev)) { - ret = PTR_ERR(dev); - goto err_pci_disable_device; - } + if (IS_ERR(dev)) + return PTR_ERR(dev); dev->pdev = pdev; pci_set_drvdata(pdev, dev); @@ -120,8 +118,6 @@ static int ast_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ast_driver_unload(dev); err_drm_dev_put: drm_dev_put(dev); -err_pci_disable_device: - pci_disable_device(pdev); return ret; } diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c index e5398e3dabe7..1b35728ad871 100644 --- a/drivers/gpu/drm/ast/ast_main.c +++ b/drivers/gpu/drm/ast/ast_main.c @@ -531,8 +531,5 @@ void ast_driver_unload(struct drm_device *dev) drm_mode_config_cleanup(dev); ast_mm_fini(ast); - if (ast->ioregs != ast->regs + AST_IO_MM_OFFSET) - pci_iounmap(dev->pdev, ast->ioregs); - pci_iounmap(dev->pdev, ast->regs); kfree(ast); }