From patchwork Mon Aug 19 16:51:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Stanner X-Patchwork-Id: 13768730 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D70D5C52D7C for ; Mon, 19 Aug 2024 17:03:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=CY9vOmK/BQyCj3xBb0Ms143MMS/6lF8CP2tePbnpXiU=; b=mMqyqgTjuW7jJ3PHlbocvcFjhX Cv3uD71bN+ca/qjouuxdwPV3x3fi2UlX8xj+e028zQSrsiBMoqTjRM++V5ejt6YfxMpjzxhywtwjQ D2jHW1X5jQNE0WAqRr/ykFS2LBlSICrODFaBXgIjs/pbfvu2Pkgeb42+kTEocQQZ6YzSluth5Z0mI zUNQ0nLxDnfzIieerXXnrICjF3OXfgdazjaGY7wffWVhN3dwiYhpG/vl58hAwgz2/fdcC4fItcc6P TllkDRAHShLwuBENDZgj7ijzhXhOrudtD5VJNScYc1UWPDLj+rjuvLuNuCokY8Sff2JRNQDCOHPl/ Ykv5mcFQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sg5nE-00000002J5x-46pC; Mon, 19 Aug 2024 17:03:44 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sg5d1-00000002Fk5-3HSl for linux-arm-kernel@bombadil.infradead.org; Mon, 19 Aug 2024 16:53:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Content-Transfer-Encoding :MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Sender:Reply-To:Content-ID:Content-Description; bh=CY9vOmK/BQyCj3xBb0Ms143MMS/6lF8CP2tePbnpXiU=; b=Skp4MBtzANehSc3xwk3jIZNUwK Y9a3TRjh9A/1upntodc1CHODTfZagNt4+gHs+LGGbvinNtzmXW5a9clxpyvhbTdZ1PYCxaloWIEzn CtvaoIWheA70OCqNcXCpfsJXRq4szRUDkZF6ohEhypn0VHFn4zq6rYu1fROr/p0RuB8sRnxGvmyPr CVXRAWaIi/AhHp8mQQEqFaHYn0hmYfm9qZRfTGrSof2r1A99HvMbaQ6TyeG+fnM+3zYOOu1o/uPYu eS/EpGktTcsXRp/xdXp1uar3O/aVnmssS5qQtJZHv9voHp0oqyjq2VSKlVUYw4gS8VZW6oj6n5+B+ NxoiQ+NA==; Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sg5cy-00000009AxB-2SKo for linux-arm-kernel@lists.infradead.org; Mon, 19 Aug 2024 16:53:10 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724086380; 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=CY9vOmK/BQyCj3xBb0Ms143MMS/6lF8CP2tePbnpXiU=; b=hiLheg1k8cZl6XX8/rkov5loX8nwBs9XF1YEiihV9lU45OkWp6i7l6NzzMqK+vnjkLHCCq c75WzBkHWoWL49RM4XcJEf/r9rkst+a9ckFl3xobPraaH5ed07dJ2vxLSYtknj64NN41jY c1A7iLOWRsdixk25C2n6nZ10TOe7y4I= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724086387; 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=CY9vOmK/BQyCj3xBb0Ms143MMS/6lF8CP2tePbnpXiU=; b=UHy0gcuubErs70p+LixVsVURrCz1kc/IwRIRI/MwMjwlW1QHEdT3a0mqTeTUSeFRMW/arO e/E5WLT+cqgPXMgbGuvN5nPl3xrl3IOnzKrlB2BKIK0hOlOgzcJhcGGfm2VAEqMAMV0RJC F3CM5DzzFWF0t1ARKMwn4t/0/vPOSt4= Received: from mail-ot1-f72.google.com (mail-ot1-f72.google.com [209.85.210.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-583-U8WDxatbPO-FCu2EpefPmQ-1; Mon, 19 Aug 2024 12:52:57 -0400 X-MC-Unique: U8WDxatbPO-FCu2EpefPmQ-1 Received: by mail-ot1-f72.google.com with SMTP id 46e09a7af769-70954de6142so891645a34.0 for ; Mon, 19 Aug 2024 09:52:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724086376; x=1724691176; 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=CY9vOmK/BQyCj3xBb0Ms143MMS/6lF8CP2tePbnpXiU=; b=q4XKn0xEEcqIccBvBkM5okCOYrkRwa9glCkUk8ZGRSl4+inFa5PW+XM6vqAvoNzGP+ Zx8cMkxIvxEcrrCgSaS7Y+qMU6vfmsmxcs0wOLAwGnDI1H6Y9pEqS7EBhJC39b+B1P/c CXgU3jmTgOI/xoUafknSqeCpRSkDyW9/em2rt5G2NNYAZIoB/OugLb0G4NaHIpsTRne5 WTu0fQ3S7rUeDz61E/Ruf1KdA5q4N7qmUtlQHztW+MpH9FY3jaexlAA6Hz8qtp9LVU16 Y0C85deime1R8hrxmvD+9fIqboYG4uZDPl0Ek2CvvaxrLovQmC7QHzZrL9Cji1dspzDl aCbg== X-Forwarded-Encrypted: i=1; AJvYcCVW7TzBjifoZmuWZZZ/oL/3XTH8eXYINWEtkymCyRfoSa20hkvvHlo6iimXx+0uCjgZeQKp16HqXanEXq+ghtWH@lists.infradead.org X-Gm-Message-State: AOJu0YzmfvI+dqZsby16jJGaXqhiOhMxXNM9Q0CFnPM60WA7lA/1rJK6 9jsjQRueDaBJXUTLdcfMKm+N+h1JzHm98vacEqOQFnTtsgvtMB2P1aNt7/V2GXC8Veh3RR1Nd05 Ed3In9K7nFZpcojmU+i8JVkSIKcls24SkpzM7rkZrM/smNxHWLmhYz80z1Vk5u8vXHAPAQ84r X-Received: by 2002:a05:6870:41d4:b0:25e:c0b:82c5 with SMTP id 586e51a60fabf-2701c380dc5mr6625338fac.3.1724086376412; Mon, 19 Aug 2024 09:52:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEXYRQHubDVB9l/Z5ACuWzvup4NaPaNsF9PV71SRQNM7kqNduzsiPOCl4z6zHTU6tKe3mmKcw== X-Received: by 2002:a05:6870:41d4:b0:25e:c0b:82c5 with SMTP id 586e51a60fabf-2701c380dc5mr6625317fac.3.1724086376107; Mon, 19 Aug 2024 09:52:56 -0700 (PDT) Received: from eisenberg.muc.redhat.com (nat-pool-muc-t.redhat.com. [149.14.88.26]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7a4ff01e293sm446579885a.26.2024.08.19.09.52.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Aug 2024 09:52:55 -0700 (PDT) From: Philipp Stanner To: onathan Corbet , Jens Axboe , Wu Hao , Tom Rix , Moritz Fischer , Xu Yilun , Andy Shevchenko , Linus Walleij , Bartosz Golaszewski , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexandre Torgue , Jose Abreu , Maxime Coquelin , Bjorn Helgaas , Alvaro Karsz , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?utf-8?q?Eugenio_P=C3=A9rez?= , Richard Cochran , Mark Brown , David Lechner , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Jonathan Cameron , Philipp Stanner , Hannes Reinecke , Damien Le Moal , Chaitanya Kulkarni , "Martin K. Petersen" Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-fpga@vger.kernel.org, linux-gpio@vger.kernel.org, netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, virtualization@lists.linux.dev Subject: [PATCH 5/9] gpio: Replace deprecated PCI functions Date: Mon, 19 Aug 2024 18:51:45 +0200 Message-ID: <20240819165148.58201-7-pstanner@redhat.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240819165148.58201-2-pstanner@redhat.com> References: <20240819165148.58201-2-pstanner@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240819_175309_028167_550EFF07 X-CRM114-Status: GOOD ( 13.97 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org pcim_iomap_regions() and pcim_iomap_table() have been deprecated by the PCI subsystem in commit e354bb84a4c1 ("PCI: Deprecate pcim_iomap_table(), pcim_iomap_regions_request_all()"). Replace those functions with calls to pcim_iomap_region(). Signed-off-by: Philipp Stanner Reviewed-by: Andy Shevchenko Acked-by: Bartosz Golaszewski --- drivers/gpio/gpio-merrifield.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/gpio/gpio-merrifield.c b/drivers/gpio/gpio-merrifield.c index 421d7e3a6c66..274afcba31e6 100644 --- a/drivers/gpio/gpio-merrifield.c +++ b/drivers/gpio/gpio-merrifield.c @@ -78,24 +78,24 @@ static int mrfld_gpio_probe(struct pci_dev *pdev, const struct pci_device_id *id if (retval) return retval; - retval = pcim_iomap_regions(pdev, BIT(1) | BIT(0), pci_name(pdev)); - if (retval) - return dev_err_probe(dev, retval, "I/O memory mapping error\n"); - - base = pcim_iomap_table(pdev)[1]; + base = pcim_iomap_region(pdev, 1, pci_name(pdev)); + if (IS_ERR(base)) + return dev_err_probe(dev, PTR_ERR(base), "I/O memory mapping error\n"); irq_base = readl(base + 0 * sizeof(u32)); gpio_base = readl(base + 1 * sizeof(u32)); /* Release the IO mapping, since we already get the info from BAR1 */ - pcim_iounmap_regions(pdev, BIT(1)); + pcim_iounmap_region(pdev, 1); priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); if (!priv) return -ENOMEM; priv->dev = dev; - priv->reg_base = pcim_iomap_table(pdev)[0]; + priv->reg_base = pcim_iomap_region(pdev, 0, pci_name(pdev)); + if (IS_ERR(priv->reg_base)) + return dev_err_probe(dev, PTR_ERR(base), "I/O memory mapping error\n"); priv->pin_info.pin_ranges = mrfld_gpio_ranges; priv->pin_info.nranges = ARRAY_SIZE(mrfld_gpio_ranges);