Fixed inconsistent indentation and removed unnecessary (acpi_size) and
(u32 *) casts.
Signed-off-by: Kurt Borja <kuurtb@gmail.com>
Reviewed-by: Armin Wolf <W_Armin@gmx.de>
---
v8:
- Unchanged
v7:
- Unchanged
v6:
- Unchanged
---
drivers/platform/x86/dell/alienware-wmi.c | 134 +++++++++++-----------
1 file changed, 67 insertions(+), 67 deletions(-)
diff --git a/drivers/platform/x86/dell/alienware-wmi.c b/drivers/platform/x86/dell/alienware-wmi.c
index f5ee62ce1..16a3fe9ac 100644
--- a/drivers/platform/x86/dell/alienware-wmi.c
+++ b/drivers/platform/x86/dell/alienware-wmi.c
@@ -116,68 +116,68 @@ static int __init dmi_matched(const struct dmi_system_id *dmi)
static const struct dmi_system_id alienware_quirks[] __initconst = {
{
- .callback = dmi_matched,
- .ident = "Alienware X51 R3",
- .matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Alienware"),
- DMI_MATCH(DMI_PRODUCT_NAME, "Alienware X51 R3"),
- },
- .driver_data = &quirk_x51_r3,
- },
+ .callback = dmi_matched,
+ .ident = "Alienware X51 R3",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Alienware"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "Alienware X51 R3"),
+ },
+ .driver_data = &quirk_x51_r3,
+ },
{
- .callback = dmi_matched,
- .ident = "Alienware X51 R2",
- .matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Alienware"),
- DMI_MATCH(DMI_PRODUCT_NAME, "Alienware X51 R2"),
- },
- .driver_data = &quirk_x51_r1_r2,
- },
+ .callback = dmi_matched,
+ .ident = "Alienware X51 R2",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Alienware"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "Alienware X51 R2"),
+ },
+ .driver_data = &quirk_x51_r1_r2,
+ },
{
- .callback = dmi_matched,
- .ident = "Alienware X51 R1",
- .matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Alienware"),
- DMI_MATCH(DMI_PRODUCT_NAME, "Alienware X51"),
- },
- .driver_data = &quirk_x51_r1_r2,
- },
+ .callback = dmi_matched,
+ .ident = "Alienware X51 R1",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Alienware"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "Alienware X51"),
+ },
+ .driver_data = &quirk_x51_r1_r2,
+ },
{
- .callback = dmi_matched,
- .ident = "Alienware ASM100",
- .matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Alienware"),
- DMI_MATCH(DMI_PRODUCT_NAME, "ASM100"),
- },
- .driver_data = &quirk_asm100,
- },
+ .callback = dmi_matched,
+ .ident = "Alienware ASM100",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Alienware"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "ASM100"),
+ },
+ .driver_data = &quirk_asm100,
+ },
{
- .callback = dmi_matched,
- .ident = "Alienware ASM200",
- .matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Alienware"),
- DMI_MATCH(DMI_PRODUCT_NAME, "ASM200"),
- },
- .driver_data = &quirk_asm200,
- },
+ .callback = dmi_matched,
+ .ident = "Alienware ASM200",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Alienware"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "ASM200"),
+ },
+ .driver_data = &quirk_asm200,
+ },
{
- .callback = dmi_matched,
- .ident = "Alienware ASM201",
- .matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Alienware"),
- DMI_MATCH(DMI_PRODUCT_NAME, "ASM201"),
- },
- .driver_data = &quirk_asm201,
- },
- {
- .callback = dmi_matched,
- .ident = "Dell Inc. Inspiron 5675",
- .matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
- DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 5675"),
- },
- .driver_data = &quirk_inspiron5675,
- },
+ .callback = dmi_matched,
+ .ident = "Alienware ASM201",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Alienware"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "ASM201"),
+ },
+ .driver_data = &quirk_asm201,
+ },
+ {
+ .callback = dmi_matched,
+ .ident = "Dell Inc. Inspiron 5675",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+ DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 5675"),
+ },
+ .driver_data = &quirk_inspiron5675,
+ },
{}
};
@@ -221,8 +221,8 @@ static struct platform_zone *zone_data;
static struct platform_driver platform_driver = {
.driver = {
- .name = "alienware-wmi",
- }
+ .name = "alienware-wmi",
+ }
};
static struct attribute_group zone_attribute_group = {
@@ -292,7 +292,7 @@ static int alienware_update_led(struct platform_zone *zone)
guid = WMAX_CONTROL_GUID;
method_id = WMAX_METHOD_ZONE_CONTROL;
- input.length = (acpi_size) sizeof(wmax_basic_args);
+ input.length = sizeof(wmax_basic_args);
input.pointer = &wmax_basic_args;
} else {
legacy_args.colors = zone->colors;
@@ -306,7 +306,7 @@ static int alienware_update_led(struct platform_zone *zone)
guid = LEGACY_CONTROL_GUID;
method_id = zone->location + 1;
- input.length = (acpi_size) sizeof(legacy_args);
+ input.length = sizeof(legacy_args);
input.pointer = &legacy_args;
}
pr_debug("alienware-wmi: guid %s method %d\n", guid, method_id);
@@ -358,7 +358,7 @@ static int wmax_brightness(int brightness)
.led_mask = 0xFF,
.percentage = brightness,
};
- input.length = (acpi_size) sizeof(args);
+ input.length = sizeof(args);
input.pointer = &args;
status = wmi_evaluate_method(WMAX_CONTROL_GUID, 0,
WMAX_METHOD_BRIGHTNESS, &input, NULL);
@@ -508,7 +508,7 @@ static acpi_status alienware_wmax_command(struct wmax_basic_args *in_args,
struct acpi_buffer input;
struct acpi_buffer output;
- input.length = (acpi_size) sizeof(*in_args);
+ input.length = sizeof(*in_args);
input.pointer = in_args;
if (out_data) {
output.length = ACPI_ALLOCATE_BUFFER;
@@ -542,7 +542,7 @@ static ssize_t show_hdmi_cable(struct device *dev,
};
status =
alienware_wmax_command(&in_args, WMAX_METHOD_HDMI_CABLE,
- (u32 *) &out_data);
+ &out_data);
if (ACPI_SUCCESS(status)) {
if (out_data == 0)
return sysfs_emit(buf, "[unconnected] connected unknown\n");
@@ -563,7 +563,7 @@ static ssize_t show_hdmi_source(struct device *dev,
};
status =
alienware_wmax_command(&in_args, WMAX_METHOD_HDMI_STATUS,
- (u32 *) &out_data);
+ &out_data);
if (ACPI_SUCCESS(status)) {
if (out_data == 1)
@@ -643,7 +643,7 @@ static ssize_t show_amplifier_status(struct device *dev,
};
status =
alienware_wmax_command(&in_args, WMAX_METHOD_AMPLIFIER_CABLE,
- (u32 *) &out_data);
+ &out_data);
if (ACPI_SUCCESS(status)) {
if (out_data == 0)
return sysfs_emit(buf, "[unconnected] connected unknown\n");
@@ -695,7 +695,7 @@ static ssize_t show_deepsleep_status(struct device *dev,
.arg = 0,
};
status = alienware_wmax_command(&in_args, WMAX_METHOD_DEEP_SLEEP_STATUS,
- (u32 *) &out_data);
+ &out_data);
if (ACPI_SUCCESS(status)) {
if (out_data == 0)
return sysfs_emit(buf, "[disabled] s5 s5_s4\n");
--
2.47.0
On Thu, 24 Oct 2024, Kurt Borja wrote: > Fixed inconsistent indentation and removed unnecessary (acpi_size) and > (u32 *) casts. > > Signed-off-by: Kurt Borja <kuurtb@gmail.com> > Reviewed-by: Armin Wolf <W_Armin@gmx.de> Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> -- i. > --- > v8: > - Unchanged > v7: > - Unchanged > v6: > - Unchanged > --- > drivers/platform/x86/dell/alienware-wmi.c | 134 +++++++++++----------- > 1 file changed, 67 insertions(+), 67 deletions(-) > > diff --git a/drivers/platform/x86/dell/alienware-wmi.c b/drivers/platform/x86/dell/alienware-wmi.c > index f5ee62ce1..16a3fe9ac 100644 > --- a/drivers/platform/x86/dell/alienware-wmi.c > +++ b/drivers/platform/x86/dell/alienware-wmi.c > @@ -116,68 +116,68 @@ static int __init dmi_matched(const struct dmi_system_id *dmi) > > static const struct dmi_system_id alienware_quirks[] __initconst = { > { > - .callback = dmi_matched, > - .ident = "Alienware X51 R3", > - .matches = { > - DMI_MATCH(DMI_SYS_VENDOR, "Alienware"), > - DMI_MATCH(DMI_PRODUCT_NAME, "Alienware X51 R3"), > - }, > - .driver_data = &quirk_x51_r3, > - }, > + .callback = dmi_matched, > + .ident = "Alienware X51 R3", > + .matches = { > + DMI_MATCH(DMI_SYS_VENDOR, "Alienware"), > + DMI_MATCH(DMI_PRODUCT_NAME, "Alienware X51 R3"), > + }, > + .driver_data = &quirk_x51_r3, > + }, > { > - .callback = dmi_matched, > - .ident = "Alienware X51 R2", > - .matches = { > - DMI_MATCH(DMI_SYS_VENDOR, "Alienware"), > - DMI_MATCH(DMI_PRODUCT_NAME, "Alienware X51 R2"), > - }, > - .driver_data = &quirk_x51_r1_r2, > - }, > + .callback = dmi_matched, > + .ident = "Alienware X51 R2", > + .matches = { > + DMI_MATCH(DMI_SYS_VENDOR, "Alienware"), > + DMI_MATCH(DMI_PRODUCT_NAME, "Alienware X51 R2"), > + }, > + .driver_data = &quirk_x51_r1_r2, > + }, > { > - .callback = dmi_matched, > - .ident = "Alienware X51 R1", > - .matches = { > - DMI_MATCH(DMI_SYS_VENDOR, "Alienware"), > - DMI_MATCH(DMI_PRODUCT_NAME, "Alienware X51"), > - }, > - .driver_data = &quirk_x51_r1_r2, > - }, > + .callback = dmi_matched, > + .ident = "Alienware X51 R1", > + .matches = { > + DMI_MATCH(DMI_SYS_VENDOR, "Alienware"), > + DMI_MATCH(DMI_PRODUCT_NAME, "Alienware X51"), > + }, > + .driver_data = &quirk_x51_r1_r2, > + }, > { > - .callback = dmi_matched, > - .ident = "Alienware ASM100", > - .matches = { > - DMI_MATCH(DMI_SYS_VENDOR, "Alienware"), > - DMI_MATCH(DMI_PRODUCT_NAME, "ASM100"), > - }, > - .driver_data = &quirk_asm100, > - }, > + .callback = dmi_matched, > + .ident = "Alienware ASM100", > + .matches = { > + DMI_MATCH(DMI_SYS_VENDOR, "Alienware"), > + DMI_MATCH(DMI_PRODUCT_NAME, "ASM100"), > + }, > + .driver_data = &quirk_asm100, > + }, > { > - .callback = dmi_matched, > - .ident = "Alienware ASM200", > - .matches = { > - DMI_MATCH(DMI_SYS_VENDOR, "Alienware"), > - DMI_MATCH(DMI_PRODUCT_NAME, "ASM200"), > - }, > - .driver_data = &quirk_asm200, > - }, > + .callback = dmi_matched, > + .ident = "Alienware ASM200", > + .matches = { > + DMI_MATCH(DMI_SYS_VENDOR, "Alienware"), > + DMI_MATCH(DMI_PRODUCT_NAME, "ASM200"), > + }, > + .driver_data = &quirk_asm200, > + }, > { > - .callback = dmi_matched, > - .ident = "Alienware ASM201", > - .matches = { > - DMI_MATCH(DMI_SYS_VENDOR, "Alienware"), > - DMI_MATCH(DMI_PRODUCT_NAME, "ASM201"), > - }, > - .driver_data = &quirk_asm201, > - }, > - { > - .callback = dmi_matched, > - .ident = "Dell Inc. Inspiron 5675", > - .matches = { > - DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), > - DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 5675"), > - }, > - .driver_data = &quirk_inspiron5675, > - }, > + .callback = dmi_matched, > + .ident = "Alienware ASM201", > + .matches = { > + DMI_MATCH(DMI_SYS_VENDOR, "Alienware"), > + DMI_MATCH(DMI_PRODUCT_NAME, "ASM201"), > + }, > + .driver_data = &quirk_asm201, > + }, > + { > + .callback = dmi_matched, > + .ident = "Dell Inc. Inspiron 5675", > + .matches = { > + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), > + DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 5675"), > + }, > + .driver_data = &quirk_inspiron5675, > + }, > {} > }; > > @@ -221,8 +221,8 @@ static struct platform_zone *zone_data; > > static struct platform_driver platform_driver = { > .driver = { > - .name = "alienware-wmi", > - } > + .name = "alienware-wmi", > + } > }; > > static struct attribute_group zone_attribute_group = { > @@ -292,7 +292,7 @@ static int alienware_update_led(struct platform_zone *zone) > guid = WMAX_CONTROL_GUID; > method_id = WMAX_METHOD_ZONE_CONTROL; > > - input.length = (acpi_size) sizeof(wmax_basic_args); > + input.length = sizeof(wmax_basic_args); > input.pointer = &wmax_basic_args; > } else { > legacy_args.colors = zone->colors; > @@ -306,7 +306,7 @@ static int alienware_update_led(struct platform_zone *zone) > guid = LEGACY_CONTROL_GUID; > method_id = zone->location + 1; > > - input.length = (acpi_size) sizeof(legacy_args); > + input.length = sizeof(legacy_args); > input.pointer = &legacy_args; > } > pr_debug("alienware-wmi: guid %s method %d\n", guid, method_id); > @@ -358,7 +358,7 @@ static int wmax_brightness(int brightness) > .led_mask = 0xFF, > .percentage = brightness, > }; > - input.length = (acpi_size) sizeof(args); > + input.length = sizeof(args); > input.pointer = &args; > status = wmi_evaluate_method(WMAX_CONTROL_GUID, 0, > WMAX_METHOD_BRIGHTNESS, &input, NULL); > @@ -508,7 +508,7 @@ static acpi_status alienware_wmax_command(struct wmax_basic_args *in_args, > struct acpi_buffer input; > struct acpi_buffer output; > > - input.length = (acpi_size) sizeof(*in_args); > + input.length = sizeof(*in_args); > input.pointer = in_args; > if (out_data) { > output.length = ACPI_ALLOCATE_BUFFER; > @@ -542,7 +542,7 @@ static ssize_t show_hdmi_cable(struct device *dev, > }; > status = > alienware_wmax_command(&in_args, WMAX_METHOD_HDMI_CABLE, > - (u32 *) &out_data); > + &out_data); > if (ACPI_SUCCESS(status)) { > if (out_data == 0) > return sysfs_emit(buf, "[unconnected] connected unknown\n"); > @@ -563,7 +563,7 @@ static ssize_t show_hdmi_source(struct device *dev, > }; > status = > alienware_wmax_command(&in_args, WMAX_METHOD_HDMI_STATUS, > - (u32 *) &out_data); > + &out_data); > > if (ACPI_SUCCESS(status)) { > if (out_data == 1) > @@ -643,7 +643,7 @@ static ssize_t show_amplifier_status(struct device *dev, > }; > status = > alienware_wmax_command(&in_args, WMAX_METHOD_AMPLIFIER_CABLE, > - (u32 *) &out_data); > + &out_data); > if (ACPI_SUCCESS(status)) { > if (out_data == 0) > return sysfs_emit(buf, "[unconnected] connected unknown\n"); > @@ -695,7 +695,7 @@ static ssize_t show_deepsleep_status(struct device *dev, > .arg = 0, > }; > status = alienware_wmax_command(&in_args, WMAX_METHOD_DEEP_SLEEP_STATUS, > - (u32 *) &out_data); > + &out_data); > if (ACPI_SUCCESS(status)) { > if (out_data == 0) > return sysfs_emit(buf, "[disabled] s5 s5_s4\n"); >
© 2016 - 2024 Red Hat, Inc.