From patchwork Tue Nov 5 09:26:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Stanner X-Patchwork-Id: 2006766 Return-Path: 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=PYDsUC7u; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2604:1380:45e3:2400::1; helo=sv.mirrors.kernel.org; envelope-from=linux-pwm+bounces-4030-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org [IPv6:2604:1380:45e3:2400::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XjNKD1JDVz1xyM for ; Tue, 5 Nov 2024 20:27:28 +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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 9C55B2831B4 for ; Tue, 5 Nov 2024 09:27:26 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A8D451CEEB8; Tue, 5 Nov 2024 09:27:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="PYDsUC7u" X-Original-To: linux-pwm@vger.kernel.org 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 EED0A2C1A2 for ; Tue, 5 Nov 2024 09:27:22 +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=1730798844; cv=none; b=qvs7XwBER4bo1mOfEMJCNMS3ObT5OYfXPRofdgXuhOFt0sbvqTeeJQRD8MLb1YhIlqd3o8UDCv5ckz9XG7gQWHoOoxz526xO+r3soH0R7HVolEKW2EuJPUSEQLpi5aWtPeAj559mGXdFDGGFaEXhTlPTY3pNMSaqWI6fGbXyUA8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730798844; c=relaxed/simple; bh=HuHzf+MqhJGpURxtX9qNPh+hM10o/G7WSixEaE9uEys=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=hPJF7M8396tM7YH3hJnCCZTSf9sYCbx+TnBGuqzRIkikBK5Yr5r4vWNFqxk8Fvwdw5tA59IoqpZZpzoj+zVatPUKm+GTNPGqmTIdUejsDJuK4Q9v0uhPhIPJQmp1ssdUXjImM6Vdc5PAyAcBE41SlWbyzUZ7qRyW2MrjdAX9NWs= 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=PYDsUC7u; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1730798841; 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; bh=K3diC4LcG5d/+GbrQGIZW0Sx7qNZLaP/PHesTT7qPXI=; b=PYDsUC7uME3nTcvKznWaZAJ0X/SpkdIMbA4mP7xbA7PanmFRwPwWe3ddu9t+mXbfLpbwJ1 Ruw5GYcLC7ymfgbhoKwsK+x2BJtLrdtN9KLvEF2hnglreU6EvP7Gp2WjwWg/2FhvHChKei q5+d+PMWHZvwZFXtHb6sBlbimOitisU= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-661-BhgLLm6xM2aaYMdS_vWdKw-1; Tue, 05 Nov 2024 04:27:20 -0500 X-MC-Unique: BhgLLm6xM2aaYMdS_vWdKw-1 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-37d45f1e935so2665214f8f.0 for ; Tue, 05 Nov 2024 01:27:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730798839; x=1731403639; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=K3diC4LcG5d/+GbrQGIZW0Sx7qNZLaP/PHesTT7qPXI=; b=NLjwWoqW/ukId/V0KUp0KoV5rOxcJ8Of7qhBcDAgNnzF8r0vQss1ZDyqWLYyNJ+zHV rdvIfOgnKu/YBbrTlvlq3Mlm+1XVuWq3vNGyvUe3gr6iKjxZOB2AZ2y7+dBA/GDpvckd 9I9V6OdHVMnyaru1Z8Fl4AI38TBAVGDfsP4GZP0boAX7Semf8OKofVcYDzvaplMECcsC YrCrl4mpnBlvpgFf5hvSyTIrEJFg0R5gs1z3IHq8AU8GVBirve0NYVPdYGcaBLRWH0K1 VWWyVNk5VMmuPckwqqMjMZtXnPNBveJ8/gQCX/VwhL5WBrDBqC94TPQBs0Nsl8VOQy/7 IN2g== X-Gm-Message-State: AOJu0YycyV8u7yB890V8+rjne5/xsjea5XHjIPDsRzfLvH3bLsBgVuK7 CdkVemflrf4X3Kk0calRpabKAZT6WN5sG0LEvYQfwvUm3u4Xno48N2VHoABMUVOWkeinATdrJRH 0rUtVIRzxCfhrMCrsLL9C9Fr9XN335Sn9m/R2H4Yj2rE0p49CZpj4kBiWNA== X-Received: by 2002:a5d:64c5:0:b0:37d:5429:9004 with SMTP id ffacd0b85a97d-381c7a3a52amr9948971f8f.3.1730798839491; Tue, 05 Nov 2024 01:27:19 -0800 (PST) X-Google-Smtp-Source: AGHT+IGd0D0YfbnU3NzZsDpew5RZ831pQ7qFlOc9vb73OqtmymlL7yjzae5dufSS8ZhcRxOhmi2/iQ== X-Received: by 2002:a5d:64c5:0:b0:37d:5429:9004 with SMTP id ffacd0b85a97d-381c7a3a52amr9948964f8f.3.1730798839092; Tue, 05 Nov 2024 01:27:19 -0800 (PST) Received: from eisenberg.redhat.com (nat-pool-muc-t.redhat.com. [149.14.88.26]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-381c10d7e0fsm15393636f8f.47.2024.11.05.01.27.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Nov 2024 01:27:18 -0800 (PST) From: Philipp Stanner To: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= Cc: linux-pwm@vger.kernel.org, linux-kernel@vger.kernel.org, Philipp Stanner Subject: [PATCH] pwm: Replace deprecated PCI functions Date: Tue, 5 Nov 2024 10:26:42 +0100 Message-ID: <20241105092641.49541-2-pstanner@redhat.com> X-Mailer: git-send-email 2.47.0 Precedence: bulk X-Mailing-List: linux-pwm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 pcim_iomap_table() and pcim_request_regions() have been deprecated in commit e354bb84a4c1 ("PCI: Deprecate pcim_iomap_table(), pcim_iomap_regions_request_all()") and commit d140f80f60358 ("PCI: Deprecate pcim_iomap_regions() in favor of pcim_iomap_region()"). Replace these functions with pcim_iomap_region(). Additionally, pass the actual driver names to pcim_iomap_region() instead of the previous pci_name(), since the 'name' parameter should always reflect which driver owns a region. Signed-off-by: Philipp Stanner --- drivers/pwm/pwm-dwc.c | 14 +++++--------- drivers/pwm/pwm-lpss-pci.c | 9 +++++---- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/drivers/pwm/pwm-dwc.c b/drivers/pwm/pwm-dwc.c index fb3eadf6fbc4..9101a89447d6 100644 --- a/drivers/pwm/pwm-dwc.c +++ b/drivers/pwm/pwm-dwc.c @@ -66,20 +66,16 @@ static int dwc_pwm_probe(struct pci_dev *pci, const struct pci_device_id *id) pci_set_master(pci); - ret = pcim_iomap_regions(pci, BIT(0), pci_name(pci)); - if (ret) - return dev_err_probe(dev, ret, "Failed to iomap PCI BAR\n"); - info = (const struct dwc_pwm_info *)id->driver_data; ddata = devm_kzalloc(dev, struct_size(ddata, chips, info->nr), GFP_KERNEL); if (!ddata) return -ENOMEM; - /* - * No need to check for pcim_iomap_table() failure, - * pcim_iomap_regions() already does it for us. - */ - ddata->io_base = pcim_iomap_table(pci)[0]; + ddata->io_base = pcim_iomap_region(pci, 0, "pwm-dwc"); + ret = PTR_ERR_OR_ZERO(ddata->io_base); + if (ret) + return dev_err_probe(dev, ret, "Failed to iomap PCI BAR\n"); + ddata->info = info; for (idx = 0; idx < ddata->info->nr; idx++) { diff --git a/drivers/pwm/pwm-lpss-pci.c b/drivers/pwm/pwm-lpss-pci.c index f7ece2809e6b..823f570afb80 100644 --- a/drivers/pwm/pwm-lpss-pci.c +++ b/drivers/pwm/pwm-lpss-pci.c @@ -18,6 +18,7 @@ static int pwm_lpss_probe_pci(struct pci_dev *pdev, const struct pci_device_id *id) { const struct pwm_lpss_boardinfo *info; + void __iomem *io_base; struct pwm_chip *chip; int err; @@ -25,12 +26,12 @@ static int pwm_lpss_probe_pci(struct pci_dev *pdev, if (err < 0) return err; - err = pcim_iomap_regions(pdev, BIT(0), pci_name(pdev)); - if (err) - return err; + io_base = pcim_iomap_region(pdev, 0, "pwm-lpss"); + if (IS_ERR(io_base)) + return PTR_ERR(io_base); info = (struct pwm_lpss_boardinfo *)id->driver_data; - chip = devm_pwm_lpss_probe(&pdev->dev, pcim_iomap_table(pdev)[0], info); + chip = devm_pwm_lpss_probe(&pdev->dev, io_base, info); if (IS_ERR(chip)) return PTR_ERR(chip);