From patchwork Wed May 21 02:15:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 891921 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2A0C222D9E6; Wed, 21 May 2025 02:16:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747793764; cv=none; b=ZD8/sMyW8gu1WteglJkot/nJY//Jb/KzjNO9o+Lj+46wyzc9M3iQGE5I1jtmzEd2XZrOOCcw+A5gsg40GaDiAg8GAhbxx6nwoUDjQc4q7YNS8gQ6Zc2boBuTekaNa65hzxwZRA68975eFiX2TvYjwPbMkzlGOFUacEYejGzdTew= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747793764; c=relaxed/simple; bh=LAVh7geJL1PD75mFZMVsyKCNDPWBKX7Jf3cyBhahb+w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FOBalQ2qclRF7o9uVO4uMop+BlBpWGnJcC3cNBLmhjjpxmGXn9fAO69o7j6X8U6fuT+iBIqa8VMWPVcjk8FnJi7lE4ZnE6Il42kvANLrj/D2xT82Vyr1YOjrNdj1djYz3BdmOH824c0NhM/ArQQ522zoAYj9F9gmDBmgq0Yxk28= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=bB8i55bw; arc=none smtp.client-ip=209.85.216.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bB8i55bw" Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-3081fe5987eso5258940a91.3; Tue, 20 May 2025 19:16:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747793762; x=1748398562; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6nQsjeWRBpWxFf7RQtRpXio5qVfPNye6yh/BzrdVEeY=; b=bB8i55bwtvQh2zkkMs2cDbi6D8+hfenkduPxAmAND35JGeinSkvC9VHPFI2WAPt/b3 SFQpgy6LZRaVH00p6p7D8WJchb32bnydVbG+SQrN4kQUXdIFFsLmk5tA17dT8qPpIAl1 oWR4wCLJNiypaXE1iJqbZG5aUG7XXiuV4bn8EtNpGRsUHsoEE6Z8youWXDm/GLzDSEks PG5GW5SJm57dWpWWuoZxNlLXvjOfijCRwkzlRGnWNEPiq/4FEDYg8eHzug5GkwNOHU1Q dscNYkAX5jCrnwlCSFHo+UCDNIqOAsvHb+Pip8R1qQMnhxGSki7eakcsAeKZWlvzTBRQ vMSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747793762; x=1748398562; 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=6nQsjeWRBpWxFf7RQtRpXio5qVfPNye6yh/BzrdVEeY=; b=wy3LfBZHSaemHXlhbHKGwK4b5tjNeDkyW9YOSBUlqghZVbV3SA9jrqJk2Md0FKKHmD pIjgWSKIiO14notqxBBW1cXDi4SbNkOkiXskXCt9Rka/Ucy1/DBm+7xH3LQABNzqTrIb VE4ZiuuZDD4EIGbbaWs+S4JMhV7P7X2e1IfSNsi5cuHLcwfb69bBZj0eVPgBi1+C5qa4 pnwKlatMp+oq4Y9q43f4snRTneU5LyETrpv8WBc8GPBX1KyE1xhIFy2CitqspxlntXCR 5syWOrkbjU2zunAONAOFW/i42kGUBAOhK5ouEmhTOUQzbA9Z80ocGJJb/rK+SiCuLRsm 2h4A== X-Forwarded-Encrypted: i=1; AJvYcCUC6IXlFL1eSfkEg04rMM97I0wooOIw7YyoxP1Optw9hYGgQYpoCZltQMRIv+BPfe36d5aLB1ThmVjsVODx@vger.kernel.org, AJvYcCVW0CiF4qUs4VJ2Nl9zja2XGtKiyz4G0Td5SbZEYU8/DC/6vci9MnJwknCEaekNC+2oEuvxH6CpKkpD@vger.kernel.org, AJvYcCWIdNj+qSIqtOgeAgL0xbV89rdSygWpN34YeVDYqLFhZ+Y0fP5FsEFTs/6wEtkTedul33mNynI4B1wmYw==@vger.kernel.org X-Gm-Message-State: AOJu0Yx3OutW2fycwrfDPNBIPSVlxMEsjTiqE5FumKFDXPF/PV+To8MP 110LwjVOoLQbbaKgDyqGINDuYxAV2ckCZcT5H/FrEZzxrgGzHnyJF6S2hdC5Vg== X-Gm-Gg: ASbGnct2R10lcf/OaymCHkSrW8lkYj6+XyNuZYWRwgafFlaEBrSG0gM3sh3glGrjP3G PstNe9DHjBDM6HkGFFQNMrq4AWy+hPLI2QMC4VPkxrtbUTxCGHKRqNXNLoFZyYgFolbptKZJZUX 59umGppuSQF5EuGYgmaDA9kI2y2lTbWwAwQq0A56RbIY12oS291ClftoJvQdrWeKXxcMqEuIx8l 72aB1hj+SWpUNIj9Yz/5p1Ev4iMdCfkezifHSeFx6FHbr0iDRbiCH6KlaBuSW+XqR13K2c37UwL 1h5d4KSTjtHUOUN5JcRQ6nrQnjE= X-Google-Smtp-Source: AGHT+IElCZyZb8mDA26WIYHn1tDtNGYhoQTnTEiTj47myYXay6XKrljlU2eR+5TJ8zDjpXwkTY5nHg== X-Received: by 2002:a17:90b:35ca:b0:2ee:f440:53ed with SMTP id 98e67ed59e1d1-30e83228de0mr24493467a91.31.1747793761262; Tue, 20 May 2025 19:16:01 -0700 (PDT) Received: from ryzen.lan ([2601:644:8200:dab8::a86]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b26eb0843d1sm8758473a12.49.2025.05.20.19.16.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 May 2025 19:16:00 -0700 (PDT) From: Rosen Penev To: linux-wireless@vger.kernel.org Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Thomas Bogendoerfer , =?utf-8?q?Toke_H=C3=B8ilan?= =?utf-8?q?d-J=C3=B8rgensen?= , devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-mips@vger.kernel.org (open list:MIPS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 1/4] wifi: ath9k: ahb: reorder declarations Date: Tue, 20 May 2025 19:15:54 -0700 Message-ID: <20250521021557.666611-2-rosenp@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250521021557.666611-1-rosenp@gmail.com> References: <20250521021557.666611-1-rosenp@gmail.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Easier to look at. Follows netdev style. Also remove ret assignment. Because of all of these devm conversions, ret = 0 is a path that never gets hit. The first time it does it when request_irq fails, but that ends up reassigning it. Signed-off-by: Rosen Penev --- drivers/net/wireless/ath/ath9k/ahb.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/ahb.c b/drivers/net/wireless/ath/ath9k/ahb.c index 49b7ab26c477..d2a97e74f451 100644 --- a/drivers/net/wireless/ath/ath9k/ahb.c +++ b/drivers/net/wireless/ath/ath9k/ahb.c @@ -71,14 +71,14 @@ static const struct ath_bus_ops ath_ahb_bus_ops = { static int ath_ahb_probe(struct platform_device *pdev) { - void __iomem *mem; - struct ath_softc *sc; - struct ieee80211_hw *hw; const struct platform_device_id *id = platform_get_device_id(pdev); - int irq; - int ret = 0; + struct ieee80211_hw *hw; + struct ath_softc *sc; struct ath_hw *ah; + void __iomem *mem; char hw_name[64]; + int irq; + int ret; if (!dev_get_platdata(&pdev->dev)) { dev_err(&pdev->dev, "no platform data specified\n"); From patchwork Wed May 21 02:15:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 891679 Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CD9C622D9FA; Wed, 21 May 2025 02:16:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747793765; cv=none; b=hxjf88uV4tUkKHxvmf+QO8Kl/yflCPB8NZ3hvZAn9EaeYEEyP6RVDq7TIdMKtYKdnBXFxItozrzAt7c3xBZdJ85zN02Rs8jkp8ELCFCBCvMm5GFiP9+YDowSMVhdQ6UgP1zjW8Cq1/w4q6yqMtKchQczHWyoqWdwGSEiXeN+wmo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747793765; c=relaxed/simple; bh=GHzj+vhP0IH7AazDd4aDDdmVsDEWratUTV7OerNI/8A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=c1518A5Dz6+tWyjGjvqE+L0jVLIEn8fLePc9aluiyGbmgF8BcXGM4lOnUAxZKBZyprbqcp6qtY5fFY45sZdGceul+79Si4JidC+wmAXVcqUg5FCh/el3TaXcsBadLPQAxtWOELEP77lFUvUTuvAH9JdXdCQzjxEgwhqGm/MQwTU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Ev4nIqYb; arc=none smtp.client-ip=209.85.210.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Ev4nIqYb" Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-7376e311086so7596397b3a.3; Tue, 20 May 2025 19:16:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747793763; x=1748398563; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SQ+RqlSFyQLSDHWP9kEu2/DGiQBnqF1j/beqMyydt5w=; b=Ev4nIqYbdShpN2ulqu9jJH8dsP3d6j+d4Mnx6f+75EXkb7dMcgMK39pmRbosikfTnU dzj9lN2opJhcUca0d26NmU4rpLb+MpN+dqYI2FZ0HAE4UddLep4sk8jsohmtwz7w/JlD BNFRvNTtRBFY8iCiSJtdb05h6l5cmpGlHF9lWCcOACVrsMgm00i4G7EpsUBdJJF3BMYR TRhq2TqDQQ3LobkZajCv167M5nqc708VK4d7FrLB8hJw9Ru8cM2EgXoBaYkgSV5VmSgd 9yhLkQDig6KtL0hGp07DPM6sdXkcq/aK7jkDeJw7yzuIzUo9qVbJdhTruNYfyMEMt1T7 Srzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747793763; x=1748398563; 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=SQ+RqlSFyQLSDHWP9kEu2/DGiQBnqF1j/beqMyydt5w=; b=HZkFQK4js22kLc8TzUfyQiOBOQG/4jzApj+iUNr65G4Czg6p9ebNrWuREpwQgzJ3l6 0YLMHUmjanrCMO7cRUqO4QNXjxFs1Ezp8rkq65eWuH2UWpY4dWvhTfv4u+zqmi/xoKpr WBeCyx2tyEPzxT2kAvns1dI5E8r9A83WLGKCZdVZz9lgV1B6HiA3q2xGzU61runk89GW AxtxK2Q58aVCua1tXGkBAF+ZKY1JkP+pIBxk+ZBc/jsTEyRY7+4KVfrnO6cS1jMrC5lf y4Mx45xAC2453MdF1n7jrlGlZ4TpbfeRfv49TDUsBFckm26at+OaXExV8xHrLW1HEXSn 6Emw== X-Forwarded-Encrypted: i=1; AJvYcCUed8FgpR5l9mSNlWjS6vYTsqIFnNuLVaGMCzrUIpVirM9MjK0KagS8zx0wm7Al/wjS/XmckfIb8YCy@vger.kernel.org, AJvYcCUvCsdPoCfqc5bmuXfB8cYAUpi9Faf3cc3EIySVcCwpTsKgDnIJhxlfqsOfFkuG2iFHfkJASKvcAkLdNJ5B@vger.kernel.org, AJvYcCXdDs5r8HnMowYyYSF1lACnPySQggzayVgyAcgOcf4JJjBi3fP7g48B6D8Bv0xrAP5QJ3T6I3cgBxVlYA==@vger.kernel.org X-Gm-Message-State: AOJu0Yxhw89CJQ4joquAdAK64jj0MlOSu//rVbLvNrMreDmEsKrM+pvY KS8Kdd8I4bKnSgsWxeqPnV6JyKCevFOtsMIS9c7dBLNODmqv2GhJc4GxBmhFiA== X-Gm-Gg: ASbGnctASpcS2W4WU9RBqv34gXh8OGdDFRWKVOUzFRm4xxIHkUOD3f5L2qoCZkLNJl1 pylkkxkoOeYrauucteoKFmz71hVyYMB9MpWznzOTvj2W0nTsSvM18dsuEdDS/5OVzjbpRQfjcQP 6DNZMp7YW10lDdjdbNkcfthAVOSGrgQu79THm61iFeAPVYaEAsf/Hq0bSprQlWqU2pG7J+CiyYS nwQvGgM5tAU1I/PS7o7CKNV0XE9xR9lqq+ypaSBbfVL3wZMY0apPrQ38bKCFmA6Y7pSAE6pOUT/ AzpDdsRtjm5lQW7pfO/qePRPAhM= X-Google-Smtp-Source: AGHT+IGeWLTZb5NwYwzSur60qnw8GyRy2RzzaZEwLnhcuWI0bwamyWpBiHyknDNeVbIb+gnpNcrrYQ== X-Received: by 2002:a05:6a20:c6c9:b0:1fd:e9c8:b8c3 with SMTP id adf61e73a8af0-216219c6edcmr27891478637.26.1747793762900; Tue, 20 May 2025 19:16:02 -0700 (PDT) Received: from ryzen.lan ([2601:644:8200:dab8::a86]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b26eb0843d1sm8758473a12.49.2025.05.20.19.16.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 May 2025 19:16:02 -0700 (PDT) From: Rosen Penev To: linux-wireless@vger.kernel.org Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Thomas Bogendoerfer , =?utf-8?q?Toke_H=C3=B8ilan?= =?utf-8?q?d-J=C3=B8rgensen?= , devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-mips@vger.kernel.org (open list:MIPS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 2/4] wifi: ath9k: ahb: reorder includes Date: Tue, 20 May 2025 19:15:55 -0700 Message-ID: <20250521021557.666611-3-rosenp@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250521021557.666611-1-rosenp@gmail.com> References: <20250521021557.666611-1-rosenp@gmail.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Alphabetic includes are easier to look at and to make further changes to them. Signed-off-by: Rosen Penev --- drivers/net/wireless/ath/ath9k/ahb.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/ahb.c b/drivers/net/wireless/ath/ath9k/ahb.c index d2a97e74f451..1ffec827ed87 100644 --- a/drivers/net/wireless/ath/ath9k/ahb.c +++ b/drivers/net/wireless/ath/ath9k/ahb.c @@ -16,10 +16,11 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include +#include #include #include -#include -#include + #include "ath9k.h" static const struct platform_device_id ath9k_platform_id_table[] = { From patchwork Wed May 21 02:15:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 891920 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 43DE722DF9E; Wed, 21 May 2025 02:16:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747793766; cv=none; b=F6iEzFtsBk+8gaQstrI+umduNV5YAWH67gEsdUVU/hpun9BQ61hiNm07aqclAwSKvab5DufMMReTnhVmPKYedXUaiJaDpbMiDFwjtc/yqdx9z3B9opeXH9Gc2oTTIDh7gkubEA+on/4xj1BIAoIrcLIiH0s1PX8E5N5VmNqUPa8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747793766; c=relaxed/simple; bh=SlSOcQgN7YP8cHQxy2ZIWkw1Hglxii84ZTx3i9OY9dY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NP6kPx/tDSG4c1iH3YykRAnszAVMqchcHKsRiPwvAjecVju0uOmFHzVduNNYNWgcqWGsEeoaScK6Zy33YqqSbPu5szyrgzk3IdLcX8Gxucq+4ZjBzTWm/tb0So7Akk8YCBGp5lQs8n8fZSH+P5a87oYoaImewsl8mdX6DaaJjZo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=YZE2cHUR; arc=none smtp.client-ip=209.85.210.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="YZE2cHUR" Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-73972a54919so5903386b3a.3; Tue, 20 May 2025 19:16:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747793764; x=1748398564; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SL0XUb+xwVI+XVguaPnavzoxmyDhD/LnbyyWdtPy0bs=; b=YZE2cHURP2haz24hJGfGP9Fa7iec3ezbbwrOg+0o+coKejdTv2suZgF7TOoKAq8jY4 1FCh77JMEzmc/ugyaqsDoPJ97CVIUlLWLBP+Cmp7BhquwLXxF0pnc28J+6pKY7Gg2ee2 cOuwp+Hzy90vTnICZcqEvg82alftZ/hjBDp7sRm74kQzsKZrulDitXp0EQOSzN2YRimM 64NzmFr2zHxJm9giw9tZG0A99OxFm9hPoNO989fGmnpa1KvHKZJV89Qguo76c4iMxX4I qnTKr/AS7TQ+o6ooVs0jfkx+Goq6AWEe1ax0n4xYe4CFdXXL+DGFotqZcwE7l1l/Nwnm 5rzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747793764; x=1748398564; 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=SL0XUb+xwVI+XVguaPnavzoxmyDhD/LnbyyWdtPy0bs=; b=EAHc114elY9C3ubKgE70NYTpi6s6w+s8KjUDRAZP2rVkhCrdivKH9uAen8eSR3fI9O D7nY2clMZmdFDBHuIxnmQGr+XcCTVmeFUt+eLzgVkEu8yC9S7HWzZc0xcOzHugpOUl78 cmdvcy2kufKO1qc5YrKIs0EnpOW1LKsS6sHGN5rC4sEsMbf2rAXLzEBBc8elEGoCK9rz 7xVkTbnLUrHpZdsXtLv7zToLl1LTHTkGFQrdk5fsTbpzhM5W/tOWtrm9Epezd1eG3CNO f/TY3gRycCFWA2NXa8ssDcoPf8+1dkLek5+10DbwKeAF1Stj04D0INAFnSnMMoof5CCi PgDg== X-Forwarded-Encrypted: i=1; AJvYcCVWh4e5jKXyo0JA3kJMXLrMfeOnqdO/vB/a1xJr83FiuGorlRwP7FX/0NnMI1MGn8XAICTuk3WNLZZZ3A==@vger.kernel.org, AJvYcCW7bNWZFVWOHYWZk5zr2siWfGOjSFeIacKBKn1vBsRJWLhKVUiSQD/ykYf1mPonH/zjf6pKvNy4eU/G@vger.kernel.org, AJvYcCXdd2ttPDLUPbae7qDlDiq0H8g6ixT+yXhCnILwkFXEnGjSBx766z15IdaI3Zdf4+o1JRO10vuu5lU4MTbp@vger.kernel.org X-Gm-Message-State: AOJu0YyNhqwE/YhMjlJ9onmL2gTFb/T099Xbux3GlXqqs3Pa1nVZp+oY TS25oVPkmz4gTC8e63+zWDVHbsJ+NzM9azapadROkQ5wZlKGBt/G1DCkCOjVvQ== X-Gm-Gg: ASbGncu62H9dN96Trpwwtx1+y8oA6feXtkHogNC2dXZoF2a3hD6QVP13iTnT4irqz+0 Fzfhb5AT9RGQUc9Se+cAiZGCLw6iBPFBzPCtX6K3fpfki4agsJQT4zc2+W5kakwnix48h3SzpbC BacB8etXacRr+ypxTqlMlA+zkdmXYMjy0eqLf7hEis+d2BEsTI30GWmh6jgGqaBx2VPIm7FqPo6 DEP0yXB8g0VAYR4ZWy7l7j7Nh0CprYc01EgA+bmjuxRRSDdb5W6YLuKpvPaKqlCdeBF4Z2sON4I 4t9tTvPDdqxHFOYixkUnilGzcYA= X-Google-Smtp-Source: AGHT+IGoIdFbWQ3RWjgWKSxSDRCvGnxaBnEgnG8YXNPLNpCHoZ3pFGfHEuEit+gjOeYkwv5j9mNjoQ== X-Received: by 2002:a17:90b:1dd1:b0:2fe:80cb:ac05 with SMTP id 98e67ed59e1d1-30e7d51fa18mr34101971a91.9.1747793764294; Tue, 20 May 2025 19:16:04 -0700 (PDT) Received: from ryzen.lan ([2601:644:8200:dab8::a86]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b26eb0843d1sm8758473a12.49.2025.05.20.19.16.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 May 2025 19:16:03 -0700 (PDT) From: Rosen Penev To: linux-wireless@vger.kernel.org Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Thomas Bogendoerfer , =?utf-8?q?Toke_H=C3=B8ilan?= =?utf-8?q?d-J=C3=B8rgensen?= , devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-mips@vger.kernel.org (open list:MIPS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 3/4] wifi: ath9k: ahb: replace id_table with of Date: Tue, 20 May 2025 19:15:56 -0700 Message-ID: <20250521021557.666611-4-rosenp@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250521021557.666611-1-rosenp@gmail.com> References: <20250521021557.666611-1-rosenp@gmail.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Since 2b0996c7646 , all of this platform code became no-op with no OF replacement. Not only that, there are no users of AHB here. Add an OF match table that mostly mirrors the original platform device id table. Use a qca prefix as is done for the only other property: qca,no-eeprom. Also used qca prefix for ar9530 as the latter seems to be a mistake. This will be used to add ath9k support for the various ath79 devices here. Signed-off-by: Rosen Penev --- drivers/net/wireless/ath/ath9k/ahb.c | 49 +++++++++------------------- 1 file changed, 15 insertions(+), 34 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/ahb.c b/drivers/net/wireless/ath/ath9k/ahb.c index 1ffec827ed87..27eaad8c96a4 100644 --- a/drivers/net/wireless/ath/ath9k/ahb.c +++ b/drivers/net/wireless/ath/ath9k/ahb.c @@ -19,35 +19,18 @@ #include #include #include +#include #include #include "ath9k.h" -static const struct platform_device_id ath9k_platform_id_table[] = { - { - .name = "ath9k", - .driver_data = AR5416_AR9100_DEVID, - }, - { - .name = "ar933x_wmac", - .driver_data = AR9300_DEVID_AR9330, - }, - { - .name = "ar934x_wmac", - .driver_data = AR9300_DEVID_AR9340, - }, - { - .name = "qca955x_wmac", - .driver_data = AR9300_DEVID_QCA955X, - }, - { - .name = "qca953x_wmac", - .driver_data = AR9300_DEVID_AR953X, - }, - { - .name = "qca956x_wmac", - .driver_data = AR9300_DEVID_QCA956X, - }, +static const struct of_device_id ath9k_of_match_table[] = { + { .compatible = "qca,ar9130-wmac", .data = (void *)AR5416_AR9100_DEVID }, + { .compatible = "qca,ar9330-wmac", .data = (void *)AR9300_DEVID_AR9330 }, + { .compatible = "qca,ar9340-wmac", .data = (void *)AR9300_DEVID_AR9340 }, + { .compatible = "qca,qca9530-wmac", .data = (void *)AR9300_DEVID_AR953X }, + { .compatible = "qca,qca9550-wmac", .data = (void *)AR9300_DEVID_QCA955X }, + { .compatible = "qca,qca9560-wmac", .data = (void *)AR9300_DEVID_QCA956X }, {}, }; @@ -72,20 +55,16 @@ static const struct ath_bus_ops ath_ahb_bus_ops = { static int ath_ahb_probe(struct platform_device *pdev) { - const struct platform_device_id *id = platform_get_device_id(pdev); + const struct of_device_id *match; struct ieee80211_hw *hw; struct ath_softc *sc; struct ath_hw *ah; void __iomem *mem; char hw_name[64]; + u16 dev_id; int irq; int ret; - if (!dev_get_platdata(&pdev->dev)) { - dev_err(&pdev->dev, "no platform data specified\n"); - return -EINVAL; - } - mem = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(mem)) { dev_err(&pdev->dev, "ioremap failed\n"); @@ -118,7 +97,9 @@ static int ath_ahb_probe(struct platform_device *pdev) goto err_free_hw; } - ret = ath9k_init_device(id->driver_data, sc, &ath_ahb_bus_ops); + match = of_match_device(ath9k_of_match_table, &pdev->dev); + dev_id = (uintptr_t)match->data; + ret = ath9k_init_device(dev_id, sc, &ath_ahb_bus_ops); if (ret) { dev_err(&pdev->dev, "failed to initialize device\n"); goto err_irq; @@ -156,11 +137,11 @@ static struct platform_driver ath_ahb_driver = { .remove = ath_ahb_remove, .driver = { .name = "ath9k", + .of_match_table = ath9k_of_match_table, }, - .id_table = ath9k_platform_id_table, }; -MODULE_DEVICE_TABLE(platform, ath9k_platform_id_table); +MODULE_DEVICE_TABLE(of, ath9k_of_match_table); int ath_ahb_init(void) { From patchwork Wed May 21 02:15:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 891678 Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8DC1F22F173; Wed, 21 May 2025 02:16:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747793768; cv=none; b=N5r43M6bd1MD6vBW3FfXF2hkddT8GDjGoehlC4x42BrcBeVmFDLs4QSv2OK/WeE20EgthUEyL4YVRdfMRnBWYe82o+tgLuSPUOHkeFqpWBHzt9nq38BhTHnaXgpL++lyA0CPTbcocXHohFt/9BLKrDHCIyyIprxX64fIjdZ/gvM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747793768; c=relaxed/simple; bh=gpdmefgU668pK6VStjJQagzuktgRSMx2Yg1xIRvuc/g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KZ87g1aOjfna4n235eWvyFmV8Qx/BRbwM4oofofUQqEjfl0pkIpqiRYqpPDfKCLuBkj8VNAwtp91PZ3F8HxTSGvXjDWVL+ek6Jxfs6MQw27erUWJDngwP+BzJzMp1sZiIFNVV0Sypr7b93p7pLawpB1CTPaX9xPb2YOLUrFgL3g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=HgG88T2I; arc=none smtp.client-ip=209.85.210.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HgG88T2I" Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-74267c68c11so5460333b3a.0; Tue, 20 May 2025 19:16:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747793766; x=1748398566; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JZW5CcwPkMleb80Fmd+SX38Kmt5DxqWa4H4ElhnYX7E=; b=HgG88T2ITSWCMqsVMbZyBCVZT/IWdge+Jb6YjTFe8rUv9yrIjZcT0UmkACVObqdt+K nTKSLHCQlWscSGN3dFqnD5HXtZiuFug+/jafaacXho9LpUgPz8Y27kU27H4U4mrZOIRU nP7+HVOpBKWYt4zFhvN9jUZR6fy/ccfw9jZeQYpDMsqPx6GLaglWKtPH7ADcoWVvmtYk ck25QNEhCTmGbbX5+KO1eQXyBuATgeEMV7XNdwYoAuRXafJDz6yMkMPNkAqWCy8sZH+U HUyHZqbRUocjVo7BEJ7f9ZJ/i0U24Reedcoztwho503wss2Ag0MbyL54t0nbBL7XoQqx p+fA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747793766; x=1748398566; 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=JZW5CcwPkMleb80Fmd+SX38Kmt5DxqWa4H4ElhnYX7E=; b=EeCgV1asKCWEPIrMqrf68s+kP4c8kYGoROIUBporctLkIv/GN7WUJLQvLM6+FOOEfw NUEPvtbsmkYucZLLyD91sXXLE5s/zJZ6D9QbGDTmjD47zQXn7HdyPbYl9jVmXh/s+NLz o3zzWK0JMTe1wN1ltNY13gjW+kkkzLlvY77HkUEiIstLUlRRuKpdbBJNhmMZsxScS7IH +4DIFal+saRanLl+JNEYG0bX9aWczRRB5Z5Rqc6uhklIXo+i/fgMRbGZBgAixRdN/Tx3 +CUiF514ii+hdA4RfEM4k3q0tpcora1j1I2AoUGCe3eibM74eywSYT/9BQ2WPS+310L/ FaZg== X-Forwarded-Encrypted: i=1; AJvYcCVtEh0CAmOesdV3Hd6QnX+9FwVjJpzIqLNN4ZUvzPG1nrpAWLydO6P5mCqu3okcMcg8jwODor2Wp7Px5A==@vger.kernel.org, AJvYcCX/PjHPgadduwthlOvzCM/qgthBtEcn6Opx71+Fbo1TBtqriNxoLR5+GVx23JclHh5YbIIMTNgY4BzG@vger.kernel.org, AJvYcCXPQB5vvQAFgUYy7AiKUVWcTzV1ZwB1OvPOwdDbCj//l/ygOUdETHj1IxIjWLMPs/hvPYXZdMtxdeJXGibi@vger.kernel.org X-Gm-Message-State: AOJu0YzawgQ3WCM2bZzXKoX61Shn1dawFLdww3LiD18++qai074Vnpgk 2bgCNw2gta72dR5w+DwkPekNlSOAMlLMvNLt6C/Pf3bLnQVABPk/HGed3iXpEw== X-Gm-Gg: ASbGncvyrwljTAA/snanStCiQHom6Fgwv8oWdYRp9sIrxGH40qf9JY/V3wUONDEN/nC JUPA5klVgGGLabsowGL+zzQkHoi1r4GKQz+kFELAwgzn2HhN8fgmD8oKhx7pbjSc0e9yh8ktPyu i+LYho7jFfxMC3M2dEOcfL2KrwU9hVDb2dJK0llsOiYei6bpfaQABRSyoi9ZFMgUXaju7cMLwyv Q+UvcwB5ZdXaO0THs1BfJ09/mp5fbg/K6RPFKqnPEu5zTexxFsuJ6oDeGzO2NhQK8D7Gmm0VfNZ ZQjpf9Xwyj73+otGeEjDRur7LUg= X-Google-Smtp-Source: AGHT+IGmo9M9l+Htn3g//UzeHH0APFPDedj/h9cUeRvzIihHZspqVATX5aQM/GWiGZyDH+UBp9tA8Q== X-Received: by 2002:a05:6a21:4606:b0:1f5:9016:3594 with SMTP id adf61e73a8af0-2170cc65e25mr29445068637.18.1747793765653; Tue, 20 May 2025 19:16:05 -0700 (PDT) Received: from ryzen.lan ([2601:644:8200:dab8::a86]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b26eb0843d1sm8758473a12.49.2025.05.20.19.16.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 May 2025 19:16:05 -0700 (PDT) From: Rosen Penev To: linux-wireless@vger.kernel.org Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Thomas Bogendoerfer , =?utf-8?q?Toke_H=C3=B8ilan?= =?utf-8?q?d-J=C3=B8rgensen?= , devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-mips@vger.kernel.org (open list:MIPS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 4/4] mips: dts: qca: add wmac support Date: Tue, 20 May 2025 19:15:57 -0700 Message-ID: <20250521021557.666611-5-rosenp@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250521021557.666611-1-rosenp@gmail.com> References: <20250521021557.666611-1-rosenp@gmail.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Now that OF ahb support was added to the ath9k driver, we can use it to enable and use the SoC wireless found in these chipsets. Signed-off-by: Rosen Penev --- arch/mips/boot/dts/qca/ar9132.dtsi | 9 +++++++++ arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts | 4 ++++ arch/mips/boot/dts/qca/ar9331.dtsi | 9 +++++++++ arch/mips/boot/dts/qca/ar9331_dpt_module.dts | 4 ++++ arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts | 4 ++++ arch/mips/boot/dts/qca/ar9331_omega.dts | 4 ++++ .../mips/boot/dts/qca/ar9331_openembed_som9331_board.dts | 4 ++++ arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts | 4 ++++ 8 files changed, 42 insertions(+) diff --git a/arch/mips/boot/dts/qca/ar9132.dtsi b/arch/mips/boot/dts/qca/ar9132.dtsi index 61dcfa5b6ca7..dc94459aa3e9 100644 --- a/arch/mips/boot/dts/qca/ar9132.dtsi +++ b/arch/mips/boot/dts/qca/ar9132.dtsi @@ -156,6 +156,15 @@ spi: spi@1f000000 { #address-cells = <1>; #size-cells = <0>; }; + + wmac: wmac@180c0000 { + compatible = "qca,ar9130-wmac"; + reg = <0x180c0000 0x230000>; + + interrupts = <2>; + + status = "disabled"; + }; }; usb_phy: usb-phy { diff --git a/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts b/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts index f894fe17816b..7df518fdc515 100644 --- a/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts +++ b/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts @@ -108,3 +108,7 @@ partition@2 { }; }; }; + +&wmac { + status = "okay"; +}; diff --git a/arch/mips/boot/dts/qca/ar9331.dtsi b/arch/mips/boot/dts/qca/ar9331.dtsi index 768ac0f869b1..4cd55f765e1f 100644 --- a/arch/mips/boot/dts/qca/ar9331.dtsi +++ b/arch/mips/boot/dts/qca/ar9331.dtsi @@ -285,6 +285,15 @@ spi: spi@1f000000 { status = "disabled"; }; + + wmac: wmac@18100000 { + compatible = "qca,ar9330-wmac"; + reg = <0x18100000 0x20000>; + + interrupts = <2>; + + status = "disabled"; + }; }; usb_phy: usb-phy { diff --git a/arch/mips/boot/dts/qca/ar9331_dpt_module.dts b/arch/mips/boot/dts/qca/ar9331_dpt_module.dts index c857cd22f7db..d855dfe118e6 100644 --- a/arch/mips/boot/dts/qca/ar9331_dpt_module.dts +++ b/arch/mips/boot/dts/qca/ar9331_dpt_module.dts @@ -97,3 +97,7 @@ &phy_port0 { &phy_port4 { status = "okay"; }; + +&wmac { + status = "okay"; +}; diff --git a/arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts b/arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts index 7affa58d4fa6..679e793e9f55 100644 --- a/arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts +++ b/arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts @@ -98,3 +98,7 @@ spiflash: w25q128@0 { reg = <0>; }; }; + +&wmac { + status = "okay"; +}; diff --git a/arch/mips/boot/dts/qca/ar9331_omega.dts b/arch/mips/boot/dts/qca/ar9331_omega.dts index 8904aa917a6e..093142bf3ed6 100644 --- a/arch/mips/boot/dts/qca/ar9331_omega.dts +++ b/arch/mips/boot/dts/qca/ar9331_omega.dts @@ -74,3 +74,7 @@ spiflash: w25q128@0 { reg = <0>; }; }; + +&wmac { + status = "okay"; +}; diff --git a/arch/mips/boot/dts/qca/ar9331_openembed_som9331_board.dts b/arch/mips/boot/dts/qca/ar9331_openembed_som9331_board.dts index dc65ebd60bbc..22e05d9c283a 100644 --- a/arch/mips/boot/dts/qca/ar9331_openembed_som9331_board.dts +++ b/arch/mips/boot/dts/qca/ar9331_openembed_som9331_board.dts @@ -106,3 +106,7 @@ &phy_port2 { &phy_port4 { status = "okay"; }; + +&wmac { + status = "okay"; +}; diff --git a/arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts b/arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts index 10b9759228b7..b740f1a91162 100644 --- a/arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts +++ b/arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts @@ -114,3 +114,7 @@ spiflash: s25sl032p@0 { reg = <0>; }; }; + +&wmac { + status = "okay"; +};