From nobody Sun Apr 5 19:43:17 2026 Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) (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 73DBC37AA62 for ; Mon, 23 Feb 2026 22:45:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771886704; cv=none; b=QeqyuudGB5BXKwas4oCnMkU3BN5BbhI0qjmalmA/ntqqlJGr3YPThQVzjF61iJQPGNfjUrPaNluFHlEUG7WjPJCUsnGROoPnr8kItEOutlHhmJUn/ONre+mAloKU2JoIuYRKXe5pnkH1YkwZxw1NGarSBlxjxVDDLY1dkClVYks= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771886704; c=relaxed/simple; bh=N55S5CJS7oD7maBdaLEKagUEImQsjUHAiSPodpHT3LU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=cD0cfDijRKcwUI/2I7/M7kWXd/GYONrH7OgGhOZViotLIOzKpbaJGI93TEeDSyKY9eHvMvPFK1gDvS6bqJWGrpR8CqCL2ov4losdQhGeeo4/I6xcC0A0yVtbUOrRXZ4XpIfCLoqjEOo+qJnaFm/VLdEJHB5d3c7qG2wtr+K5Fhg= 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=GsgXCO5P; arc=none smtp.client-ip=209.85.210.172 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="GsgXCO5P" Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-8230f2140beso3210030b3a.1 for ; Mon, 23 Feb 2026 14:45:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771886703; x=1772491503; 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=OI4hfqGbqoBq8nFvZm2zjmkGtfn/+MA3Ga/ZSFfqOS0=; b=GsgXCO5Psg9XcqK2ipWRXQPPJBJccKhk1M6fur1B2CouT6QE32Lf7icZpZvrOggZXH TLAgU+nLlqgubqYr8+xkMa0CqJFWVofPdF5iQoacvWHAsO5OhIc0IJONWrnpkH0Shahs SfDHhbHDVXuH24EI1RLDQD1BILM2QIGRCPMhRbebhayzjHqoe3yrO9i+jX8TQYWBWraQ mUC31RRySitifuhOdoytGwwft7TZKwiiYpK5LNrcGtyrOQSc3E/kmqTFwENLnr8iJoGT 6BbPF2Hpxm5vAS9MwcYImwnDCYcia82WDk1ZaGtraZoofXwj+pFkGykee39oeWZ7q9HV IYFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771886703; x=1772491503; 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=OI4hfqGbqoBq8nFvZm2zjmkGtfn/+MA3Ga/ZSFfqOS0=; b=IayWE/mupIa8scA4Qz5/hIpaJoKuTqIbLsaQ4bki1oeti+H+ig7VH/NVf7VZcH9wP0 k7iM4SwaI975g7Cc0Wk99CZ7Gf6CfmhtSblkDXufTmLcoDwxmM26m7rZYRrmpm/MFCjo DB6bU4U50uVYW+KX9qOiNJiASnonuDSiAXOVsEeDFU6+xuIvpwh+VhYC+E4D7dI+FxAi 8GFQlPzmJVEGZJ5hYI9hPOhDMF1T6CtT0VKal0b8f34TTCLvYiaETY2NToGXjNO5xziA khFB0el42Q0DBBsXVMjHLYZ5Uz2TKU9LXa2TlMMhaumgxo5w37SXQF0uhis0wZnEZETz g3Yg== X-Forwarded-Encrypted: i=1; AJvYcCWno+qE3ClVVxYmdXqqyNUGRx8nOtbLBYDBrj3TGDpMGB7jLo8OR+ROYHSKIAE1C6/tNjmqMBhrXb3YFMI=@vger.kernel.org X-Gm-Message-State: AOJu0YzbLrVdmMUfW9R6zeE7nK81EHqTwIQDgxW6Hqr3/wjPsnaMupXK +T8Vo3Rz4ineoUHUPIAR4KWJkGYEZfsXHyKDH6sks0K8OR0/sxJtQ/N8 X-Gm-Gg: AZuq6aLFYb1ulkEqiMZQRN3VFT4mHoqLnAYM9K9+fgZdv59sLDcU1b10aWwjwbRLEfv G5FY7d1C6yMBRkfXWxIFH6X/pO8gd1m8Uo127RrY0m5D2gQNn8RnldmlYZ4ieMG8pS3jAN+dtTV aOM5z/y9e7nqZtpflsllyjSnfk7z8zfc4p5ba0XOH4oyioIbgE4FuACHL8bmLeE1vFMq4m0S3Zr s0bCMalrNOrxhDNHzmYOxsirINgoqSVzxw08rZbFoG0LBhS8S9k2RZPopErz2ubPt0oSir+6S7f DbroP9xSRR+KxCj9D9cPQYDOeHa+rdWyuisRm1WrBwgauV6IvgliutPTaTiLcOlIFyb2+KJcruQ sDP9WDwkYN9j7mqn4i075H8HIatqC75c07FuBORfKT0juw8uIqnEZa1e28Z2Uu1AS6rdogs3edb Sv3oy3bV/82mzKFiAj5uxlzwEqY9LVLurZ9xFNVW4i+psDskbLyim27w== X-Received: by 2002:a05:6a21:32aa:b0:394:5513:ce0 with SMTP id adf61e73a8af0-39517e24f7amr13908213637.29.1771886702799; Mon, 23 Feb 2026 14:45:02 -0800 (PST) Received: from ryzen ([2601:644:8000:56f5::8bd]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c70b7255491sm8495466a12.26.2026.02.23.14.45.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Feb 2026 14:45:02 -0800 (PST) From: Rosen Penev To: linux-wireless@vger.kernel.org Cc: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= , linux-kernel@vger.kernel.org (open list) Subject: [PATCH ath-next] wifi: ath9k: use kmemdup and kcalloc Date: Mon, 23 Feb 2026 14:44:45 -0800 Message-ID: <20260223224445.27352-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" Simplifies the code slightly by removing temporary variables. multiplication overflow is also gained for free. Signed-off-by: Rosen Penev --- drivers/net/wireless/ath/ath9k/ar9002_hw.c | 6 +++--- drivers/net/wireless/ath/ath9k/common-init.c | 8 ++------ drivers/net/wireless/ath/ath9k/init.c | 8 +++----- drivers/net/wireless/ath/ath9k/recv.c | 4 +--- 4 files changed, 9 insertions(+), 17 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/ar9002_hw.c b/drivers/net/wirel= ess/ath/ath9k/ar9002_hw.c index b26224480041..0f24539b75ec 100644 --- a/drivers/net/wireless/ath/ath9k/ar9002_hw.c +++ b/drivers/net/wireless/ath/ath9k/ar9002_hw.c @@ -80,14 +80,14 @@ static int ar9002_hw_init_mode_regs(struct ath_hw *ah) /* iniAddac needs to be modified for these chips */ if (AR_SREV_9160(ah) || !AR_SREV_5416_22_OR_LATER(ah)) { struct ar5416IniArray *addac =3D &ah->iniAddac; - u32 size =3D sizeof(u32) * addac->ia_rows * addac->ia_columns; + u32 n =3D addac->ia_rows * addac->ia_columns; u32 *data; - data =3D devm_kzalloc(ah->dev, size, GFP_KERNEL); + data =3D devm_kmemdup_array(ah->dev, addac->ia_array, n, sizeof(u32), + GFP_KERNEL); if (!data) return -ENOMEM; - memcpy(data, addac->ia_array, size); addac->ia_array =3D data; if (!AR_SREV_5416_22_OR_LATER(ah)) { diff --git a/drivers/net/wireless/ath/ath9k/common-init.c b/drivers/net/wir= eless/ath/ath9k/common-init.c index da102c791712..52e02e0752d8 100644 --- a/drivers/net/wireless/ath/ath9k/common-init.c +++ b/drivers/net/wireless/ath/ath9k/common-init.c @@ -133,13 +133,11 @@ int ath9k_cmn_init_channels_rates(struct ath_common *= common) ATH9K_NUM_CHANNELS); if (ah->caps.hw_caps & ATH9K_HW_CAP_2GHZ) { - channels =3D devm_kzalloc(ah->dev, + channels =3D devm_kmemdup(ah->dev, ath9k_2ghz_chantable, sizeof(ath9k_2ghz_chantable), GFP_KERNEL); if (!channels) return -ENOMEM; - memcpy(channels, ath9k_2ghz_chantable, - sizeof(ath9k_2ghz_chantable)); common->sbands[NL80211_BAND_2GHZ].channels =3D channels; common->sbands[NL80211_BAND_2GHZ].band =3D NL80211_BAND_2GHZ; common->sbands[NL80211_BAND_2GHZ].n_channels =3D @@ -150,13 +148,11 @@ int ath9k_cmn_init_channels_rates(struct ath_common *= common) } if (ah->caps.hw_caps & ATH9K_HW_CAP_5GHZ) { - channels =3D devm_kzalloc(ah->dev, + channels =3D devm_kmemdup(ah->dev, ath9k_5ghz_chantable, sizeof(ath9k_5ghz_chantable), GFP_KERNEL); if (!channels) return -ENOMEM; - memcpy(channels, ath9k_5ghz_chantable, - sizeof(ath9k_5ghz_chantable)); common->sbands[NL80211_BAND_5GHZ].channels =3D channels; common->sbands[NL80211_BAND_5GHZ].band =3D NL80211_BAND_5GHZ; common->sbands[NL80211_BAND_5GHZ].n_channels =3D diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/a= th/ath9k/init.c index b52ddb237dcf..e52775dda6a7 100644 --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c @@ -297,7 +297,7 @@ int ath_descdma_setup(struct ath_softc *sc, struct ath_= descdma *dd, { struct ath_common *common =3D ath9k_hw_common(sc->sc_ah); u8 *ds; - int i, bsize, desc_len; + int i, desc_len; ath_dbg(common, CONFIG, "%s DMA: %u buffers %u desc/buf\n", name, nbuf, ndesc); @@ -351,8 +351,7 @@ int ath_descdma_setup(struct ath_softc *sc, struct ath_= descdma *dd, if (is_tx) { struct ath_buf *bf; - bsize =3D sizeof(struct ath_buf) * nbuf; - bf =3D devm_kzalloc(sc->dev, bsize, GFP_KERNEL); + bf =3D devm_kcalloc(sc->dev, sizeof(*bf), nbuf, GFP_KERNEL); if (!bf) return -ENOMEM; @@ -382,8 +381,7 @@ int ath_descdma_setup(struct ath_softc *sc, struct ath_= descdma *dd, } else { struct ath_rxbuf *bf; - bsize =3D sizeof(struct ath_rxbuf) * nbuf; - bf =3D devm_kzalloc(sc->dev, bsize, GFP_KERNEL); + bf =3D devm_kcalloc(sc->dev, sizeof(struct ath_rxbuf), nbuf, GFP_KERNEL); if (!bf) return -ENOMEM; diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/a= th/ath9k/recv.c index 34c74ed99b7b..93b41a1bb2af 100644 --- a/drivers/net/wireless/ath/ath9k/recv.c +++ b/drivers/net/wireless/ath/ath9k/recv.c @@ -202,7 +202,6 @@ static int ath_rx_edma_init(struct ath_softc *sc, int n= bufs) struct sk_buff *skb; struct ath_rxbuf *bf; int error =3D 0, i; - u32 size; ath9k_hw_set_rx_bufsize(ah, common->rx_bufsize - ah->caps.rx_status_len); @@ -212,8 +211,7 @@ static int ath_rx_edma_init(struct ath_softc *sc, int n= bufs) ath_rx_edma_init_queue(&sc->rx.rx_edma[ATH9K_RX_QUEUE_HP], ah->caps.rx_hp_qdepth); - size =3D sizeof(struct ath_rxbuf) * nbufs; - bf =3D devm_kzalloc(sc->dev, size, GFP_KERNEL); + bf =3D devm_kcalloc(sc->dev, sizeof(struct ath_rxbuf), nbufs, GFP_KERNEL); if (!bf) return -ENOMEM; -- 2.53.0