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.129.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 8B42D18A6D9 for ; Mon, 19 Aug 2024 16:53:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724086390; cv=none; b=oBi4N41C92nAktmHwVuEjIL9+BDfhtHabMfdeoaM5bEv6PRNguokUidss0S4UhZMpRRMTsZfuHk9Wto6kmXi33manOgPizd5BuyT8QYCXRxnWMi4wlZAOMbt+bsHHlqJagt7LaEfkZMcW1AmDfRIsH+4RnxXWGqrxGAH9SfK9QM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724086390; c=relaxed/simple; bh=SgQa/apEnyQVxi5RGIOMYDsJA8zmcu1/aNTE/QznKio=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=HODVQpjZsvy9qmv5/K5A3v56bhd8jE1+L6kwnnNxhyFqSBE3AfOGkEC6w1moJSBOPI9XUv9oHwLglq1p4jCH1jJnQjRhRBIN2zZhKwcNd6hsGDUHfZDDKVXlwdjx0NP7KLmuuqe0gvX41St9MKo9x7VVHnxNsnupQEE1X3/EnXs= 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=KkhxxKBB; arc=none smtp.client-ip=170.10.129.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="KkhxxKBB" 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=AJtm3uYD4inmsDECmrMxkvS6gTo4VXXtBuq4LxNQ/Aw=; b=KkhxxKBBkGEE+uRJsZF4/8D+DtdgwQEVjLat+IzzEiQdQzqE2Z4lRwY7n8JUmuoIRK0naS 32BdOAxSOhdinj3wuFAOsXMsyTd7kzj+3OreeSb4sk81FvJPDqadUgfTpSOh/P3IAVShY0 xd5OQphbii2y7GMYaOzlHM2rlLBB1so= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-677-ne11BTZBM--TOQ9-pFEOew-1; Mon, 19 Aug 2024 12:53:03 -0400 X-MC-Unique: ne11BTZBM--TOQ9-pFEOew-1 Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-7a380541b28so7319485a.0 for ; Mon, 19 Aug 2024 09:53:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724086382; x=1724691182; 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=AJtm3uYD4inmsDECmrMxkvS6gTo4VXXtBuq4LxNQ/Aw=; b=UJLyOuMuR6gxfP40Jay1gi6vYOqH5VDLigGDZaW3nJ12ln8nG8JE8YUZGdKwD+aDdW kvDacIHqJhkwFVLvjTo38OAp0QAo7hB7npYpPBx7xP4YbfByAjfCrMaPTR/8R4E5ijoS hDF8yfxZRb4YP0dcrV3Z3NIRGJRtK69t1/2UVJoHjmVzVvQOYKx4qGBZC2SF1xzEJm7E tU8o53jXVX80zrc8scMAT8CdXeGCNyYKwFistAcU2DRr9J4Kmf8gOuDtkR68qNocHfbE Q7uFyFtT4wdZ9bQta5rnl3dSo2k4FC4lh81PO13boeeICZYppQ7Ak1FfmU0XOhgS8HhS KA8Q== X-Forwarded-Encrypted: i=1; AJvYcCV4IHjvbhHRly/0pNcclFt+qImcZN4cDfnanXxq0sGFfrAAWVCgUvZN6M5G8ES4fTesKag2WDDmCuYxGbYwnw==@lists.linux.dev X-Gm-Message-State: AOJu0YwXZwNZL1tzD7nrwqYpeZsa9Z7RGwZRLcn2FkeGK4ziN/I+EaH+ U9F7LRfRcg5zWhvXanZO69tS4Z5VWkEEyPi+OgXtnzicM9K+wUIJ/rqT5u9Bh2KSRGKmdJo9/9w WNRORZw0ZH84dK3ba/a69qUNduTI2XraM1uuILLTW9oy8ICXHKr0soZShtV0qMwAM X-Received: by 2002:a05:620a:17a6:b0:7a4:ee81:b81 with SMTP id af79cd13be357-7a5069097d7mr907156585a.2.1724086381796; Mon, 19 Aug 2024 09:53:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHM6gYVZPDs45ylp2PC1pdcluR4bdODQrU3S0OZZmC5BxWlFh+hxwevOPD/dWhGJl7MG9Gdkw== X-Received: by 2002:a05:620a:17a6:b0:7a4:ee81:b81 with SMTP id af79cd13be357-7a5069097d7mr907153385a.2.1724086381333; Mon, 19 Aug 2024 09:53:01 -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.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Aug 2024 09:53:01 -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=20P=C3=A9rez?= , Richard Cochran , Mark Brown , David Lechner , =?UTF-8?q?Uwe=20Kleine-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 6/9] ethernet: cavium: Replace deprecated PCI functions Date: Mon, 19 Aug 2024 18:51:46 +0200 Message-ID: <20240819165148.58201-8-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> Precedence: bulk X-Mailing-List: virtualization@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 these functions with the function pcim_iomap_region(). Signed-off-by: Philipp Stanner --- drivers/net/ethernet/cavium/common/cavium_ptp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/cavium/common/cavium_ptp.c b/drivers/net/ethernet/cavium/common/cavium_ptp.c index 9fd717b9cf69..1849c62cde1d 100644 --- a/drivers/net/ethernet/cavium/common/cavium_ptp.c +++ b/drivers/net/ethernet/cavium/common/cavium_ptp.c @@ -239,11 +239,11 @@ static int cavium_ptp_probe(struct pci_dev *pdev, if (err) goto error_free; - err = pcim_iomap_regions(pdev, 1 << PCI_PTP_BAR_NO, pci_name(pdev)); - if (err) + clock->reg_base = pcim_iomap_region(pdev, PCI_PTP_BAR_NO, pci_name(pdev)); + if (IS_ERR(clock->reg_base)) { + err = PTR_ERR(clock->reg_base); goto error_free; - - clock->reg_base = pcim_iomap_table(pdev)[PCI_PTP_BAR_NO]; + } spin_lock_init(&clock->spin_lock); @@ -292,7 +292,7 @@ static int cavium_ptp_probe(struct pci_dev *pdev, clock_cfg = readq(clock->reg_base + PTP_CLOCK_CFG); clock_cfg &= ~PTP_CLOCK_CFG_PTP_EN; writeq(clock_cfg, clock->reg_base + PTP_CLOCK_CFG); - pcim_iounmap_regions(pdev, 1 << PCI_PTP_BAR_NO); + pcim_iounmap_region(pdev, PCI_PTP_BAR_NO); error_free: devm_kfree(dev, clock); -- 2.46.0