From nobody Sun Apr 5 19:42:20 2026 Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) (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 8E03D3EBF10 for ; Mon, 23 Feb 2026 22:43:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771886593; cv=none; b=QbQ+j9Y2KQgGpb5RkWRQABPT2w11gjmszl5NzimOf7LttzhPM9XYw24eRc1XRM928+UTdkGlPHrfX+pWn4rVyjOv9CL152ilaNkHbu7f2zjgfZYGHnDWRs1Vkt1oxJ0LYSayg75stW/ZUV2Z7tG4HEyqNY2Lpuyd/+vSI/wbMBA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771886593; c=relaxed/simple; bh=fA9S2AhxnAOmqqHU0gNRU8ri57DzFNJjWsSPhJryMVQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=lIy1P0a0vQEuTd/X4S0TBZ5REjERMFjXn35s1XcjLVvpHCobDP8ErXEM7bmVX1hj5wFMUzR3VHZgAua6bKbN3bYYI/e8ho9VLwxFknR2l98plQXxq6Eqixxx5EHXKcA+ybXTBT9ZWV9tIDZX2gMbruC+3TgZG3D0rY1cGr4CIDE= 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=Ig2tXgWb; arc=none smtp.client-ip=209.85.210.169 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="Ig2tXgWb" Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-8249aca0affso2527898b3a.3 for ; Mon, 23 Feb 2026 14:43:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771886592; x=1772491392; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=zA8neqIU5RolfFhf2Lp4LEYhHtdffFh3y3a13wUOp+g=; b=Ig2tXgWbE0VDLOJq6/XDlpyfMp0vMRUJM2cF4hIHw/OyFiqyQP1+a9WOM1jf2JMdWW gFKkSHogQVfqfenxGxXBCt2xQk+6kYNygVIVSPMDOXL+cAQTavziu+fCKTbdcQJ9AZLj xhQheZWJ8/mbNVDz/f3SmOLQYGedVGBx156L2a1UaT24HxGRBBNdJpvTp2gg/6RN1l+S /bw6nVoG+uwAzSJwCkKDrlPsN+YQb9ZLuL6r57PLLqtG9jTKi04tSOcc042f390T3IaS CyVtQNUwvpQKP9QuqVDe9bH6gH0bG6PDml8W8pYiKXoFWF13Eic+uWwF9nhb6dNVBMJr Gg4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771886592; x=1772491392; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=zA8neqIU5RolfFhf2Lp4LEYhHtdffFh3y3a13wUOp+g=; b=K9TGKk/mdcJ4M7ooS4D2ZyOE7M/h6JcI2UvEwQSEv4B2K+qm/OfliAmUBUQEOzqb0j 1atzK7kHHnQfJgl6mBGLmclD8Ze0iQ6HHCOzGQxZ4WzAg9xplRW9XLzF+FY0DHUw0nqa 6+yzrvU3Z5X5KNPyFuUqOxqGA51wuibyW6PtT7GtBUvYQoxY/x/XdMz+sfTS7uhAJ6ar 2wvCnazDR5fSR+a+MS4Cs17T/rJbyF0i/UsOKSxVA3GWnqdQN8T1oVjRGQ2uLtGZxIuW 0iw/PSnXok913Th6lEI3IM40o3y8ztPIWDDCk69XT4bLBeaU6ITvLRU8Iw67qc84Sdv5 gpqg== X-Forwarded-Encrypted: i=1; AJvYcCW0QKp57pc0Qm5vz402UleSywvT5KjIXqWWiki/fLKQzo6OOyF2QPLpCfyvYj0ByKQJ1SP35g/LpfKJGKk=@vger.kernel.org X-Gm-Message-State: AOJu0YzX79eaD55WHVp+k2zubm0XdzwW1KdjxG8tIjpvtDqqnEwes/wo cDrHSNquCl+82cwfL/FLGcLOEf0+5qGk4Op0/SHPKdniYBCRXHUmDo5F X-Gm-Gg: AZuq6aIvZqu/ZtoOHV4vUf9wPDDmXQ1G+rP3m9ypqvqj/q3M8xG8Vujuy17h9uqPBn+ hQzj1lqKaendowQLZhgA1CZy3l5iSwS+CyeJLUeVh6jZmlmfGjVyATJcfw0vRc/SWRqQmez4rSZ KlV/8sz/QlnqQoUdeAG9ss0BTAr9N0b39tqTeBMZocTuj3TZXyYd7NNEcPT6WdV0NXXMb5CSLYU KV8iRrbcJJsbPFPW/sKby/jbF44dktE01hC1eazPQzh+Ju3piSORdgDfCEDvC0W76ZO1NZ9P0Ls 4ceCvHkomE3Jkign0Od+Y6Wqqp4u/Q0lYvQ9GxqsSQAXd5NTljH9dmeHP7s2FT2RDwzIVZY7bHp 8cN3vR92l04nkxsk5VANOvZW2BoTBVmxWErs9Dy8qVTNSWKJUC/P3g0Qvph9Xstf5sO7ZiMKnjQ r7zDBo4NwQjTiLEkRMYm50UiqP3Pc5r9qKwumNPgVmIzNQvpOiEos7t4z33TfFRKrp X-Received: by 2002:a05:6a00:130c:b0:7e8:4471:8db with SMTP id d2e1a72fcca58-826daaac4c5mr8310461b3a.60.1771886591857; Mon, 23 Feb 2026 14:43:11 -0800 (PST) Received: from ryzen ([2601:644:8000:56f5::8bd]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-826dd693845sm10614461b3a.26.2026.02.23.14.43.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Feb 2026 14:43:11 -0800 (PST) From: Rosen Penev To: linux-wireless@vger.kernel.org Cc: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Manivannan Sadhasivam , linux-arm-kernel@lists.infradead.org (moderated list:ARM/ACTIONS SEMI ARCHITECTURE), linux-actions@lists.infradead.org (moderated list:ARM/ACTIONS SEMI ARCHITECTURE), linux-kernel@vger.kernel.org (open list) Subject: [PATCH ath-next] wifi: ath9k: owl: move name into owl_nvmem_probe Date: Mon, 23 Feb 2026 14:42:54 -0800 Message-ID: <20260223224254.27081-1-rosenp@gmail.com> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" There is no need for dynamic allocation for a simple string. request_firmware_nowait copies the string internally anyway. The error message on failure is also wrong. It's an allocation failure, not a find failure. Signed-off-by: Rosen Penev --- .../wireless/ath/ath9k/ath9k_pci_owl_loader.c | 31 +++++-------------- 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/ath9k_pci_owl_loader.c b/driver= s/net/wireless/ath/ath9k/ath9k_pci_owl_loader.c index fe1013a3a588..b9ef34709202 100644 --- a/drivers/net/wireless/ath/ath9k/ath9k_pci_owl_loader.c +++ b/drivers/net/wireless/ath/ath9k/ath9k_pci_owl_loader.c @@ -137,24 +137,6 @@ static void owl_fw_cb(const struct firmware *fw, void = *context) release_firmware(fw); } -static const char *owl_get_eeprom_name(struct pci_dev *pdev) -{ - struct device *dev =3D &pdev->dev; - char *eeprom_name; - - dev_dbg(dev, "using auto-generated eeprom filename\n"); - - eeprom_name =3D devm_kzalloc(dev, EEPROM_FILENAME_LEN, GFP_KERNEL); - if (!eeprom_name) - return NULL; - - /* this should match the pattern used in ath9k/init.c */ - scnprintf(eeprom_name, EEPROM_FILENAME_LEN, "ath9k-eeprom-pci-%s.bin", - dev_name(dev)); - - return eeprom_name; -} - static void owl_nvmem_work(struct work_struct *work) { struct owl_ctx *ctx =3D container_of(work, struct owl_ctx, work); @@ -195,8 +177,9 @@ static int owl_nvmem_probe(struct owl_ctx *ctx) static int owl_probe(struct pci_dev *pdev, const struct pci_device_id *id) { + char eeprom_name[EEPROM_FILENAME_LEN]; + struct device *dev =3D &pdev->dev; struct owl_ctx *ctx; - const char *eeprom_name; int err =3D 0; if (pci_enable_device(pdev)) @@ -215,11 +198,11 @@ static int owl_probe(struct pci_dev *pdev, if (err <=3D 0) return err; - eeprom_name =3D owl_get_eeprom_name(pdev); - if (!eeprom_name) { - dev_err(&pdev->dev, "no eeprom filename found.\n"); - return -ENODEV; - } + dev_dbg(dev, "using auto-generated eeprom filename\n"); + + /* this should match the pattern used in ath9k/init.c */ + scnprintf(eeprom_name, sizeof(eeprom_name), "ath9k-eeprom-pci-%s.bin", + dev_name(dev)); err =3D request_firmware_nowait(THIS_MODULE, true, eeprom_name, &pdev->dev, GFP_KERNEL, ctx, owl_fw_cb); -- 2.53.0