From mboxrd@z Thu Jan 1 00:00:00 1970 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 D91C3187344 for ; Fri, 25 Oct 2024 15:40:47 +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=1729870850; cv=none; b=EJl+AUCjiRWb0nOTiUAcuEHCMFRYlWAxuUgAHOx/mvTdmLM3ctxfnoM1UlK0hXDj0h0QuChzZEXEv1CKW64MGcPFa7JYYhekr2Xd4J2Y/qZFs7A17xOhAuOaH+o7wj7eYdqgSvQadOves5NrskGgG/7c6WrHrRL3B+QFwARb8kU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729870850; c=relaxed/simple; bh=bucM69zhnxn5/hKlJK4fqgGKg509HVAnLVGWxMBxtFs=; h=Message-ID:Subject:From:To:Cc:Date:In-Reply-To:References: Content-Type:MIME-Version; b=jJMJBwNN8jSSdB2lsAk8rjnlgwzH8WgB1Ug4OSckM1nKsZuq3gLKZaCaO0fP8e6DU+vwe2NDrEc9VeqPk5t95n72yMx4s7kx+Pn8DdT19o50AMsiVgaK82Jb97xneRIM/rUMS+gLEjMe4z2UXWw/8BIO7dTL4dJFcIN9+xGfeU0= 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=TA+/rrcH; 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="TA+/rrcH" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729870846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XzoMdLAmboBYe/1IRrBdZaOPlgpz2yyMsskVNx8zBnM=; b=TA+/rrcHZfPes9xfCE4grfT28IqRltBCMGFKQL1pZtTKgSEiOX+wRTgc7KnBuBRwZXlBIh sa1h87zTn/QvTmQQ0bgx2SPwqCICPDk2ngGfI1DfhmQdKZdS9QLVd5Xzgy9v5gd38AEhgC I3K2wn0ukDE312ddt5B1ML47rCY6ydk= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-284-8WxSWePJNFaSm_VxrgCHbA-1; Fri, 25 Oct 2024 11:40:45 -0400 X-MC-Unique: 8WxSWePJNFaSm_VxrgCHbA-1 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-5cbad810711so941990a12.1 for ; Fri, 25 Oct 2024 08:40:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729870844; x=1730475644; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=XzoMdLAmboBYe/1IRrBdZaOPlgpz2yyMsskVNx8zBnM=; b=ihAbfHaI1mmqY2dsSZ862IF4gd7gkk4CfiwKuh6V6tQNHTWgQMTWIivitDrNTDJwbg oABIoqUUWHwppT3JjAGfh/6I2kCyMFCmeGkqZV8nQbpNC9TWULwiJtffq+F9+ogEfzAf 7JOgcxATAlgAHyh/gp0Gu2tGnwQc51WMIK4pba6JnxdLYRgCbd1GENfI7DLLQHzhF9mz mmR5ggPhLa8V+tPC2qN0J1no6ZjdMdbkZiM9749Puc6jGgmKWfswyxpqkga8ItCAVCAD wfJoVA3gjQURa1ANrlPc8QK/XZiIlCVJ66G55YOe9ow8ZCa4lO73PmC/fnzZWc+wIU3b Pcew== X-Forwarded-Encrypted: i=1; AJvYcCXBS95FrKADYHSKzIM6aXNm/C8RrqVqJ5tr59stCfpV2Fizo5u3ISzGz2WRgXk5hRm4JA2FjcAQYr0=@vger.kernel.org X-Gm-Message-State: AOJu0YwZFnRtMyrJQbJegh984BSwGSRCGWb+EqLcd4DVQdhde39awZfm 7fZyeDLwIcdFYN9RtOkKb0LfPGo1xlEziOVtJR+8Yhy2yfpqnECPErbv6yAG8kpCUrEdke110dn L9gNAkaWC4ZCaa307k3dxOLABa/TMk3Nuk7AoQKeCdTfIOnGOHRbw26VwGw== X-Received: by 2002:a05:6402:2708:b0:5cb:6718:660a with SMTP id 4fb4d7f45d1cf-5cba242fd48mr4898157a12.9.1729870843876; Fri, 25 Oct 2024 08:40:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG/Zcv+ZRlluNXU1aQ1MGYzlRmBIYaLWcpFVZkMbyXea+x6Kqw2wJYkAxS4CN0OGWslX2I1RQ== X-Received: by 2002:a05:6402:2708:b0:5cb:6718:660a with SMTP id 4fb4d7f45d1cf-5cba242fd48mr4898108a12.9.1729870843339; Fri, 25 Oct 2024 08:40:43 -0700 (PDT) Received: from eisenberg.fritz.box (200116b82de5ba00738ac8dadaac7543.dip.versatel-1u1.de. [2001:16b8:2de5:ba00:738a:c8da:daac:7543]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5cbb613c3e9sm747217a12.0.2024.10.25.08.40.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Oct 2024 08:40:42 -0700 (PDT) Message-ID: <415402ba495b402b67ae9ece0ca96ab3ea5ee823.camel@redhat.com> Subject: Re: [PATCH 06/10] wifi: iwlwifi: replace deprecated PCI functions From: Philipp Stanner To: Ilpo =?ISO-8859-1?Q?J=E4rvinen?= 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 , Uwe =?ISO-8859-1?Q?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 Date: Fri, 25 Oct 2024 17:40:39 +0200 In-Reply-To: References: <20241025145959.185373-1-pstanner@redhat.com> <20241025145959.185373-7-pstanner@redhat.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.52.4 (3.52.4-1.fc40) Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 On Fri, 2024-10-25 at 18:31 +0300, Ilpo J=C3=A4rvinen wrote: > On Fri, 25 Oct 2024, Philipp Stanner wrote: >=20 > > 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()"). > >=20 > > Replace these functions with their successors, pcim_iomap() and > > pcim_request_all_regions(). > >=20 > > Signed-off-by: Philipp Stanner > > Acked-by: Kalle Valo > > --- > > =C2=A0drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 16 ++++--------= - > > --- > > =C2=A01 file changed, 4 insertions(+), 12 deletions(-) > >=20 > > 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, > > =C2=A0 struct iwl_trans_pcie *trans_pcie, **priv; > > =C2=A0 struct iwl_trans *trans; > > =C2=A0 int ret, addr_size; > > - void __iomem * const *table; > > =C2=A0 u32 bar0; > > =C2=A0 > > =C2=A0 /* 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, > > =C2=A0 } > > =C2=A0 } > > =C2=A0 > > - ret =3D pcim_iomap_regions_request_all(pdev, BIT(0), > > DRV_NAME); > > + ret =3D pcim_request_all_regions(pdev, DRV_NAME); > > =C2=A0 if (ret) { > > - dev_err(&pdev->dev, > > "pcim_iomap_regions_request_all failed\n"); > > + dev_err(&pdev->dev, "pcim_request_all_regions > > failed\n"); > > =C2=A0 goto out_no_pci; > > =C2=A0 } > > =C2=A0 > > - table =3D pcim_iomap_table(pdev); > > - if (!table) { > > - dev_err(&pdev->dev, "pcim_iomap_table failed\n"); > > - ret =3D -ENOMEM; > > - goto out_no_pci; > > - } > > - > > - trans_pcie->hw_base =3D table[0]; > > + trans_pcie->hw_base =3D pcim_iomap(pdev, 0, 0); > > =C2=A0 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"); >=20 > This seems a step backwards as a human readable English error message > was=20 > replaced with a reference to a function name. I think it's still an improvement because "couldn't find IO mem in first BAR" is a nonsensical statement. What the author probably meant was: "Couldn't find first BAR's IO mem in magic pci_iomap_table" ;) The reason I just wrote "pcim_iomap failed\n" is that this seems to be this driver's style for those messages. See the dev_err() above, there they also just state that this or that function failed. I am indifferent about the message, though. Whatever the maintainer prefers is fine. P.