nybble
/
system76-acpi-dkms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #20 from pop-os/linux-6.2_jammy 

Update from upstream, fix build on Linux 6.2
This commit is contained in:
leviport 2023-03-06 11:59:53 -07:00 committed by GitHub
parent a88dcce08b 0e535fbeb9
commit 7635129f22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
system76_acpi.c
View File

@ -149,8 +149,6 @@ static int system76_set(struct system76_data *data, char *method, int value)
return -1; return -1;
} }
/* Battery */
#define BATTERY_THRESHOLD_INVALID 0xFF #define BATTERY_THRESHOLD_INVALID 0xFF
enum { enum {
@ -261,7 +259,11 @@ static struct attribute *system76_battery_attrs[] = {
ATTRIBUTE_GROUPS(system76_battery); ATTRIBUTE_GROUPS(system76_battery);
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,2,0)
static int system76_battery_add(struct power_supply *battery, struct acpi_battery_hook *hook)
#else
static int system76_battery_add(struct power_supply *battery) static int system76_battery_add(struct power_supply *battery)
#endif
{ {
// System76 EC only supports 1 battery // System76 EC only supports 1 battery
if (strcmp(battery->desc->name, "BAT0") != 0) if (strcmp(battery->desc->name, "BAT0") != 0)
@ -273,7 +275,11 @@ static int system76_battery_add(struct power_supply *battery)
return 0; return 0;
} }
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,2,0)
static int system76_battery_remove(struct power_supply *battery, struct acpi_battery_hook *hook)
#else
static int system76_battery_remove(struct power_supply *battery) static int system76_battery_remove(struct power_supply *battery)
#endif
{ {
device_remove_groups(&battery->dev, system76_battery_groups); device_remove_groups(&battery->dev, system76_battery_groups);
return 0; return 0;
@ -295,8 +301,6 @@ static void system76_battery_exit(void)
battery_hook_unregister(&system76_battery_hook); battery_hook_unregister(&system76_battery_hook);
} }
/* Keyboard */
// Get the airplane mode LED brightness // Get the airplane mode LED brightness
static enum led_brightness ap_led_get(struct led_classdev *led) static enum led_brightness ap_led_get(struct led_classdev *led)
{ {
@ -490,8 +494,6 @@ static void kb_led_hotkey_color(struct system76_data *data)
kb_led_notify(data); kb_led_notify(data);
} }
/* hwmon */
static umode_t thermal_is_visible(const void *drvdata, enum hwmon_sensor_types type, static umode_t thermal_is_visible(const void *drvdata, enum hwmon_sensor_types type,
u32 attr, int channel) u32 attr, int channel)
{ {
@ -632,8 +634,6 @@ static const struct hwmon_chip_info thermal_chip_info = {
.info = thermal_channel_info, .info = thermal_channel_info,
}; };
/* ACPI driver */
static void input_key(struct system76_data *data, unsigned int code) static void input_key(struct system76_data *data, unsigned int code)
{ {
input_report_key(data->input, code, 1); input_report_key(data->input, code, 1);
@ -683,8 +683,8 @@ static int system76_add(struct acpi_device *acpi_dev)
acpi_dev->driver_data = data; acpi_dev->driver_data = data;
data->acpi_dev = acpi_dev; data->acpi_dev = acpi_dev;
// Some models do not run Open EC firmware. Check for an ACPI method that // Some models do not run open EC firmware. Check for an ACPI method
// only exists on Open EC to guard functionality specific to it. // that only exists on open EC to guard functionality specific to it.
data->has_open_ec = acpi_has_method(acpi_device_handle(data->acpi_dev), "NFAN"); data->has_open_ec = acpi_has_method(acpi_device_handle(data->acpi_dev), "NFAN");
err = system76_get(data, "INIT"); err = system76_get(data, "INIT");
@ -714,7 +714,6 @@ static int system76_add(struct acpi_device *acpi_dev)
data->kb_led.max_brightness = 5; data->kb_led.max_brightness = 5;
data->kb_color = -1; data->kb_color = -1;
} }
err = devm_led_classdev_register(&acpi_dev->dev, &data->kb_led); err = devm_led_classdev_register(&acpi_dev->dev, &data->kb_led);
if (err) if (err)
return err; return err;
@ -741,7 +740,6 @@ static int system76_add(struct acpi_device *acpi_dev)
err = system76_get_object(data, "NTMP", &data->ntmp); err = system76_get_object(data, "NTMP", &data->ntmp);
if (err) if (err)
goto error; goto error;
}
data->therm = devm_hwmon_device_register_with_info(&acpi_dev->dev, data->therm = devm_hwmon_device_register_with_info(&acpi_dev->dev,
"system76_acpi", data, &thermal_chip_info, NULL); "system76_acpi", data, &thermal_chip_info, NULL);
@ -749,8 +747,8 @@ static int system76_add(struct acpi_device *acpi_dev)
if (err) if (err)
goto error; goto error;
if (data->has_open_ec)
system76_battery_init(); system76_battery_init();
}
return 0; return 0;
@ -763,7 +761,7 @@ error:
} }
// Remove a System76 ACPI device // Remove a System76 ACPI device
static int system76_remove(struct acpi_device *acpi_dev) static void system76_remove(struct acpi_device *acpi_dev)
{ {
struct system76_data *data; struct system76_data *data;
@ -779,8 +777,6 @@ static int system76_remove(struct acpi_device *acpi_dev)
devm_led_classdev_unregister(&acpi_dev->dev, &data->kb_led); devm_led_classdev_unregister(&acpi_dev->dev, &data->kb_led);
system76_get(data, "FINI"); system76_get(data, "FINI");
return 0;
} }
static struct acpi_driver system76_driver = { static struct acpi_driver system76_driver = {