From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 84912272E56; Wed, 20 May 2026 18:33:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779301994; cv=none; b=K4fNgqXaSyhTVbeIzwZY5tyh30QXV4D42xwQ5rwnJyhB7sEiWjTlaBXFFdvB415r8vJqxEiyovKrQ/bbPvboAdDfZ24+MLcE985D3IDDx+w2xPUk51cV+xIfUC9Jtscqfknh48WEXXmKfV9GBrZNLojawCZLUMql64UJ3WcPdaw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779301994; c=relaxed/simple; bh=AXMv0Ga7JblV/VX2/2qhjxQFnCVs2BJT9/GDyY0UgRE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=s3hmW6efxZdjR9Ye411Nz/6TAQ3cS5obiyPnjXLJpRT/NsPzfrdg/us1MTPvfrjXmjDqo/H3uKzYvTlGWwt4LwrP75R9T7O1WvX8GaPYcnFULcZXyL+bn2Wc38DpxrdLSRINDRrHqasg/dyDpMgT4gjBHoxpATq3WIuCT+ourE4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=mooOdtt4; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="mooOdtt4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AE68A1F000E9; Wed, 20 May 2026 18:33:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779301993; bh=vlIq1GQKY/bmS5dktZv6h4UDDDbO2+1kDmxggduW9fA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=mooOdtt4U+wWd+iDS77B3d6SFKNVBaroovN/8al9Z4T32auwuGKeeKMkqbPoNcMmg OaZjAICyu8ZbfliOHV31QPoD/zp6QAiONqICUvc2A8pMQX1OzD9RPqB4Y/u7kCj0vV teaKHL49I2C2BEvg9QiOn0b+aBTxaDVyyFAE5T5w= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Rafael J. Wysocki" , Tzung-Bi Shih , Sasha Levin Subject: [PATCH 6.6 098/508] platform/chrome: chromeos_tbmc: Drop wakeup source on remove Date: Wed, 20 May 2026 18:18:41 +0200 Message-ID: <20260520162100.738374665@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260520162058.573354582@linuxfoundation.org> References: <20260520162058.573354582@linuxfoundation.org> User-Agent: quilt/0.69 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 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Rafael J. Wysocki [ Upstream commit 5d441a4bc93642ed6f41da87327a39946b4e1455 ] The wakeup source added by device_init_wakeup() in chromeos_tbmc_add() needs to be dropped during driver removal, so add a .remove() callback to the driver for this purpose. Fixes: 0144c00ed86b ("platform/chrome: chromeos_tbmc: Report wake events") Signed-off-by: Rafael J. Wysocki Link: https://lore.kernel.org/r/6151957.MhkbZ0Pkbq@rafael.j.wysocki Signed-off-by: Tzung-Bi Shih Signed-off-by: Sasha Levin --- drivers/platform/chrome/chromeos_tbmc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/platform/chrome/chromeos_tbmc.c b/drivers/platform/chrome/chromeos_tbmc.c index d1cf8f3463ce3..e248567c0a182 100644 --- a/drivers/platform/chrome/chromeos_tbmc.c +++ b/drivers/platform/chrome/chromeos_tbmc.c @@ -95,6 +95,11 @@ static int chromeos_tbmc_add(struct acpi_device *adev) return 0; } +static void chromeos_tbmc_remove(struct acpi_device *adev) +{ + device_init_wakeup(&adev->dev, false); +} + static const struct acpi_device_id chromeos_tbmc_acpi_device_ids[] = { { ACPI_DRV_NAME, 0 }, { } @@ -110,6 +115,7 @@ static struct acpi_driver chromeos_tbmc_driver = { .ids = chromeos_tbmc_acpi_device_ids, .ops = { .add = chromeos_tbmc_add, + .remove = chromeos_tbmc_remove, .notify = chromeos_tbmc_notify, }, .drv.pm = &chromeos_tbmc_pm_ops, -- 2.53.0