From patchwork Mon Apr 1 15:30:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 13612842 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 E3687CD1288 for ; Mon, 1 Apr 2024 15:30:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:From:Cc:To:MIME-Version:Date: Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=Pn195WWLTajcnYOIWNHCB6q3pE0u1xlqnKcdy/Y440I=; b=IpOekkL62l7N4q n6oGnKx2b6g+9QWf42oBbuKY1nG/tr4cvidoOZMd7sxJdM+2QpnBfd+G/TEwO33ZLqMOKNUgXfdJK tbnV0v0Grz2nd0CFoLclgWeOM/6DLYoHMQhRxQXNtfNzz3zjXbcHvAtjGHpEvL6x/iBfKhigtLImG RM9oH/f2XRhDNOWqVVmBmjdr7ZxzqCtCE1ufa2N7VPq1T/B4usHZyetzhVqWTRdpkbelZ/4aen5SJ pOduzT7Iagn8SjsaefqZMbqBbUwG2EEzLQKYeCImUkcB1ggr3QJTIISjICLmL6xL15zp8xLS6NUci euCoD7kW/InahZs7tl6Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rrJcK-00000008Bjn-03AO; Mon, 01 Apr 2024 15:30:36 +0000 Received: from mail-lf1-x132.google.com ([2a00:1450:4864:20::132]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rrJcG-00000008Biz-2xX2; Mon, 01 Apr 2024 15:30:34 +0000 Received: by mail-lf1-x132.google.com with SMTP id 2adb3069b0e04-513ccc70a6dso6787685e87.1; Mon, 01 Apr 2024 08:30:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711985429; x=1712590229; darn=lists.infradead.org; h=content-transfer-encoding:autocrypt:subject:from:cc:to :content-language:user-agent:mime-version:date:message-id:from:to:cc :subject:date:message-id:reply-to; bh=bSdHQnl/uz145vU7uogIX8qKGpE25neuqOhaoto+Ve8=; b=ZXG9QLGldI+rkl/TkpnRsK0mGy+1SK23qaO8mmGC+l3ifzPtexCUAZCuD1/zdiTIyU I4X/nDU3ES2fpHvIagkesNjQPhBs8XoljCPlcU6YJwWygoY7kCG8VAlIii+yYmWxdcfI M8siAdhCEi3ol3d752SJyMkT8nTpgbeYne+j7JTr7rl4svYKFGSFXN/02LXn0N/EPTRU YpQegcz+oP4RVbHIkjRvaW+oYD6RKKKEpP7DxcJDJ0bz5pA24PtVevk4bvr7T1mXQChZ 797UqrlwA3Q6EwZRB00zB9znhpsh1nHGBIuSG+u3b/mAU6jG4XGgJm/OSULNeGxvLBre NOWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711985429; x=1712590229; h=content-transfer-encoding:autocrypt:subject:from:cc:to :content-language:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=bSdHQnl/uz145vU7uogIX8qKGpE25neuqOhaoto+Ve8=; b=qfYbDwSIEyLRCME126d0TbmqU30L+CPAs+gxRxSQJFuLWDCGL7Funic1TvJh62wN8V XCYa8eOIisuDVEutLzai/axIqxhUpU2x/25s4tVszCKkRoyBIK98Ro+m5iyeP92kcg/P nkHHQ6vicbrim5Icx7KKvhYXiSjHfeUTRwffjlR8ycBwPoe7DnfrBdugJIFmvwEjulhq y57GmMkbVwWX80sTWjYjpqxgTnemgXkRyoQBrJyPYIKMeU0eRQAePNbwhWyBb8ywEPDq wN2ZFD/xNW49UwpyqCgvgXQH0WCBh14d/9TJDu0Nfe4gMQpQkTQOIxKmbcyDEnpv/Dkn yCXA== X-Forwarded-Encrypted: i=1; AJvYcCXUACtD2sMfbzZ+HMpXu2eetI/PCmOWQC80wF3g9HNaHyTTUEuLuZ3BXOzv38mQ7ceB7qNFe04FqORFQ2XqvuGW26yk188a1fMP/h33xOnhqq6TduVxwC7u1Q3VXCbG6Z5mPONC+xP4hOmkjqEXvo9F2O/h+napug== X-Gm-Message-State: AOJu0YzevaozdN1R9485oQxh524IiAgz6Tv93aHZNrcFVhGrRIJtNPxh ltkgjFcCCEGkOfc7CQCkLQRaEaToiDdQrqOBmh16YHd9JCz7iit+ X-Google-Smtp-Source: AGHT+IE8m6i8mCJcAs3EONB8kEs2SvxnC7e2yJEvhesRJPNPtw3Ma1i+KZKtykGmrnSStwaUkVsrEQ== X-Received: by 2002:ac2:44cd:0:b0:516:a686:8ae1 with SMTP id d13-20020ac244cd000000b00516a6868ae1mr3340045lfm.62.1711985428447; Mon, 01 Apr 2024 08:30:28 -0700 (PDT) Received: from ?IPV6:2a01:c22:6ffc:6d00:155c:9c47:3959:e8e5? (dynamic-2a01-0c22-6ffc-6d00-155c-9c47-3959-e8e5.c22.pool.telefonica.de. [2a01:c22:6ffc:6d00:155c:9c47:3959:e8e5]) by smtp.googlemail.com with ESMTPSA id h6-20020a170906590600b00a46e56c8764sm5376424ejq.114.2024.04.01.08.30.27 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 01 Apr 2024 08:30:28 -0700 (PDT) Message-ID: Date: Mon, 1 Apr 2024 17:30:27 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= , Kalle Valo , =?utf-8?q?Andreas_F=C3=A4rber?= , Manivannan Sadhasivam , Martin Blumenstingl Cc: linux-wireless , "linux-arm-kernel@lists.infradead.org" , linux-actions@lists.infradead.org, "linux-pci@vger.kernel.org" From: Heiner Kallweit Subject: [PATCH] ath9k: use unmanaged PCI functions in ath9k_pci_owl_loader Autocrypt: addr=hkallweit1@gmail.com; keydata= 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240401_083032_804981_0A218489 X-CRM114-Status: GOOD ( 10.13 ) 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 Using the device-managed versions has no benefit here, because resources are released as part of the asynchronous fw loading. Actual reason why I got here is that I was looking for places with dubious use of pcim_pin_device(). Signed-off-by: Heiner Kallweit --- drivers/net/wireless/ath/ath9k/ath9k_pci_owl_loader.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/ath9k_pci_owl_loader.c b/drivers/net/wireless/ath/ath9k/ath9k_pci_owl_loader.c index a5eb43f30..bc93ca075 100644 --- a/drivers/net/wireless/ath/ath9k/ath9k_pci_owl_loader.c +++ b/drivers/net/wireless/ath/ath9k/ath9k_pci_owl_loader.c @@ -65,7 +65,7 @@ static int ath9k_pci_fixup(struct pci_dev *pdev, const u16 *cal_data, dev_info(&pdev->dev, "fixup device configuration\n"); - mem = pcim_iomap(pdev, 0, 0); + mem = pci_iomap(pdev, 0, 0); if (!mem) { dev_err(&pdev->dev, "ioremap error\n"); return -EINVAL; @@ -103,7 +103,7 @@ static int ath9k_pci_fixup(struct pci_dev *pdev, const u16 *cal_data, pci_write_config_word(pdev, PCI_COMMAND, cmd); pci_write_config_dword(pdev, PCI_BASE_ADDRESS_0, bar0); - pcim_iounmap(pdev, mem); + pci_iounmap(pdev, mem); pci_disable_device(pdev); @@ -200,11 +200,9 @@ static int owl_probe(struct pci_dev *pdev, const char *eeprom_name; int err = 0; - if (pcim_enable_device(pdev)) + if (pci_enable_device(pdev)) return -EIO; - pcim_pin_device(pdev); - ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL); if (!ctx) return -ENOMEM;