From nobody Sun Apr 5 13:18:46 2026 Received: from mail-qk1-f181.google.com (mail-qk1-f181.google.com [209.85.222.181]) (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 463FD37E31A for ; Tue, 24 Mar 2026 02:15:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774318559; cv=none; b=jB1qrQnKEXYN3pDCjh3oFfu0Q4YJwqxYv0TMSNZOspwFM55ko+e3k1d42moi7J6BAgS11/Haa9utKgi+JDA+HWG8QZkCuQ18YARwuG5hQP4L9UMg+QcgOqtPicXmuQ249YNvCUKfZZL3MKQBoR29A3N9BEZzAc1YXdop1XIBx+c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774318559; c=relaxed/simple; bh=LolhVDPTc/b0iMlOo4xNV+QarGo1lZ+wY4rl4kHzjKw=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=P9p52irlliKtoXHU9zVKafE7DzaLdwWVIDgBsG8L5gex4Qm/GkVhi3/SBp6Rpd7rlv4c5rFTNt3xXiGW42iIC8TBj2Iy5mCga8CYSAGUx1ri5yRXSp/S58Po0xnySSKrT4N2vv691OKpJbqR7QMtF4ivKTc7psN1kPWHEKJC7f8= 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=rHB8EkSO; arc=none smtp.client-ip=209.85.222.181 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="rHB8EkSO" Received: by mail-qk1-f181.google.com with SMTP id af79cd13be357-8cbb6d5f780so372877585a.1 for ; Mon, 23 Mar 2026 19:15:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774318557; x=1774923357; 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=RFNSX+uGwINQ7GwV1ShKWvu8Q5rlWz9OJn1aJPtS3Cc=; b=rHB8EkSOn16rUeG4tnA/NvLCNGsy0IR3m/ov1PeEwPErl92JBhJnJBWJx8BcUmzvJa O6KNhqQJhoAz2DvknAprZ0hf4XPp3cPgSLkt0+Bxb7SoimDgrevi+emmR3RUawtubG+p 3IxifvJvuxPdtYDKiWhf7j6J3fJG/dsbExgxlU6E2873xgmzZl8uwDRYgA8lKYjCuoTQ y8NdB573xZhtA+eczUlSXMA1qAp8RrkhegAWH8BvecWHD7bxCPZsJKDCnD2FieNB3zSP 74VkSxUozJJ8tSc2K+TN7ug/9snGNHmACqLboAWiix53X58VxcuIQKE276V3KN0ytlhb FKxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774318557; x=1774923357; 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=RFNSX+uGwINQ7GwV1ShKWvu8Q5rlWz9OJn1aJPtS3Cc=; b=oOkorrULv3cIk++rGdyoXC9TMN1HP8CUjSKgxhHmGnB7geF/d90BM6jqsT9r6dJHgm 6sd1npY1+Qm/XVgXZH3STN/FNgDXGC9Iu/LzEFw3P6+Rzf1gKv7RtF5Jb03GBFFKIGBJ YJ3R+gNfzvjjuOu8BD3Oscln5GQByZdcEFmxfm47Sk9ktSvPwkAX1ktgUumSt3fup6kW PxJat+y5ccUXf0/KCgw9mpwiVKy0ZAXQQvS+2RaAagZoETW44ko3oSez0KW/hotrc90f 42PCKJlBROZpYGXmxrbOGx/8DVRorcBBCayedEC6zF6JbZ6y4B3Yia7UYKNRdLdWrAyA zwrA== X-Gm-Message-State: AOJu0YzclhkDtVP3aL3ebsqq/QQ7henaiv4F5F6t2IDHY0pZYwCkxSH3 FXn4p0kEySyoRHvRbZes8Mz8VyY/rA88kpvsW8JS5IUz+VmPcdMlH5fs42m7gA== X-Gm-Gg: ATEYQzxRH4/ja9mM6azTo4ka5MPcPMXMFK4g3eaQpt3kubbzHbgxJWcACVA8lriZqWC QQTBET6BE/QcRw8Sg79nqpe9cvubOkFXRY5RNNQR2UXnExa3qpPtmAwEV+wrum0VvMegLOFI1ml s91xdh9JwSND2WQqtot148uOXn7qFXDOCRvChbcTQg8zoe0o24DZlxAqEFTdLCplUZqKZGwymbg f+nXZsClPB3mBpjYLyFNQn56cy76wt5Bco9mWvLkV/RL0vxv5qqvez6X/voK3RkBQa/qjulipUo WSOvvL8VEqEVC0uO1F4VD1ZK5FEWBWYlqDixA18ocRxIPG6AnBaYLObTEVlJiU8Sb7LuF41nHcX QNKMTDc/zbJrWifSfZvnag2oDATXI5mwMy2vRMLXuT4GUh94JLkwIpztjxhq+S4pGFcQ5K5MnE0 tT5UpCvpH2jWwRD07sh2uQ7e7Tl369eqxh95li+2G/s5wxUl+udLbtiwQ= X-Received: by 2002:a05:620a:4727:b0:8cf:de1c:edd6 with SMTP id af79cd13be357-8cfde1cfa47mr1436002885a.28.1774318556710; Mon, 23 Mar 2026 19:15:56 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d::8bd]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8cfc8f61aa7sm932687385a.4.2026.03.23.19.15.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Mar 2026 19:15:55 -0700 (PDT) From: Rosen Penev To: linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH] w1: simplify allocation of w1_master Date: Mon, 23 Mar 2026 19:15:37 -0700 Message-ID: <20260324021537.14191-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" Convert bus_master to a flexible array member as it's being used as one with the old C89 + 1 pointer trick. Signed-off-by: Rosen Penev --- drivers/w1/w1_int.c | 4 +--- include/linux/w1.h | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c index 19a0ea28e9f3..a0bb97608564 100644 --- a/drivers/w1/w1_int.c +++ b/drivers/w1/w1_int.c @@ -31,12 +31,10 @@ static struct w1_master *w1_alloc_dev(u32 id, int slave= _count, int slave_ttl, /* * We are in process context(kernel thread), so can sleep. */ - dev =3D kzalloc(sizeof(struct w1_master) + sizeof(struct w1_bus_master), = GFP_KERNEL); + dev =3D kzalloc_flex(*dev, bus_master, 1); if (!dev) return NULL; - dev->bus_master =3D (struct w1_bus_master *)(dev + 1); - dev->owner =3D THIS_MODULE; dev->max_slave_count =3D slave_count; dev->slave_count =3D 0; diff --git a/include/linux/w1.h b/include/linux/w1.h index 064805bfae3f..7379a9ddefc0 100644 --- a/include/linux/w1.h +++ b/include/linux/w1.h @@ -236,9 +236,9 @@ struct w1_master { struct device_driver *driver; struct device dev; - struct w1_bus_master *bus_master; - u32 seq; + + struct w1_bus_master bus_master[]; }; int w1_add_master_device(struct w1_bus_master *master); -- 2.53.0