From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (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 2AAA5225DA for ; Fri, 25 Oct 2024 15:31:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729870300; cv=none; b=eISz482OG90FlgiTGBaQPBeD/FuYILfl1XoF2wLfbmRUwgs8naAub5gUvDQaJ/x0djn0RkP7iiNs8M2FQdCnrEl/Jk3OVTk/rwA9c3CpXGIMMIG8cbrydk9de9t3rKaxbnqR9ZUpjTaDNrYCktW39d3NegJgnOjob4HSZMOLAhw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729870300; c=relaxed/simple; bh=/2J1GjARnQin8IDRVr7yEGcvHtYaMVqYqN1depWkivw=; h=From:Date:To:cc:Subject:In-Reply-To:Message-ID:References: MIME-Version:Content-Type; b=mqPc+b70lcMSx0zlNwMl9NnbbwHtdGVmXAmF+RHvwlyguSs//zhzML67zLHEN0cOqUpq2I0vhs5v/AIBnLmb7fi7MEeCTyccQ1M9StnlBh2bVWjTRjMHGDpHfkV6DvuzfRlISKMlym4/mDfi+e6pwusUtVHnQzC42v8jnX/uARU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=WCIwKWV7; arc=none smtp.client-ip=198.175.65.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="WCIwKWV7" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1729870299; x=1761406299; h=from:date:to:cc:subject:in-reply-to:message-id: references:mime-version; bh=/2J1GjARnQin8IDRVr7yEGcvHtYaMVqYqN1depWkivw=; b=WCIwKWV75tQHximWHDLGpb5B/035oqkqGDHbHW9Q42C9RB5mVKsgu1ia LCH4r542zd6jARGNxiXzhFmdoYktSmbbuiC/IUrh7cM9JrhJ7DM2iVJCK PriTQy+U12SgeOqirJdqVU2fQHkYaqwiKzFmLjW1waMKSCg2P/6ioCnNf PJ8jqjQi8zb6B5cW2ZwqGazxABK+1pnZ6v/GgnX/qHy1GNruKRe93Kd9X fKe020Iaj6sBJeV9jiIgmYLDw5IoMG9Z4oOzLfsQI4RSB1SUtoReCdqXr 7eMwkNT3Li6s/e9O8OBqVnxxTfFJtyo9AV7EFFWErsNSfXdk409XgwuSQ A==; X-CSE-ConnectionGUID: 5ru91C/ERPubrT5qI6Mbww== X-CSE-MsgGUID: DyyBO50vQj2kjPhJahURuQ== X-IronPort-AV: E=McAfee;i="6700,10204,11236"; a="40935921" X-IronPort-AV: E=Sophos;i="6.11,232,1725346800"; d="scan'208";a="40935921" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Oct 2024 08:31:38 -0700 X-CSE-ConnectionGUID: R52BphinSZOxfUkm8HgmHg== X-CSE-MsgGUID: LI6dv1k3QkeHmZVNhcth6A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,232,1725346800"; d="scan'208";a="84901931" Received: from ijarvine-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.244.225]) by fmviesa003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Oct 2024 08:31:24 -0700 From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Date: Fri, 25 Oct 2024 18:31:21 +0300 (EEST) To: Philipp Stanner cc: Jonathan Corbet , Damien Le Moal , Niklas Cassel , Giovanni Cabiddu , Herbert Xu , "David S. Miller" , Boris Brezillon , Arnaud Ebalard , Srujana Challa , Alexander Shishkin , Miri Korenblit , Kalle Valo , Serge Semin , Jon Mason , Dave Jiang , Allen Hubbe , Bjorn Helgaas , Kevin Cernekee , Greg Kroah-Hartman , Jiri Slaby , Jaroslav Kysela , Takashi Iwai , Mark Brown , David Lechner , =?ISO-8859-15?Q?Uwe_Kleine-K=F6nig?= , Jie Wang , Tero Kristo , Adam Guerin , Shashank Gupta , Przemek Kitszel , Bharat Bhushan , Nithin Dabilpuram , Johannes Berg , Emmanuel Grumbach , Gregory Greenman , Benjamin Berg , Yedidya Benshimol , Breno Leitao , Florian Fainelli , linux-doc@vger.kernel.org, LKML , 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 , linux-sound@vger.kernel.org Subject: Re: [PATCH 06/10] wifi: iwlwifi: replace deprecated PCI functions In-Reply-To: <20241025145959.185373-7-pstanner@redhat.com> Message-ID: References: <20241025145959.185373-1-pstanner@redhat.com> <20241025145959.185373-7-pstanner@redhat.com> Precedence: bulk X-Mailing-List: ntb@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII On Fri, 25 Oct 2024, Philipp Stanner wrote: > pcim_iomap_table() and pcim_iomap_regions_request_all() have been > deprecated by the PCI subsystem in commit e354bb84a4c1 ("PCI: Deprecate > pcim_iomap_table(), pcim_iomap_regions_request_all()"). > > Replace these functions with their successors, pcim_iomap() and > pcim_request_all_regions(). > > Signed-off-by: Philipp Stanner > Acked-by: Kalle Valo > --- > drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 16 ++++------------ > 1 file changed, 4 insertions(+), 12 deletions(-) > > diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c > index 3b9943eb6934..4b41613ad89d 100644 > --- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c > +++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c > @@ -3533,7 +3533,6 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev, > struct iwl_trans_pcie *trans_pcie, **priv; > struct iwl_trans *trans; > int ret, addr_size; > - void __iomem * const *table; > u32 bar0; > > /* reassign our BAR 0 if invalid due to possible runtime PM races */ > @@ -3659,22 +3658,15 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev, > } > } > > - ret = pcim_iomap_regions_request_all(pdev, BIT(0), DRV_NAME); > + ret = pcim_request_all_regions(pdev, DRV_NAME); > if (ret) { > - dev_err(&pdev->dev, "pcim_iomap_regions_request_all failed\n"); > + dev_err(&pdev->dev, "pcim_request_all_regions failed\n"); > goto out_no_pci; > } > > - table = pcim_iomap_table(pdev); > - if (!table) { > - dev_err(&pdev->dev, "pcim_iomap_table failed\n"); > - ret = -ENOMEM; > - goto out_no_pci; > - } > - > - trans_pcie->hw_base = table[0]; > + trans_pcie->hw_base = pcim_iomap(pdev, 0, 0); > if (!trans_pcie->hw_base) { > - dev_err(&pdev->dev, "couldn't find IO mem in first BAR\n"); > + dev_err(&pdev->dev, "pcim_iomap failed\n"); This seems a step backwards as a human readable English error message was replaced with a reference to a function name. -- i. > ret = -ENODEV; > goto out_no_pci; > } >