cachy-t2: Define t2_mac_tbl in header instead

Using an exported symbol from applesmc-t2 won't work because it'll
create a dependency on that module for both applesmc (impossible since
both modules can't be loaded at the same time) and vga_switcheroo. It's
possible to create a helper file, either as a module or built-in, but I
concluded that it would be too much work at opted for this instead.

Signed-off-by: Eric Naim <dnaim@cachyos.org>

Author: 1Naim

drivers/gpu/vga/vga_switcheroo.c

@@ -440,7 +440,7 @@ bool vga_switcheroo_client_probe_defer(struct pci_dev *pdev)
 {
 	if (pci_is_display(pdev)) {
 		if (apple_gmux_present() && !vgasr_priv.handler_flags &&
-		    (pdev != vga_default_device() || apple_is_t2_mac()))
+		    (pdev != vga_default_device() || dmi_check_system(t2_mac_tbl)))
 			return true;
 	}
 

drivers/hwmon/applesmc-t2.c

@@ -18,6 +18,7 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
+#include <linux/cachy-t2.h>
 #include <linux/delay.h>
 #include <linux/acpi.h>
 #include <linux/input.h>
@@ -1811,40 +1812,6 @@ static void applesmc_release_key_backlight(struct applesmc_device *smc)
 	destroy_workqueue(smc->backlight_wq);
 }
 
-#ifndef T2_MAC
-#define T2_MAC(vendor, product) \
-		 .matches = { \
-			DMI_MATCH(DMI_BOARD_VENDOR, vendor), \
-			DMI_MATCH(DMI_PRODUCT_NAME, product), \
-		},
-#endif
-
-static const struct dmi_system_id t2_mac_tbl[] = {
-	{ T2_MAC("Apple Inc.", "MacBookPro15,1") },
-	{ T2_MAC("Apple Inc.", "MacBookPro15,2") },
-	{ T2_MAC("Apple Inc.", "MacBookPro15,3") },
-	{ T2_MAC("Apple Inc.", "MacBookPro15,4") },
-	{ T2_MAC("Apple Inc.", "MacBookPro16,1") },
-	{ T2_MAC("Apple Inc.", "MacBookPro16,2") },
-	{ T2_MAC("Apple Inc.", "MacBookPro16,3") },
-	{ T2_MAC("Apple Inc.", "MacBookPro16,4") },
-	{ T2_MAC("Apple Inc.", "MacBookAir8,1") },
-	{ T2_MAC("Apple Inc.", "MacBookAir8,2") },
-	{ T2_MAC("Apple Inc.", "MacBookAir9,1") },
-	{ T2_MAC("Apple Inc.", "Macmini8,1") },
-	{ T2_MAC("Apple Inc.", "MacPro7,1") },
-	{ T2_MAC("Apple Inc.", "iMac20,1") },
-	{ T2_MAC("Apple Inc.", "iMac20,2") },
-	{ T2_MAC("Apple Inc.", "iMacPro1,1") },
-	{ }
-};
-
-bool apple_is_t2_mac(void)
-{
-	return dmi_check_system(t2_mac_tbl);
-}
-EXPORT_SYMBOL_GPL(apple_is_t2_mac)
-
 static int applesmc_create_modules(struct applesmc_device *smc)
 {
 	int ret;
@@ -1918,7 +1885,7 @@ static int __init applesmc_init(void)
 {
 	int ret;
 
-	if (!apple_is_t2_mac()) {
+	if (!dmi_check_system(t2_mac_tbl)) {
 		pr_warn("supported laptop not found!\n");
 		ret = -ENODEV;
 		goto out;

drivers/hwmon/applesmc.c

@@ -1311,7 +1311,7 @@ static int __init applesmc_init(void)
 {
 	int ret;
 
-	if (!dmi_check_system(applesmc_whitelist) || apple_is_t2_mac()) {
+	if (!dmi_check_system(applesmc_whitelist) || dmi_check_system(t2_mac_tbl)) {
 		pr_warn("supported laptop not found!\n");
 		ret = -ENODEV;
 		goto out;

include/linux/cachy-t2.h

@@ -1,8 +1,35 @@
 #ifndef CACHYOS_T2_H
 #define CACHYOS_T2_H
 
-#include <linux/types.h>
+#include <linux/dmi.h>
 
-bool apple_is_t2_mac(void);
+
+#ifndef T2_MAC
+#define T2_MAC(vendor, product) \
+	 .matches = { \
+		DMI_MATCH(DMI_BOARD_VENDOR, vendor), \
+		DMI_MATCH(DMI_PRODUCT_NAME, product), \
+	},
+#endif
+
+static const struct dmi_system_id t2_mac_tbl[] = {
+	{ T2_MAC("Apple Inc.", "MacBookPro15,1") },
+	{ T2_MAC("Apple Inc.", "MacBookPro15,2") },
+	{ T2_MAC("Apple Inc.", "MacBookPro15,3") },
+	{ T2_MAC("Apple Inc.", "MacBookPro15,4") },
+	{ T2_MAC("Apple Inc.", "MacBookPro16,1") },
+	{ T2_MAC("Apple Inc.", "MacBookPro16,2") },
+	{ T2_MAC("Apple Inc.", "MacBookPro16,3") },
+	{ T2_MAC("Apple Inc.", "MacBookPro16,4") },
+	{ T2_MAC("Apple Inc.", "MacBookAir8,1") },
+	{ T2_MAC("Apple Inc.", "MacBookAir8,2") },
+	{ T2_MAC("Apple Inc.", "MacBookAir9,1") },
+	{ T2_MAC("Apple Inc.", "Macmini8,1") },
+	{ T2_MAC("Apple Inc.", "MacPro7,1") },
+	{ T2_MAC("Apple Inc.", "iMac20,1") },
+	{ T2_MAC("Apple Inc.", "iMac20,2") },
+	{ T2_MAC("Apple Inc.", "iMacPro1,1") },
+	{ }
+};
 
 #endif