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 0D90916DED2 for ; Mon, 11 Nov 2024 09:10:35 +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=1731316238; cv=none; b=GCPH7Z1l7czE3MDwkMIPMmWq/I7lXQPQPP2bdb0jLFRoXizK36138U8X0SlHIpVuGWXsOmENlN4oOOu8q/PLtF2Lt/jX1kmYwvNlGjU6lBXu3+8Z3yJ1wjnGAWQSq+kNdvnxssAF0MN5BS7KQ3pIVGFxsyElgYmw85Xm1nUDlQI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731316238; c=relaxed/simple; bh=+l/zsWsq52qKCE3S0cgeDR/mooKURFiNVPd0zNkl844=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=gs9nWIHkF/rvkbEmq4gUM5J9LKiYNlAc2e+gNu5lUwsFU0vajr/1LOrD3xMbsH0GkU/RdscA8PcsRV4TyiTwqO3dYQGI58J5O04zeLs/ySKMIE2bA3JrSgZuke2qzntrkaujPt+6Fwmj4KmUlvl8KuhIEtAig+iCHw/y53XALt0= 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=NHHYQ6A5; 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="NHHYQ6A5" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1731316233; 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=IlkBwIYLXEfoDb6mBwfLXq8ed8F/Z1AKH2ippr194IY=; b=NHHYQ6A5JRaqp4cP8cmFr0XhNviyr/XAB22hajAtQ7rvyUUa4lobfdOwdn/Yg05m18CHVT 0/jv/E+RlURDjIVhSjkrkVRqs3HDliBfk6Xz4T7Fa5jnRhloeacIcsbylfbM0JmE1zDp48 SygRCb1LYygGw4gAkxJt5iVCwZLYbTA= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-343-nLKIDAl6PdG8OxTnr9JeDg-1; Mon, 11 Nov 2024 04:10:29 -0500 X-MC-Unique: nLKIDAl6PdG8OxTnr9JeDg-1 X-Mimecast-MFC-AGG-ID: nLKIDAl6PdG8OxTnr9JeDg Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-a9a0c259715so294695466b.0 for ; Mon, 11 Nov 2024 01:10:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731316228; x=1731921028; 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=IlkBwIYLXEfoDb6mBwfLXq8ed8F/Z1AKH2ippr194IY=; b=IBc2+l6RVicg5aB7ZMucRv0qzcPeSWVxZFysAp9xYm4BOnhjdD4fe9f985cxgXQLhG t5N+pEy2tfhu0Ux9Tb1WvTTIR8XTcXOXXTbdoVnioABed4KKWhBzl/pIU2IQqbAe+8r4 JqqJAHDJ6xwG84Xs8Dzfz18YG3/oCoOq88pm6pAQo5FzoND4tEHhQ+O6E8MEwc5Dkz/4 Cit9a2QusLMWX9eZ+FiapD1791eBRkk+ZHqoNrjTivdMaV9XL7lw0GAQF39Z0SCcJPFP BwuJ7emm9LIFC70WMRzGLWt8JntUD9eNl/lvH8POp6QUKErGeHMWkXUNb750h8zXXy37 LmLg== X-Gm-Message-State: AOJu0YzmD1AdbW8jPqaI6x5baYvFakDTGFNMeLbsze5uhWAUCZIE6NxY 5Eq4S6MnDRTi610Nv1EsFdFHXsYib7miSlSA9y+eVuQzySD6xZz4nPMgDmuW8CDjBzPqEJ76ASc 9U3YOa5KaVfPR3eXvCMQl/KgUsXGY9pBoT9k1K+5VghSnsjaAnP+sWVdlLg== X-Received: by 2002:a17:906:2b10:b0:a9f:4f7:f064 with SMTP id a640c23a62f3a-a9f04f816a1mr533605166b.3.1731316228609; Mon, 11 Nov 2024 01:10:28 -0800 (PST) X-Google-Smtp-Source: AGHT+IFfptwuQySnMp9mLjTjygS0OEF2Vq3dFxQupPHmBODj6rGIER/wZkM2N4C/u8BMIH2XVy65mw== X-Received: by 2002:a17:906:2b10:b0:a9f:4f7:f064 with SMTP id a640c23a62f3a-a9f04f816a1mr533602466b.3.1731316228231; Mon, 11 Nov 2024 01:10:28 -0800 (PST) Received: from eisenberg.fritz.box (200116b82d9ab900a46c5a062bbe27a3.dip.versatel-1u1.de. [2001:16b8:2d9a:b900:a46c:5a06:2bbe:27a3]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a9ee0dc50ccsm579203366b.100.2024.11.11.01.10.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Nov 2024 01:10:27 -0800 (PST) From: Philipp Stanner To: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig=20?= Cc: linux-pwm@vger.kernel.org, linux-kernel@vger.kernel.org, Philipp Stanner Subject: [PATCH v2] pwm: Replace deprecated PCI functions Date: Mon, 11 Nov 2024 10:09:45 +0100 Message-ID: <20241111090944.11293-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 Content-Transfer-Encoding: 8bit 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 --- Changes in v2: - Use PTR_ERR() instead of PTR_ERR_OR_ZERO(). (Uwe) - Say in error print that either request or ioremap failed. (Me) --- 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..b6c16139ce4a 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"); + if (IS_ERR(ddata->io_base)) + return dev_err_probe(dev, PTR_ERR(ddata->io_base), + "Failed to request / 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); -- 2.47.0