From nobody Sun May 24 18:41:09 2026 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (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 6E1F038E8BB for ; Sun, 24 May 2026 10:38:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779619121; cv=none; b=EpklCx6Zq5r3E8yDD+usOPCuaxGw7fVQkGnzFAhgUH9MKaheC0MyRqKqCDMdjQDCzSvoNplOgq2x5odVhmOpIR3L7/uxI07dPgokO71+wlfogNFoOUK8X70XCMGvG6AdtbC9tzQWsUWJdSXsfnTtsLyQVOfEIQID6K6miLLhKXI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779619121; c=relaxed/simple; bh=XRV/+XoDdHbhtELz2V9znZyyMZOTK1ufoBxMpuFanSk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=a31kHrIZYR+b0lh791iC+UjqUKH4j7rf9tEvL028p+Bu2BC3m01H6NpqqUUvbo8GpTDoytSeQoTrGdm9BR6RpneSOrv9adnCqBPkTNChwXg50tNvZF5Yke1Kb6TVRDmp1dGW+08dEZTP/OMM6miSfCzN+JX44l11wY3RMr5ZjX4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre.com header.i=@baylibre.com header.b=LLoM6z5M; arc=none smtp.client-ip=209.85.128.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre.com header.i=@baylibre.com header.b="LLoM6z5M" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-4905529b933so5765995e9.0 for ; Sun, 24 May 2026 03:38:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre.com; s=google; t=1779619118; x=1780223918; 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=VC4Ed4uaMeKZh1qdWlHHFd/KixVmQ/jBuCcYBYp1qIg=; b=LLoM6z5MMbPherG7fzyX2xMLOrDU/tuFmMFPu4yoJef5YGM2WNZucPzeJf5CV1HXpo 8Kruhd1e6fkT8DOoc12dIeoHN//V9mNiiL6GnDG6IYsYt46tCppfeIMHVZNIi09JV9k8 1cUQqqr8CSb6KKK0wQFshpiVqptlC2sFTP0RhgVQuvXCks+GFVGNh7l1FWPUnwsHvshJ 8LrG5l8HQrIfNNL4/KiFr8ZLYxnMnVKJLqtdALmNS3PYNklO26Y3N9E+vNwsx51m4CiM i26kDk2JdtOl5y9TN3OWDnWZYStGLpAH5S8skzJKHaZgMM4q2ari/7hSrNVNdBi5daIV yIVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779619118; x=1780223918; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=VC4Ed4uaMeKZh1qdWlHHFd/KixVmQ/jBuCcYBYp1qIg=; b=TkdeL1acV1xmtoBQJ4aDDdRWup8anaYxHxv1HGhIVBKvsvIYamrSVh2Lw+oaUkI168 anIuXfchf+g/cYmWCcMgFaic5S//LkVE2pxW+qnpWlqRwIQnYK2paKcZAVv3u0MubVPU TtU8tNQPiah8n6T6TJqa6PvAahbN7S0HkrTb7YBmHl/0hB4S7K0OjM6qJ14esO/TceqM YQKSwzyAdK1BVwjM7xD33EJbTiwduCIMGMEYVRgoV3sB73toctZ+AzD1VhArdYSSK41R VbR+hzM+IhhbMgIq+96TY49Nq+AmoSu+yED95xQhPCUYhp3dxISE0+vRysJzcL+d2d+i Q57g== X-Gm-Message-State: AOJu0Yzuis12MH2wmBvO+gvyKPNALK9noAEsYXPQkQXfUi26CWeZTrRX MtDc9aNgmu4MwzJzA9uUH3qdEduvNg6Nn9E778fAvD9+hE7jdkZDgDny+eEqFn546WpxVy4KIHX nuxATv3o= X-Gm-Gg: Acq92OHHZHxyjrLTpby2M0BEWeBXgwq7Nijle2yDGMWes/l9Fvk6PuC+TM0nYl8Udvn uacjjinYMw/4UQN1s5R94WaqewzmXg++pcHY5yDVOVA0LawDrwZqtBs7QD94xMYMKzOODgs59gv fVgPCunzrUj5awEAadz4M8F5uA2yEuk7Dt0tLYrug7blba1M7/lfmFyWHVdk3y0yymuNvTDlqRQ Kv0yuFSMFdP+36hO6I2IczkBd2T7FYCVTXloxOOjIRJ/MkdnfH7JQNOI+5n4yk+ogmoQgyYyk8p Hf8Z0wwVWE8fAZq/ifBaA9hYLk7i7LkrbVtVJGVcu4qWiarp74BPTeiT30dbR2sR0FeuVHZQ8mq ZaiCipp3Zxw7yYZXGBkCKWzeShyy9Dbdsy9dcGRB80muIleBixCot/wE0M+u1o7FNjFCSJZlkH2 0N8d/SA/fD17/VS398x/fmCi37xPGcMXUP22QACg0= X-Received: by 2002:a05:600c:3553:b0:490:4872:21da with SMTP id 5b1f17b1804b1-49048722350mr147953135e9.15.1779619117810; Sun, 24 May 2026 03:38:37 -0700 (PDT) Received: from localhost ([2a02:8071:56d1:2de0:1d24:d58d:2b65:c291]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-45eb6ccd211sm24141317f8f.10.2026.05.24.03.38.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 May 2026 03:38:37 -0700 (PDT) From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig=20=28The=20Capable=20Hub=29?= To: Arnd Bergmann , Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org Subject: [PATCH v2 1/2] misc: pch_phub: Drop two unused functions Date: Sun, 24 May 2026 12:38:25 +0200 Message-ID: <25c7e501f08d345bb8458f8188a01204d3cb8ed3.1779618644.git.u.kleine-koenig@baylibre.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Developer-Signature: v=1; a=openpgp-sha256; l=7544; i=u.kleine-koenig@baylibre.com; h=from:subject:message-id; bh=XRV/+XoDdHbhtELz2V9znZyyMZOTK1ufoBxMpuFanSk=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBqEtUibFoASJ6p9/vrvKbnsZ8ITnoXq/mTtCLtK JMYyrsQy3SJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCahLVIgAKCRCPgPtYfRL+ Trc8B/4sdiRwJmiUWJot91BSb135tl7sgzB+DipBLxDyO/jByLJAs6rqD6y7abDiFbtS2C7UPnJ hQmF8WUJaOTT+39jxSF8mJNpKIH4Aqy/z2fOZCijkn5BNxyVeVT6dUVCMt39czI/I5e1sKcXdg5 4v6dE3MEswnFPAmxQzVaNxgU6678FxRlTmjfhBQlZyeJ1MWp1aGyA4X5FfGlmydRlB5nrynlP5M ++q6Woi6B0/7yMorMZeKjfFguLD1YdrUgKvb3C11r4PXxvn4A2Shww8OIiyFIomwMzdbJ6h0ElZ rwQ8yyLRo/4p0EkobKzDY5Ncr+OdF2FZbvf3e134BGUkqI7x X-Developer-Key: i=u.kleine-koenig@baylibre.com; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: quoted-printable The two functions are unused since commit 34afa1d657d4 ("misc/pch_phub.c: use generic power management") but the compiler didn't warn about it because the same commit marked the functions as __maybe_unsed. Dropping these functions also makes several members in the driver data unused that are also dropped. Signed-off-by: Uwe Kleine-K=C3=B6nig (The Capable Hub) --- drivers/misc/pch_phub.c | 151 ---------------------------------------- 1 file changed, 151 deletions(-) diff --git a/drivers/misc/pch_phub.c b/drivers/misc/pch_phub.c index fd147fd2800f..2f08957a0cd6 100644 --- a/drivers/misc/pch_phub.c +++ b/drivers/misc/pch_phub.c @@ -85,20 +85,6 @@ =20 /** * struct pch_phub_reg - PHUB register structure - * @phub_id_reg: PHUB_ID register val - * @q_pri_val_reg: QUEUE_PRI_VAL register val - * @rc_q_maxsize_reg: RC_QUEUE_MAXSIZE register val - * @bri_q_maxsize_reg: BRI_QUEUE_MAXSIZE register val - * @comp_resp_timeout_reg: COMP_RESP_TIMEOUT register val - * @bus_slave_control_reg: BUS_SLAVE_CONTROL_REG register val - * @deadlock_avoid_type_reg: DEADLOCK_AVOID_TYPE register val - * @intpin_reg_wpermit_reg0: INTPIN_REG_WPERMIT register 0 val - * @intpin_reg_wpermit_reg1: INTPIN_REG_WPERMIT register 1 val - * @intpin_reg_wpermit_reg2: INTPIN_REG_WPERMIT register 2 val - * @intpin_reg_wpermit_reg3: INTPIN_REG_WPERMIT register 3 val - * @int_reduce_control_reg: INT_REDUCE_CONTROL registers val - * @clkcfg_reg: CLK CFG register val - * @funcsel_reg: Function select register value * @pch_phub_base_address: Register base address * @pch_phub_extrom_base_address: external rom base address * @pch_mac_start_address: MAC address area start address @@ -107,20 +93,6 @@ * @pdev: pointer to pci device struct */ struct pch_phub_reg { - u32 phub_id_reg; - u32 q_pri_val_reg; - u32 rc_q_maxsize_reg; - u32 bri_q_maxsize_reg; - u32 comp_resp_timeout_reg; - u32 bus_slave_control_reg; - u32 deadlock_avoid_type_reg; - u32 intpin_reg_wpermit_reg0; - u32 intpin_reg_wpermit_reg1; - u32 intpin_reg_wpermit_reg2; - u32 intpin_reg_wpermit_reg3; - u32 int_reduce_control_reg[MAX_NUM_INT_REDUCE_CONTROL_REG]; - u32 clkcfg_reg; - u32 funcsel_reg; void __iomem *pch_phub_base_address; void __iomem *pch_phub_extrom_base_address; u32 pch_mac_start_address; @@ -149,129 +121,6 @@ static void pch_phub_read_modify_write_reg(struct pch= _phub_reg *chip, iowrite32(((ioread32(reg_addr) & ~mask)) | data, reg_addr); } =20 -/* pch_phub_save_reg_conf - saves register configuration */ -static void __maybe_unused pch_phub_save_reg_conf(struct pci_dev *pdev) -{ - unsigned int i; - struct pch_phub_reg *chip =3D pci_get_drvdata(pdev); - - void __iomem *p =3D chip->pch_phub_base_address; - - chip->phub_id_reg =3D ioread32(p + PCH_PHUB_ID_REG); - chip->q_pri_val_reg =3D ioread32(p + PCH_PHUB_QUEUE_PRI_VAL_REG); - chip->rc_q_maxsize_reg =3D ioread32(p + PCH_PHUB_RC_QUEUE_MAXSIZE_REG); - chip->bri_q_maxsize_reg =3D ioread32(p + PCH_PHUB_BRI_QUEUE_MAXSIZE_REG); - chip->comp_resp_timeout_reg =3D - ioread32(p + PCH_PHUB_COMP_RESP_TIMEOUT_REG); - chip->bus_slave_control_reg =3D - ioread32(p + PCH_PHUB_BUS_SLAVE_CONTROL_REG); - chip->deadlock_avoid_type_reg =3D - ioread32(p + PCH_PHUB_DEADLOCK_AVOID_TYPE_REG); - chip->intpin_reg_wpermit_reg0 =3D - ioread32(p + PCH_PHUB_INTPIN_REG_WPERMIT_REG0); - chip->intpin_reg_wpermit_reg1 =3D - ioread32(p + PCH_PHUB_INTPIN_REG_WPERMIT_REG1); - chip->intpin_reg_wpermit_reg2 =3D - ioread32(p + PCH_PHUB_INTPIN_REG_WPERMIT_REG2); - chip->intpin_reg_wpermit_reg3 =3D - ioread32(p + PCH_PHUB_INTPIN_REG_WPERMIT_REG3); - dev_dbg(&pdev->dev, "%s : " - "chip->phub_id_reg=3D%x, " - "chip->q_pri_val_reg=3D%x, " - "chip->rc_q_maxsize_reg=3D%x, " - "chip->bri_q_maxsize_reg=3D%x, " - "chip->comp_resp_timeout_reg=3D%x, " - "chip->bus_slave_control_reg=3D%x, " - "chip->deadlock_avoid_type_reg=3D%x, " - "chip->intpin_reg_wpermit_reg0=3D%x, " - "chip->intpin_reg_wpermit_reg1=3D%x, " - "chip->intpin_reg_wpermit_reg2=3D%x, " - "chip->intpin_reg_wpermit_reg3=3D%x\n", __func__, - chip->phub_id_reg, - chip->q_pri_val_reg, - chip->rc_q_maxsize_reg, - chip->bri_q_maxsize_reg, - chip->comp_resp_timeout_reg, - chip->bus_slave_control_reg, - chip->deadlock_avoid_type_reg, - chip->intpin_reg_wpermit_reg0, - chip->intpin_reg_wpermit_reg1, - chip->intpin_reg_wpermit_reg2, - chip->intpin_reg_wpermit_reg3); - for (i =3D 0; i < MAX_NUM_INT_REDUCE_CONTROL_REG; i++) { - chip->int_reduce_control_reg[i] =3D - ioread32(p + PCH_PHUB_INT_REDUCE_CONTROL_REG_BASE + 4 * i); - dev_dbg(&pdev->dev, "%s : " - "chip->int_reduce_control_reg[%d]=3D%x\n", - __func__, i, chip->int_reduce_control_reg[i]); - } - chip->clkcfg_reg =3D ioread32(p + CLKCFG_REG_OFFSET); - if ((chip->ioh_type =3D=3D 2) || (chip->ioh_type =3D=3D 4)) - chip->funcsel_reg =3D ioread32(p + FUNCSEL_REG_OFFSET); -} - -/* pch_phub_restore_reg_conf - restore register configuration */ -static void __maybe_unused pch_phub_restore_reg_conf(struct pci_dev *pdev) -{ - unsigned int i; - struct pch_phub_reg *chip =3D pci_get_drvdata(pdev); - void __iomem *p; - p =3D chip->pch_phub_base_address; - - iowrite32(chip->phub_id_reg, p + PCH_PHUB_ID_REG); - iowrite32(chip->q_pri_val_reg, p + PCH_PHUB_QUEUE_PRI_VAL_REG); - iowrite32(chip->rc_q_maxsize_reg, p + PCH_PHUB_RC_QUEUE_MAXSIZE_REG); - iowrite32(chip->bri_q_maxsize_reg, p + PCH_PHUB_BRI_QUEUE_MAXSIZE_REG); - iowrite32(chip->comp_resp_timeout_reg, - p + PCH_PHUB_COMP_RESP_TIMEOUT_REG); - iowrite32(chip->bus_slave_control_reg, - p + PCH_PHUB_BUS_SLAVE_CONTROL_REG); - iowrite32(chip->deadlock_avoid_type_reg, - p + PCH_PHUB_DEADLOCK_AVOID_TYPE_REG); - iowrite32(chip->intpin_reg_wpermit_reg0, - p + PCH_PHUB_INTPIN_REG_WPERMIT_REG0); - iowrite32(chip->intpin_reg_wpermit_reg1, - p + PCH_PHUB_INTPIN_REG_WPERMIT_REG1); - iowrite32(chip->intpin_reg_wpermit_reg2, - p + PCH_PHUB_INTPIN_REG_WPERMIT_REG2); - iowrite32(chip->intpin_reg_wpermit_reg3, - p + PCH_PHUB_INTPIN_REG_WPERMIT_REG3); - dev_dbg(&pdev->dev, "%s : " - "chip->phub_id_reg=3D%x, " - "chip->q_pri_val_reg=3D%x, " - "chip->rc_q_maxsize_reg=3D%x, " - "chip->bri_q_maxsize_reg=3D%x, " - "chip->comp_resp_timeout_reg=3D%x, " - "chip->bus_slave_control_reg=3D%x, " - "chip->deadlock_avoid_type_reg=3D%x, " - "chip->intpin_reg_wpermit_reg0=3D%x, " - "chip->intpin_reg_wpermit_reg1=3D%x, " - "chip->intpin_reg_wpermit_reg2=3D%x, " - "chip->intpin_reg_wpermit_reg3=3D%x\n", __func__, - chip->phub_id_reg, - chip->q_pri_val_reg, - chip->rc_q_maxsize_reg, - chip->bri_q_maxsize_reg, - chip->comp_resp_timeout_reg, - chip->bus_slave_control_reg, - chip->deadlock_avoid_type_reg, - chip->intpin_reg_wpermit_reg0, - chip->intpin_reg_wpermit_reg1, - chip->intpin_reg_wpermit_reg2, - chip->intpin_reg_wpermit_reg3); - for (i =3D 0; i < MAX_NUM_INT_REDUCE_CONTROL_REG; i++) { - iowrite32(chip->int_reduce_control_reg[i], - p + PCH_PHUB_INT_REDUCE_CONTROL_REG_BASE + 4 * i); - dev_dbg(&pdev->dev, "%s : " - "chip->int_reduce_control_reg[%d]=3D%x\n", - __func__, i, chip->int_reduce_control_reg[i]); - } - - iowrite32(chip->clkcfg_reg, p + CLKCFG_REG_OFFSET); - if ((chip->ioh_type =3D=3D 2) || (chip->ioh_type =3D=3D 4)) - iowrite32(chip->funcsel_reg, p + FUNCSEL_REG_OFFSET); -} - /** * pch_phub_read_serial_rom() - Reading Serial ROM * @chip: Pointer to the PHUB register structure --=20 2.47.3 From nobody Sun May 24 18:41:09 2026 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) (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 AA80230C606 for ; Sun, 24 May 2026 10:38:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779619122; cv=none; b=psjkrI7ygE5ylQh9IEQ92v6Jug84FwJVimVuoQUDtxqfptWoypmjJlIL+13GX8c8hVEJUnRJLnTqRwqyB/9hth8bhbJ6ICMQYei3tza5odhpJ8Owx7jD0ZrvugvNahbvsid6Gk3kfgf2Z0sZQWxArKDYQAfi2ecKt1fndQNmRlM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779619122; c=relaxed/simple; bh=L+0en0YJAZHL+7b/6hO+wv4DvNPe7vLIwbtt0BrzCzU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=IebJtCp8S/xlHmQsrqQ402COm7iP8IH+f2oZ9kp5Rv0o4JNa2WPvVYnEXGzv85r9nxTv35Sz/vcIlzgevtNBXIcil1SDWYrHiec+IS1/54LAo0wZyG5OPAXsp30wwhBYorNbloTaviYVlaDCpfzUpeFIch1Kq/z6IJNpn3xRYh8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre.com header.i=@baylibre.com header.b=BmAMxCk4; arc=none smtp.client-ip=209.85.221.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre.com header.i=@baylibre.com header.b="BmAMxCk4" Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-43d734223e4so5598491f8f.0 for ; Sun, 24 May 2026 03:38:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre.com; s=google; t=1779619119; x=1780223919; 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=wwj+tU++Af/2d2L5eO0CK31E8YtQwdtxgQxotgrsWI8=; b=BmAMxCk4jQP6z6zbmHKYjaGPTBRhxE2xu0uOX/Ikc+sYfGBDNVVk/SdNn+QBmPuEsm 7gb9cVNHH2cUhcfI3B5Uac0F4Vwcn1Fb2Qg5xvyi+lloHU2nXkL/OxXkmgB+78skyUPq TwnEO+7S1EjzxtoY4cz2IFP8QLEjolq0jsTPDjqLXtzDuYDxaepTB6iV6A8RmGn8fFMe ucn2PLe1ENMQQVi+RL/HNJHVDPCFeGqz3OfbA+X+tgZhu4Vbs/YaWnuCdkB2hSxX1oSq ubUQp/GrH+u/58pF2a7c1kn1JvFzGY72f9k2+ssxNN5BjCSUGe7wzKPsywJKaKE+0a/o aOXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779619119; x=1780223919; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=wwj+tU++Af/2d2L5eO0CK31E8YtQwdtxgQxotgrsWI8=; b=q9iUoB0mdXCetaPFN/9FXIm3fVdXAypIqzg497nnm1yvzDjb+t8NBoitkpOzi/PeQE H3gg7rorpBmnGgLWyMJGhFK9FaZuruOmW5arzLT+FjAs2Mhax3rVUm8XcKuGMY+fn1EU pIQxx+PUwViy2hhmIIfrpMis9TsUG+7xiVNx48qnNAf5ivtrczdJ4o0VU6gyNmtqo2Ch roFXaItVtwyJsnlGisZKHfph3gT2RCBIxWo4MWTdkq5jAvxjUlM/GacxZHxNRBFry7WN 2wGmQOGgm2IfBu9Od0QI6gKz8nKdhleEEZ338FGmPjrmok4UnvvA6a9RgTinGqkcNbBr 3dBg== X-Gm-Message-State: AOJu0YyA4rS0LgkY70TxgbWgPPnfm2ecPqAdI8Pi6qJUCczeZa7eK1UE VMfuQp/9nvf8VSxMDi4bRQdGxdnCDxKQOX6RXjEt/ZKoE54TChsKAxt1MBeblQRpVMs= X-Gm-Gg: Acq92OG2VUFtG/fUxuuJoGhBd0EYMDZJud3GLBfFwvLuG9tScRXXvA0YJEq8q14lYUh xlTNyeWC+IytsrtMqrj3vLIgRQ1tOGcLuGbvlRmp0xERzCnZ7sLnR2rhJKBb6wivs0cY98Shrq0 1BDTfRJ/ZcTK3yUFMEqd2BLxvvyLUnXlaNQtU7bzt/FkKZliS1PrlGE3LjiOKM1WX/TbXmp2BsA EOCoYhZsNaqXBDKiw01L0gc3jiHeslmFuDzvkLSAwiGMUz3ShuNnxL50LbRNEXq/wWZFdqfHbTp uVvSrm5k4L+kA/prTsb4uwCfFVKmxaQxOZor9EnsvdjXplf885uEOhZnFwFoz9duLdJ0pK0yw4G SU8TcbcKgS1DrIoGCEI31xjwraiYHROvuumcEQdsl35/jl2k5Dy9uleH7Zf0J9IhGj2IIhSNNj0 rmJ2FzRStbrkk3m/pwy7j6LgtPnCu1 X-Received: by 2002:a5d:64e7:0:b0:453:dc4d:9265 with SMTP id ffacd0b85a97d-45ea3153d19mr21413337f8f.10.1779619119115; Sun, 24 May 2026 03:38:39 -0700 (PDT) Received: from localhost ([2a02:8071:56d1:2de0:1d24:d58d:2b65:c291]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-45eb6d4903bsm17208180f8f.21.2026.05.24.03.38.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 May 2026 03:38:38 -0700 (PDT) From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig=20=28The=20Capable=20Hub=29?= To: Arnd Bergmann , Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org Subject: [PATCH v2 2/2] misc: pch_phub: Introduce an enum for device indentification Date: Sun, 24 May 2026 12:38:26 +0200 Message-ID: <82ee8f7be7ca11acefd6427335e68906226d2c36.1779618644.git.u.kleine-koenig@baylibre.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Developer-Signature: v=1; a=openpgp-sha256; l=4469; i=u.kleine-koenig@baylibre.com; h=from:subject:message-id; bh=L+0en0YJAZHL+7b/6hO+wv4DvNPe7vLIwbtt0BrzCzU=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBqEtUlDGlwSlXBaqtXaUYWlsvQO1/w14E6CUOY2 vHAij1o04uJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCahLVJQAKCRCPgPtYfRL+ Tqn5CACBf6CQBETwZ5tLxUOXSfpI+h85BFKrUyWw+Tfzt4H+VPT7BQY19ZzhvAELiM1eOOKPpLf LVFk8EKeSeK5YJTgKi6AMgV1jOapfid4R5D/Lg5dt4jBd4+wGMoZ6B0Nsy6xI6YCuuNqUO/mVwe Fme16keOsmwtasmaLC3dYrZsuQ6T8gaIxKow9lKT8amR5uhNMg3RZv7O5vlyhgu+8ngSbQFzZa6 OsVW3WStVxHI5Fdd/jWEtHZgwedCOG2zr86H2fUe+OJ8tvQHcjafzn2Niv13F/GPRcnL8Rn6grR IM3xm5yZ6rbzVYyiFCIP0YOwaFRBdLKkpfmuJv1kIjQjnB6Q X-Developer-Key: i=u.kleine-koenig@baylibre.com; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: quoted-printable Instead of using magic constants give them names that make the code more idiomatic. While touching the pci_device_id array, use named initializers to assign .driver_data. One side effect of this change is that the device identifying constants now start at zero instead of one before. This is only relevant when a PCI ID is added dynamically to the driver. Such a device is now handled as EG20T while it resulted in a probe error before. To restore the old behaviour the enum values can be shifted by just assigning PCH_EG20T =3D 1. Signed-off-by: Uwe Kleine-K=C3=B6nig (The Capable Hub) --- drivers/misc/pch_phub.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/drivers/misc/pch_phub.c b/drivers/misc/pch_phub.c index 2f08957a0cd6..4d3bb411927e 100644 --- a/drivers/misc/pch_phub.c +++ b/drivers/misc/pch_phub.c @@ -316,7 +316,7 @@ static int pch_phub_write_gbe_mac_addr(struct pch_phub_= reg *chip, u8 *data) int retval; int i; =20 - if ((chip->ioh_type =3D=3D 1) || (chip->ioh_type =3D=3D 5)) /* EG20T or M= L7831*/ + if ((chip->ioh_type =3D=3D PCH_EG20T) || (chip->ioh_type =3D=3D PCH_ML783= 1)) retval =3D pch_phub_gbe_serial_rom_conf(chip); else /* ML7223 */ retval =3D pch_phub_gbe_serial_rom_conf_mp(chip); @@ -509,6 +509,14 @@ static const struct bin_attribute pch_bin_attr =3D { .write =3D pch_phub_bin_write, }; =20 +enum { + PCH_EG20T, + PCH_ML7213, + PCH_ML7223M, + PCH_ML7223N, + PCH_ML7831, +}; + static int pch_phub_probe(struct pci_dev *pdev, const struct pci_device_id *id) { @@ -551,7 +559,7 @@ static int pch_phub_probe(struct pci_dev *pdev, =20 chip->pdev =3D pdev; /* Save pci device struct */ =20 - if (id->driver_data =3D=3D 1) { /* EG20T PCH */ + if (id->driver_data =3D=3D PCH_EG20T) { /* EG20T PCH */ const char *board_name; unsigned int prefetch =3D 0x000affaa; =20 @@ -599,7 +607,7 @@ static int pch_phub_probe(struct pci_dev *pdev, CLKCFG_UART_MASK); } } - } else if (id->driver_data =3D=3D 2) { /* ML7213 IOH */ + } else if (id->driver_data =3D=3D PCH_ML7213) { /* ML7213 IOH */ ret =3D sysfs_create_bin_file(&pdev->dev.kobj, &pch_bin_attr); if (ret) goto err_sysfs_create; @@ -612,7 +620,7 @@ static int pch_phub_probe(struct pci_dev *pdev, iowrite32(0x000affa0, chip->pch_phub_base_address + 0x14); chip->pch_opt_rom_start_address =3D\ PCH_PHUB_ROM_START_ADDR_ML7213; - } else if (id->driver_data =3D=3D 3) { /* ML7223 IOH Bus-m*/ + } else if (id->driver_data =3D=3D PCH_ML7223M) { /* ML7223 IOH Bus-m*/ /* set the prefech value * Device8(GbE) */ @@ -622,7 +630,7 @@ static int pch_phub_probe(struct pci_dev *pdev, chip->pch_opt_rom_start_address =3D\ PCH_PHUB_ROM_START_ADDR_ML7223; chip->pch_mac_start_address =3D PCH_PHUB_MAC_START_ADDR_ML7223; - } else if (id->driver_data =3D=3D 4) { /* ML7223 IOH Bus-n*/ + } else if (id->driver_data =3D=3D PCH_ML7223N) { /* ML7223 IOH Bus-n*/ ret =3D sysfs_create_file(&pdev->dev.kobj, &dev_attr_pch_mac.attr); if (ret) @@ -639,7 +647,7 @@ static int pch_phub_probe(struct pci_dev *pdev, chip->pch_opt_rom_start_address =3D\ PCH_PHUB_ROM_START_ADDR_ML7223; chip->pch_mac_start_address =3D PCH_PHUB_MAC_START_ADDR_ML7223; - } else if (id->driver_data =3D=3D 5) { /* ML7831 */ + } else if (id->driver_data =3D=3D PCH_ML7831) { /* ML7831 */ ret =3D sysfs_create_file(&pdev->dev.kobj, &dev_attr_pch_mac.attr); if (ret) @@ -703,11 +711,11 @@ static int __maybe_unused pch_phub_resume(struct devi= ce *dev_d) } =20 static const struct pci_device_id pch_phub_pcidev_id[] =3D { - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_PCH1_PHUB), 1, }, - { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ROHM_ML7213_PHUB), 2, }, - { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ROHM_ML7223_mPHUB), 3, }, - { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ROHM_ML7223_nPHUB), 4, }, - { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ROHM_ML7831_PHUB), 5, }, + { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_PCH1_PHUB), .driver_data =3D PC= H_EG20T }, + { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ROHM_ML7213_PHUB), .driver_data =3D PC= H_ML7213 }, + { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ROHM_ML7223_mPHUB), .driver_data =3D PC= H_ML7223M }, + { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ROHM_ML7223_nPHUB), .driver_data =3D PC= H_ML7223N }, + { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ROHM_ML7831_PHUB), .driver_data =3D PC= H_ML7831 }, { } }; MODULE_DEVICE_TABLE(pci, pch_phub_pcidev_id); --=20 2.47.3