Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Revert "ACPI / SBS: Add 5 us delay to fix SBS hangs on MacBook"

Revert commit 3349fb64b292 (ACPI / SBS: Add 5 us delay to fix SBS
hangs on MacBook), since the delay introduced by it is not necessary
any more after commit add68d6aa9e2 (ACPI / SMBus: Fix boot stalls /
high CPU caused by reentrant code).

Signed-off-by: Chris Bainbridge <chris.bainbridge@gmail.com>
[ rjw: Changelog ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

authored by

Chris Bainbridge and committed by
Rafael J. Wysocki
a76032e0 add68d6a

-22
-22
drivers/acpi/sbshc.c
··· 14 14 #include <linux/delay.h> 15 15 #include <linux/module.h> 16 16 #include <linux/interrupt.h> 17 - #include <linux/dmi.h> 18 17 #include "sbshc.h" 19 18 20 19 #define PREFIX "ACPI: " ··· 88 89 ACPI_SMB_ALARM_DATA = 0x26, /* 2 bytes alarm data */ 89 90 }; 90 91 91 - static bool macbook; 92 - 93 92 static inline int smb_hc_read(struct acpi_smb_hc *hc, u8 address, u8 *data) 94 93 { 95 94 return ec_read(hc->offset + address, data); ··· 118 121 119 122 mutex_lock(&hc->lock); 120 123 hc->done = false; 121 - if (macbook) 122 - udelay(5); 123 124 if (smb_hc_read(hc, ACPI_SMB_PROTOCOL, &temp)) 124 125 goto end; 125 126 if (temp) { ··· 245 250 acpi_handle handle, acpi_ec_query_func func, 246 251 void *data); 247 252 248 - static int macbook_dmi_match(const struct dmi_system_id *d) 249 - { 250 - pr_debug("Detected MacBook, enabling workaround\n"); 251 - macbook = true; 252 - return 0; 253 - } 254 - 255 - static struct dmi_system_id acpi_smbus_dmi_table[] = { 256 - { macbook_dmi_match, "Apple MacBook", { 257 - DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), 258 - DMI_MATCH(DMI_PRODUCT_NAME, "MacBook") }, 259 - }, 260 - { }, 261 - }; 262 - 263 253 static int acpi_smbus_hc_add(struct acpi_device *device) 264 254 { 265 255 int status; 266 256 unsigned long long val; 267 257 struct acpi_smb_hc *hc; 268 - 269 - dmi_check_system(acpi_smbus_dmi_table); 270 258 271 259 if (!device) 272 260 return -EINVAL;