From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A52042EB02; Wed, 3 Jul 2024 11:22:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720005721; cv=none; b=ZWDsOEhQdtDO1wwP2bhjhMeUkr/4Ul6qjVyQ7stJa2Izwn367RYq8OmXwQ+2JgTlaBPghLCu97SFIiRp2r0KfxC/0txx4KI+iVzLjTHJPkIIJ1/NeQG33WCVcMF4FLpC/nFPUrz+9aWyE6vhsz6HoLk63Jo3mDu/gRxnKjmUyhI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720005721; c=relaxed/simple; bh=xiP2MhZsPKcmYfAggfqu5sQPzApPZax6f64+RT2hr1s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Cc5Z2u3BnvB7RRD+5LFriiKGofXuWc2SIy14nVRcfOPTzt+NcZ0oPYMQpzU4R6ENyWug6emlfM2r3hMbffZJyR1ZQy21RlDr5a1VSuYoLw9aIJSFgZ3EzwzYeGlHCF2rO7a4qyyFLmVEUZEwYsm8OT1gxyoLBbJ8Vs8rPxjgCiI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Ak9an7r/; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Ak9an7r/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0247AC2BD10; Wed, 3 Jul 2024 11:22:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1720005721; bh=xiP2MhZsPKcmYfAggfqu5sQPzApPZax6f64+RT2hr1s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ak9an7r/EOSS4BwZd7HUSnP08kIhrFFo1Kypvl5UNQLa5PmrrtagOjXTrf9r2MlKX PlysrPOC9+NBVvBWrhYiPgKxn8r9238U2uXpgOH/0382hMZob7rF0sf2YlJNVS43Ck lJar7+CrJH/LEHYMV2LUG5UmkLG0Hnejk83M+74E= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Benson Leung , Prashant Malani , Krzysztof Kozlowski , Tzung-Bi Shih , Sebastian Reichel , Sasha Levin Subject: [PATCH 5.15 173/356] power: supply: cros_usbpd: provide ID table for avoiding fallback match Date: Wed, 3 Jul 2024 12:38:29 +0200 Message-ID: <20240703102919.650631743@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240703102913.093882413@linuxfoundation.org> References: <20240703102913.093882413@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tzung-Bi Shih [ Upstream commit 0f8678c34cbfdc63569a9b0ede1fe235ec6ec693 ] Instead of using fallback driver name match, provide ID table[1] for the primary match. [1]: https://elixir.bootlin.com/linux/v6.8/source/drivers/base/platform.c#L1353 Reviewed-by: Benson Leung Reviewed-by: Prashant Malani Reviewed-by: Krzysztof Kozlowski Signed-off-by: Tzung-Bi Shih Link: https://lore.kernel.org/r/20240401030052.2887845-4-tzungbi@kernel.org Signed-off-by: Sebastian Reichel Signed-off-by: Sasha Levin --- drivers/power/supply/cros_usbpd-charger.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/power/supply/cros_usbpd-charger.c b/drivers/power/supply/cros_usbpd-charger.c index 0a4f02e4ae7ba..d7ee1eb9ca880 100644 --- a/drivers/power/supply/cros_usbpd-charger.c +++ b/drivers/power/supply/cros_usbpd-charger.c @@ -5,6 +5,7 @@ * Copyright (c) 2014 - 2018 Google, Inc */ +#include #include #include #include @@ -711,16 +712,22 @@ static int cros_usbpd_charger_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(cros_usbpd_charger_pm_ops, NULL, cros_usbpd_charger_resume); +static const struct platform_device_id cros_usbpd_charger_id[] = { + { DRV_NAME, 0 }, + {} +}; +MODULE_DEVICE_TABLE(platform, cros_usbpd_charger_id); + static struct platform_driver cros_usbpd_charger_driver = { .driver = { .name = DRV_NAME, .pm = &cros_usbpd_charger_pm_ops, }, - .probe = cros_usbpd_charger_probe + .probe = cros_usbpd_charger_probe, + .id_table = cros_usbpd_charger_id, }; module_platform_driver(cros_usbpd_charger_driver); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("ChromeOS EC USBPD charger"); -MODULE_ALIAS("platform:" DRV_NAME); -- 2.43.0