Message ID | 20241030112743.104395-6-pstanner@redhat.com |
---|---|
State | New |
Headers | show
Return-Path: <linux-ide+bounces-2660-incoming=patchwork.ozlabs.org@vger.kernel.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Fh/aPyPK; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=147.75.80.249; helo=am.mirrors.kernel.org; envelope-from=linux-ide+bounces-2660-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from am.mirrors.kernel.org (am.mirrors.kernel.org [147.75.80.249]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XdlLt6gCsz1xwF for <incoming@patchwork.ozlabs.org>; Wed, 30 Oct 2024 22:31:18 +1100 (AEDT) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 6A8CF1F26003 for <incoming@patchwork.ozlabs.org>; Wed, 30 Oct 2024 11:31:16 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id EC3731F1315; Wed, 30 Oct 2024 11:28:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Fh/aPyPK" X-Original-To: linux-ide@vger.kernel.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EDB521EF0B0 for <linux-ide@vger.kernel.org>; Wed, 30 Oct 2024 11:28:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730287714; cv=none; b=A6JMXE9MSd/SS6pIrOc87rYHURC3tkW+ROABkxGaWDfzTP+qxMF/Bl9QjQMnRG81lAnCM57fX+jgiY02LA/0HD1hyuWgVdIcWljJcCnxF9MwahCwe/mDVaz/fHXQZEig2SR2FSXEoCZIq7am3SFOjQGzNdNYBjdXJnkPGBLzWq0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730287714; c=relaxed/simple; bh=J3pG/0Gfw8HnALwZ/Br+hrSE4pEfpHhtl4LqImtqkrM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Kbkt+2lEwyNnNM9O4nJBci1pmUvnLv1uOY0pPmofRN/UDOSasDWR+/J/lYKwUCmwdLrJqYLEv2Zq8izFCUrdAzlKVUIS2e8Ned5svMad4PAYmj39bm6dwN5PCVZpo8XPepMFbDqvDP6zeMtAvnlk+8DdBMBmifQh2MChlWcmFtk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=Fh/aPyPK; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1730287711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tLUy2S875DNBeHIOQOxEOE4p7AHnezc+a90RKtjms08=; b=Fh/aPyPKwWaUvKSpb5F+e7RnC+1DWDoEH+vK5D3kiqW/RWk+gqVp7Vtmm5J3mBgqmzNeDM QZQyHgI2IsdlzZDwr4GvfUz4yUeVuuimVigbvhfNQ919WIBLEHEcguiT3wmDcZcv2RYuzL ylHuOUbwSYcPQOCwfU5/pMyER/YsqQ4= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-562-NVrV2XJ8OZq6Uzd255JdAg-1; Wed, 30 Oct 2024 07:28:30 -0400 X-MC-Unique: NVrV2XJ8OZq6Uzd255JdAg-1 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-a9a157d028aso131692866b.2 for <linux-ide@vger.kernel.org>; Wed, 30 Oct 2024 04:28:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730287703; x=1730892503; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tLUy2S875DNBeHIOQOxEOE4p7AHnezc+a90RKtjms08=; b=Vw/OFj7UoVs2qnsnBrXhG9pfxzoP2DtLXzDQNVLKCi/0crT0lHVcojjx2P1TIcrqT6 XShmUhH1TZwZMHP7eU8ir4JAnyuuiKFgAsYU5G2KLpfpcxAcM9piV3TVRDRjGGBsuvxz +sDhAtqEJIgTnozn4+AEAZvLvxE+nVNVI8ce0hNBzMMKzj3wnPbxCUOgC4mBv1q8bdZn JII7im4YflXFOy6XsBNlP2ErMaPzK9YNLvq2gLbZ2WnfWc/SJ1DnUaeGpw/g3teqFhHU 1YlUWpgZbJfls6FC25Mmy11I9i/hCv9W7Q6U3dlnwYyYaBKsfst+mJlHVzmLKXu9JSyw WMWw== X-Forwarded-Encrypted: i=1; AJvYcCWUEHxiaEeOAA1eZGEcxYkdQzSIseJ1vCizWw3rsWTBz+vJQxgAnHe3reVLxC3X9KCEiPh1OlCWGZM=@vger.kernel.org X-Gm-Message-State: AOJu0YzutxIF0kPCht7cGCY0rNlXMd+Qjvb+j/Ep+VcCn6Pr+DGZpv6a g0fQlyG8HL+aiN/43xW5wg8gGxauAft2dEMYUhL8+blcMj73Hq4TMQ2Xpq5//9N/z76/9vpGmm6 c2PjSsqZW35qe9elcbMNd94noElL8eG0StH/aXPICPoCKlG8RoZvuhGSKSA== X-Received: by 2002:a17:907:3a95:b0:a9e:3af1:eb1b with SMTP id a640c23a62f3a-a9e3af1ebbcmr190401166b.38.1730287702724; Wed, 30 Oct 2024 04:28:22 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFToQp/dfLAgkkWdoKZY9+BkNjMsRPPHY3dBsz+y7GusLq7PV1rFcL96Aa7HB79+WgO83hbWg== X-Received: by 2002:a17:907:3a95:b0:a9e:3af1:eb1b with SMTP id a640c23a62f3a-a9e3af1ebbcmr190399766b.38.1730287702314; Wed, 30 Oct 2024 04:28:22 -0700 (PDT) Received: from eisenberg.fritz.box ([2001:16b8:3db7:f800:98bb:372a:45f9:41e4]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a9b30f58991sm557324566b.159.2024.10.30.04.28.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Oct 2024 04:28:21 -0700 (PDT) From: Philipp Stanner <pstanner@redhat.com> To: Jonathan Corbet <corbet@lwn.net>, Damien Le Moal <dlemoal@kernel.org>, Niklas Cassel <cassel@kernel.org>, Giovanni Cabiddu <giovanni.cabiddu@intel.com>, Herbert Xu <herbert@gondor.apana.org.au>, "David S. Miller" <davem@davemloft.net>, Boris Brezillon <bbrezillon@kernel.org>, Arnaud Ebalard <arno@natisbad.org>, Srujana Challa <schalla@marvell.com>, Alexander Shishkin <alexander.shishkin@linux.intel.com>, Miri Korenblit <miriam.rachel.korenblit@intel.com>, Kalle Valo <kvalo@kernel.org>, Jon Mason <jdmason@kudzu.us>, Dave Jiang <dave.jiang@intel.com>, Allen Hubbe <allenbh@gmail.com>, Bjorn Helgaas <bhelgaas@google.com>, Kevin Cernekee <cernekee@gmail.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Jiri Slaby <jirislaby@kernel.org>, Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>, Mark Brown <broonie@kernel.org>, David Lechner <dlechner@baylibre.com>, =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>, Philipp Stanner <pstanner@redhat.com>, Jie Wang <jie.wang@intel.com>, Michal Witwicki <michal.witwicki@intel.com>, Przemek Kitszel <przemyslaw.kitszel@intel.com>, Adam Guerin <adam.guerin@intel.com>, Damian Muszynski <damian.muszynski@intel.com>, Bharat Bhushan <bbhushan2@marvell.com>, Nithin Dabilpuram <ndabilpuram@marvell.com>, Johannes Berg <johannes.berg@intel.com>, Emmanuel Grumbach <emmanuel.grumbach@intel.com>, Benjamin Berg <benjamin.berg@intel.com>, Breno Leitao <leitao@debian.org>, Yedidya Benshimol <yedidya.ben.shimol@intel.com>, Serge Semin <fancer.lancer@gmail.com>, zhang jiao <zhangjiao2@cmss.chinamobile.com>, Florian Fainelli <florian.fainelli@broadcom.com>, =?utf-8?q?Ilpo_J=C3=A4rvi?= =?utf-8?q?nen?= <ilpo.jarvinen@linux.intel.com> Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org, qat-linux@intel.com, linux-crypto@vger.kernel.org, linux-wireless@vger.kernel.org, ntb@lists.linux.dev, linux-pci@vger.kernel.org, linux-serial@vger.kernel.org, linux-sound@vger.kernel.org Subject: [PATCH v6 05/10] intel_th: pci: Replace deprecated PCI functions Date: Wed, 30 Oct 2024 12:27:38 +0100 Message-ID: <20241030112743.104395-6-pstanner@redhat.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241030112743.104395-1-pstanner@redhat.com> References: <20241030112743.104395-1-pstanner@redhat.com> Precedence: bulk X-Mailing-List: linux-ide@vger.kernel.org List-Id: <linux-ide.vger.kernel.org> List-Subscribe: <mailto:linux-ide+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-ide+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit |
Series |
Remove pcim_iomap_regions_request_all()
|
expand
|
diff --git a/drivers/hwtracing/intel_th/pci.c b/drivers/hwtracing/intel_th/pci.c index 0d7b9839e5b6..e9d8d28e055f 100644 --- a/drivers/hwtracing/intel_th/pci.c +++ b/drivers/hwtracing/intel_th/pci.c @@ -23,7 +23,6 @@ enum { TH_PCI_RTIT_BAR = 4, }; -#define BAR_MASK (BIT(TH_PCI_CONFIG_BAR) | BIT(TH_PCI_STH_SW_BAR)) #define PCI_REG_NPKDSC 0x80 #define NPKDSC_TSACT BIT(5) @@ -83,10 +82,16 @@ static int intel_th_pci_probe(struct pci_dev *pdev, if (err) return err; - err = pcim_iomap_regions_request_all(pdev, BAR_MASK, DRIVER_NAME); + err = pcim_request_all_regions(pdev, DRIVER_NAME); if (err) return err; + if (!pcim_iomap(pdev, TH_PCI_CONFIG_BAR, 0)) + return -ENOMEM; + + if (!pcim_iomap(pdev, TH_PCI_STH_SW_BAR, 0)) + return -ENOMEM; + if (pdev->resource[TH_PCI_RTIT_BAR].start) { resource[TH_MMIO_RTIT] = pdev->resource[TH_PCI_RTIT_BAR]; r++;