Skip to content

Commit bb9c2e5

Browse files
andy-shevjwrdegoede
authored andcommitted
platform/x86: x86-android-tablets: Fix spelling in the comments
Fix spelling across comments (besides obvious grammar issues): - spell words in full, e.g., 'img' --> 'image' - refer to 'gpio-keys' consistently - refer to acpi_power_off() clearly as to function - make sure that the first line is only for the affected model(s) - miscellaneous improvements Signed-off-by: Andy Shevchenko <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Hans de Goede <[email protected]> Signed-off-by: Hans de Goede <[email protected]>
1 parent a093cb6 commit bb9c2e5

File tree

8 files changed

+52
-52
lines changed

8 files changed

+52
-52
lines changed

drivers/platform/x86/x86-android-tablets/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ config X86_ANDROID_TABLETS
2020
are missing from the DSDT.
2121

2222
If you have a x86 Android tablet say Y or M here, for a generic x86
23-
distro config say M here.
23+
distro configuration say M here.

drivers/platform/x86/x86-android-tablets/asus.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ static const struct x86_gpio_button asus_me176c_tf103c_lid __initconst = {
3737
.pin = 12,
3838
};
3939

40-
/* Asus ME176C tablets have an Android factory img with everything hardcoded */
40+
/* Asus ME176C tablets have an Android factory image with everything hardcoded */
4141
static const char * const asus_me176c_accel_mount_matrix[] = {
4242
"-1", "0", "0",
4343
"0", "1", "0",
@@ -112,7 +112,7 @@ static const struct x86_i2c_client_info asus_me176c_i2c_clients[] __initconst =
112112
},
113113
.adapter_path = "\\_SB_.I2C5",
114114
}, {
115-
/* kxtj21009 accel */
115+
/* kxtj21009 accelerometer */
116116
.board_info = {
117117
.type = "kxtj21009",
118118
.addr = 0x0f,
@@ -181,7 +181,7 @@ const struct x86_dev_info asus_me176c_info __initconst = {
181181
.modules = bq24190_modules,
182182
};
183183

184-
/* Asus TF103C tablets have an Android factory img with everything hardcoded */
184+
/* Asus TF103C tablets have an Android factory image with everything hardcoded */
185185
static const char * const asus_tf103c_accel_mount_matrix[] = {
186186
"0", "-1", "0",
187187
"-1", "0", "0",
@@ -280,7 +280,7 @@ static const struct x86_i2c_client_info asus_tf103c_i2c_clients[] __initconst =
280280
},
281281
.adapter_path = "\\_SB_.I2C5",
282282
}, {
283-
/* kxtj21009 accel */
283+
/* kxtj21009 accelerometer */
284284
.board_info = {
285285
.type = "kxtj21009",
286286
.addr = 0x0f,

drivers/platform/x86/x86-android-tablets/core.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,19 @@
2626
static struct platform_device *x86_android_tablet_device;
2727

2828
/*
29-
* This helper allows getting a gpio_desc *before* the actual device consuming
30-
* the GPIO has been instantiated. This function _must_ only be used to handle
31-
* this special case such as e.g. :
29+
* This helper allows getting a GPIO descriptor *before* the actual device
30+
* consuming it has been instantiated. This function MUST only be used to
31+
* handle this special case such as, e.g.:
3232
*
3333
* 1. Getting an IRQ from a GPIO for i2c_board_info.irq which is passed to
3434
* i2c_client_new() to instantiate i2c_client-s; or
35-
* 2. Calling desc_to_gpio() to get an old style GPIO number for gpio_keys
35+
* 2. Calling desc_to_gpio() to get an old style GPIO number for gpio-keys
3636
* platform_data which still uses old style GPIO numbers.
3737
*
38-
* Since the consuming device has not been instatiated yet a dynamic lookup
39-
* is generated using the special x86_android_tablet dev for dev_id.
38+
* Since the consuming device has not been instantiated yet a dynamic lookup
39+
* is generated using the special x86_android_tablet device for dev_id.
4040
*
41-
* For normal GPIO lookups a standard static gpiod_lookup_table _must_ be used.
41+
* For normal GPIO lookups a standard static struct gpiod_lookup_table MUST be used.
4242
*/
4343
int x86_android_tablet_get_gpiod(const char *chip, int pin, const char *con_id,
4444
bool active_low, enum gpiod_flags dflags,
@@ -87,7 +87,7 @@ int x86_acpi_irq_helper_get(const struct x86_acpi_irq_data *data)
8787
/*
8888
* The DSDT may already reference the GSI in a device skipped by
8989
* acpi_quirk_skip_i2c_client_enumeration(). Unregister the GSI
90-
* to avoid EBUSY errors in this case.
90+
* to avoid -EBUSY errors in this case.
9191
*/
9292
acpi_unregister_gsi(data->index);
9393
irq = acpi_register_gsi(NULL, data->index, data->trigger, data->polarity);
@@ -379,7 +379,7 @@ static __init int x86_android_tablet_probe(struct platform_device *pdev)
379379
}
380380
}
381381

382-
/* + 1 to make space for (optional) gpio_keys_button pdev */
382+
/* + 1 to make space for the (optional) gpio_keys_button platform device */
383383
pdevs = kcalloc(dev_info->pdev_count + 1, sizeof(*pdevs), GFP_KERNEL);
384384
if (!pdevs) {
385385
x86_android_tablet_remove(pdev);
@@ -432,7 +432,7 @@ static __init int x86_android_tablet_probe(struct platform_device *pdev)
432432

433433
buttons[i] = dev_info->gpio_button[i].button;
434434
buttons[i].gpio = desc_to_gpio(gpiod);
435-
/* Release gpiod so that gpio-keys can request it */
435+
/* Release GPIO descriptor so that gpio-keys can request it */
436436
devm_gpiod_put(&x86_android_tablet_device->dev, gpiod);
437437
}
438438

drivers/platform/x86/x86-android-tablets/dmi.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,17 +99,17 @@ const struct dmi_system_id x86_android_tablet_ids[] __initconst = {
9999
{
100100
/* Lenovo Yoga Book X91F / X91L */
101101
.matches = {
102-
/* Non exact match to match F + L versions */
102+
/* Inexact match to match F + L versions */
103103
DMI_MATCH(DMI_PRODUCT_NAME, "Lenovo YB1-X91"),
104104
},
105105
.driver_data = (void *)&lenovo_yogabook_x91_info,
106106
},
107107
{
108108
/*
109-
* Lenovo Yoga Tablet 2 Pro 1380F/L (13") This has more or less
110-
* the same BIOS as the 830F/L or 1050F/L (8" and 10") below,
111-
* but unlike the 8" / 10" models which share the same mainboard
112-
* this model has a different mainboard.
109+
* Lenovo Yoga Tablet 2 Pro 1380F/L (13")
110+
* This has more or less the same BIOS as the 830F/L or 1050F/L
111+
* (8" and 10") below, but unlike the 8"/10" models which share
112+
* the same mainboard this model has a different mainboard.
113113
* This match for the 13" model MUST come before the 8" + 10"
114114
* match since that one will also match the 13" model!
115115
*/
@@ -124,8 +124,8 @@ const struct dmi_system_id x86_android_tablet_ids[] __initconst = {
124124
},
125125
{
126126
/*
127-
* Lenovo Yoga Tablet 2 830F/L or 1050F/L (The 8" and 10"
128-
* Lenovo Yoga Tablet 2 use the same mainboard)
127+
* Lenovo Yoga Tablet 2 830F/L or 1050F/L
128+
* The 8" and 10" Lenovo Yoga Tablet 2 use the same mainboard.
129129
*/
130130
.matches = {
131131
DMI_MATCH(DMI_SYS_VENDOR, "Intel Corp."),
@@ -164,7 +164,7 @@ const struct dmi_system_id x86_android_tablet_ids[] __initconst = {
164164
.driver_data = (void *)&nextbook_ares8_info,
165165
},
166166
{
167-
/* Nextbook Ares 8A (CHT version)*/
167+
/* Nextbook Ares 8A (CHT version) */
168168
.matches = {
169169
DMI_MATCH(DMI_SYS_VENDOR, "Insyde"),
170170
DMI_MATCH(DMI_PRODUCT_NAME, "CherryTrail"),

drivers/platform/x86/x86-android-tablets/lenovo.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ static struct lp855x_platform_data lenovo_lp8557_reg_only_pdata = {
5959
.initial_brightness = 128,
6060
};
6161

62-
/* Lenovo Yoga Book X90F / X90L's Android factory img has everything hardcoded */
62+
/* Lenovo Yoga Book X90F / X90L's Android factory image has everything hardcoded */
6363

6464
static const struct property_entry lenovo_yb1_x90_wacom_props[] = {
6565
PROPERTY_ENTRY_U32("hid-descr-addr", 0x0001),
@@ -262,7 +262,7 @@ const struct x86_dev_info lenovo_yogabook_x90_info __initconst = {
262262
.init = lenovo_yb1_x90_init,
263263
};
264264

265-
/* Lenovo Yoga Book X91F/L Windows tablet needs manual instantiation of the fg client */
265+
/* Lenovo Yoga Book X91F/L Windows tablet needs manual instantiation of the fuel-gauge client */
266266
static const struct x86_i2c_client_info lenovo_yogabook_x91_i2c_clients[] __initconst = {
267267
{
268268
/* BQ27542 fuel-gauge */
@@ -281,7 +281,7 @@ const struct x86_dev_info lenovo_yogabook_x91_info __initconst = {
281281
.i2c_client_count = ARRAY_SIZE(lenovo_yogabook_x91_i2c_clients),
282282
};
283283

284-
/* Lenovo Yoga Tablet 2 1050F/L's Android factory img has everything hardcoded */
284+
/* Lenovo Yoga Tablet 2 1050F/L's Android factory image has everything hardcoded */
285285
static const struct property_entry lenovo_yoga_tab2_830_1050_bq24190_props[] = {
286286
PROPERTY_ENTRY_STRING_ARRAY_LEN("supplied-from", tusb1211_chg_det_psy, 1),
287287
PROPERTY_ENTRY_REF("monitored-battery", &generic_lipo_hv_4v35_battery_node),
@@ -521,9 +521,9 @@ static int __init lenovo_yoga_tab2_830_1050_init_codec(void)
521521
}
522522

523523
/*
524-
* These tablet's DSDT does not set acpi_gbl_reduced_hardware, so acpi_power_off
524+
* These tablet's DSDT does not set acpi_gbl_reduced_hardware, so acpi_power_off()
525525
* gets used as pm_power_off handler. This causes "poweroff" on these tablets
526-
* to hang hard. Requiring pressing the powerbutton for 30 seconds *twice*
526+
* to hang hard. Requiring pressing the power button for 30 seconds *twice*
527527
* followed by a normal 3 second press to recover. Avoid this by doing an EFI
528528
* poweroff instead.
529529
*/
@@ -546,7 +546,7 @@ static int __init lenovo_yoga_tab2_830_1050_init(struct device *dev)
546546
if (ret)
547547
return ret;
548548

549-
/* SYS_OFF_PRIO_FIRMWARE + 1 so that it runs before acpi_power_off */
549+
/* SYS_OFF_PRIO_FIRMWARE + 1 so that it runs before acpi_power_off() */
550550
lenovo_yoga_tab2_830_1050_sys_off_handler =
551551
register_sys_off_handler(SYS_OFF_MODE_POWER_OFF, SYS_OFF_PRIO_FIRMWARE + 1,
552552
lenovo_yoga_tab2_830_1050_power_off, NULL);
@@ -742,7 +742,7 @@ static int __init lenovo_yoga_tab2_1380_init(struct device *dev)
742742
if (ret)
743743
return ret;
744744

745-
/* SYS_OFF_PRIO_FIRMWARE + 1 so that it runs before acpi_power_off */
745+
/* SYS_OFF_PRIO_FIRMWARE + 1 so that it runs before acpi_power_off() */
746746
lenovo_yoga_tab2_830_1050_sys_off_handler =
747747
register_sys_off_handler(SYS_OFF_MODE_POWER_OFF, SYS_OFF_PRIO_FIRMWARE + 1,
748748
lenovo_yoga_tab2_830_1050_power_off, NULL);
@@ -799,7 +799,7 @@ static const struct software_node fg_bq25890_1_supply_node = {
799799
.properties = fg_bq25890_1_supply_props,
800800
};
801801

802-
/* bq25892 charger settings for the flat lipo battery behind the screen */
802+
/* bq25892 charger settings for the flat LiPo battery behind the screen */
803803
static const struct property_entry lenovo_yt3_bq25892_0_props[] = {
804804
PROPERTY_ENTRY_STRING_ARRAY("supplied-from", lenovo_yt3_bq25892_0_suppliers),
805805
PROPERTY_ENTRY_U32("linux,iinlim-percentage", 40),
@@ -833,7 +833,7 @@ static const struct software_node lenovo_yt3_hideep_ts_node = {
833833

834834
static const struct x86_i2c_client_info lenovo_yt3_i2c_clients[] __initconst = {
835835
{
836-
/* bq27500 fuel-gauge for the flat lipo battery behind the screen */
836+
/* bq27500 fuel-gauge for the flat LiPo battery behind the screen */
837837
.board_info = {
838838
.type = "bq27500",
839839
.addr = 0x55,
@@ -842,7 +842,7 @@ static const struct x86_i2c_client_info lenovo_yt3_i2c_clients[] __initconst = {
842842
},
843843
.adapter_path = "\\_SB_.PCI0.I2C1",
844844
}, {
845-
/* bq25892 charger for the flat lipo battery behind the screen */
845+
/* bq25892 charger for the flat LiPo battery behind the screen */
846846
.board_info = {
847847
.type = "bq25892",
848848
.addr = 0x6b,
@@ -859,7 +859,7 @@ static const struct x86_i2c_client_info lenovo_yt3_i2c_clients[] __initconst = {
859859
.con_id = "bq25892_0_irq",
860860
},
861861
}, {
862-
/* bq27500 fuel-gauge for the round li-ion cells in the hinge */
862+
/* bq27500 fuel-gauge for the round Li-ion cells in the hinge */
863863
.board_info = {
864864
.type = "bq27500",
865865
.addr = 0x55,

drivers/platform/x86/x86-android-tablets/other.c

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "shared-psy-info.h"
2121
#include "x86-android-tablets.h"
2222

23-
/* Acer Iconia One 7 B1-750 has an Android factory img with everything hardcoded */
23+
/* Acer Iconia One 7 B1-750 has an Android factory image with everything hardcoded */
2424
static const char * const acer_b1_750_mount_matrix[] = {
2525
"-1", "0", "0",
2626
"0", "1", "0",
@@ -98,7 +98,7 @@ const struct x86_dev_info acer_b1_750_info __initconst = {
9898
* Advantech MICA-071
9999
* This is a standard Windows tablet, but it has an extra "quick launch" button
100100
* which is not described in the ACPI tables in anyway.
101-
* Use the x86-android-tablets infra to create a gpio-button device for this.
101+
* Use the x86-android-tablets infra to create a gpio-keys device for this.
102102
*/
103103
static const struct x86_gpio_button advantech_mica_071_button __initconst = {
104104
.button = {
@@ -209,7 +209,7 @@ const struct x86_dev_info chuwi_hi8_info __initconst = {
209209
* This comes in both Windows and Android versions and even on Android
210210
* the DSDT is mostly sane. This tablet has 2 extra general purpose buttons
211211
* in the button row with the power + volume-buttons labeled P and F.
212-
* Use the x86-android-tablets infra to create a gpio-button device for these.
212+
* Use the x86-android-tablets infra to create a gpio-keys device for these.
213213
*/
214214
static const struct x86_gpio_button cyberbook_t116_buttons[] __initconst = {
215215
{
@@ -276,7 +276,7 @@ const struct x86_dev_info czc_p10t __initconst = {
276276
.init = czc_p10t_init,
277277
};
278278

279-
/* Medion Lifetab S10346 tablets have an Android factory img with everything hardcoded */
279+
/* Medion Lifetab S10346 tablets have an Android factory image with everything hardcoded */
280280
static const char * const medion_lifetab_s10346_accel_mount_matrix[] = {
281281
"0", "1", "0",
282282
"1", "0", "0",
@@ -305,7 +305,7 @@ static const struct software_node medion_lifetab_s10346_touchscreen_node = {
305305

306306
static const struct x86_i2c_client_info medion_lifetab_s10346_i2c_clients[] __initconst = {
307307
{
308-
/* kxtj21009 accel */
308+
/* kxtj21009 accelerometer */
309309
.board_info = {
310310
.type = "kxtj21009",
311311
.addr = 0x0f,
@@ -359,7 +359,7 @@ const struct x86_dev_info medion_lifetab_s10346_info __initconst = {
359359
.gpiod_lookup_tables = medion_lifetab_s10346_gpios,
360360
};
361361

362-
/* Nextbook Ares 8 (BYT) tablets have an Android factory img with everything hardcoded */
362+
/* Nextbook Ares 8 (BYT) tablets have an Android factory image with everything hardcoded */
363363
static const char * const nextbook_ares8_accel_mount_matrix[] = {
364364
"0", "-1", "0",
365365
"-1", "0", "0",
@@ -387,7 +387,7 @@ static const struct software_node nextbook_ares8_touchscreen_node = {
387387

388388
static const struct x86_i2c_client_info nextbook_ares8_i2c_clients[] __initconst = {
389389
{
390-
/* Freescale MMA8653FC accel */
390+
/* Freescale MMA8653FC accelerometer */
391391
.board_info = {
392392
.type = "mma8653",
393393
.addr = 0x1d,
@@ -428,7 +428,7 @@ const struct x86_dev_info nextbook_ares8_info __initconst = {
428428
.gpiod_lookup_tables = nextbook_ares8_gpios,
429429
};
430430

431-
/* Nextbook Ares 8A (CHT) tablets have an Android factory img with everything hardcoded */
431+
/* Nextbook Ares 8A (CHT) tablets have an Android factory image with everything hardcoded */
432432
static const char * const nextbook_ares8a_accel_mount_matrix[] = {
433433
"1", "0", "0",
434434
"0", "-1", "0",
@@ -446,7 +446,7 @@ static const struct software_node nextbook_ares8a_accel_node = {
446446

447447
static const struct x86_i2c_client_info nextbook_ares8a_i2c_clients[] __initconst = {
448448
{
449-
/* Freescale MMA8653FC accel */
449+
/* Freescale MMA8653FC accelerometer */
450450
.board_info = {
451451
.type = "mma8653",
452452
.addr = 0x1d,
@@ -497,7 +497,7 @@ const struct x86_dev_info nextbook_ares8a_info __initconst = {
497497
* Peaq C1010
498498
* This is a standard Windows tablet, but it has a special Dolby button.
499499
* This button has a WMI interface, but that is broken. Instead of trying to
500-
* use the broken WMI interface, instantiate a gpio_keys device for this.
500+
* use the broken WMI interface, instantiate a gpio-keys device for this.
501501
*/
502502
static const struct x86_gpio_button peaq_c1010_button __initconst = {
503503
.button = {
@@ -521,7 +521,7 @@ const struct x86_dev_info peaq_c1010_info __initconst = {
521521
* Whitelabel (sold as various brands) TM800A550L tablets.
522522
* These tablet's DSDT contains a whole bunch of bogus ACPI I2C devices
523523
* (removed through acpi_quirk_skip_i2c_client_enumeration()) and
524-
* the touchscreen fwnode has the wrong GPIOs.
524+
* the touchscreen firmware node has the wrong GPIOs.
525525
*/
526526
static const char * const whitelabel_tm800a550l_accel_mount_matrix[] = {
527527
"-1", "0", "0",
@@ -566,7 +566,7 @@ static const struct x86_i2c_client_info whitelabel_tm800a550l_i2c_clients[] __in
566566
.polarity = ACPI_ACTIVE_HIGH,
567567
},
568568
}, {
569-
/* kxcj91008 accel */
569+
/* kxcj91008 accelerometer */
570570
.board_info = {
571571
.type = "kxcj91008",
572572
.addr = 0x0f,
@@ -598,12 +598,12 @@ const struct x86_dev_info whitelabel_tm800a550l_info __initconst = {
598598
};
599599

600600
/*
601-
* The fwnode for ktd2026 on Xaomi pad2. It composed of a RGB LED node
601+
* The firmware node for ktd2026 on Xaomi pad2. It composed of a RGB LED node
602602
* with three subnodes for each color (B/G/R). The RGB LED node is named
603603
* "multi-led" to align with the name in the device tree.
604604
*/
605605

606-
/* main fwnode for ktd2026 */
606+
/* Main firmware node for ktd2026 */
607607
static const struct software_node ktd2026_node = {
608608
.name = "ktd2026",
609609
};
@@ -665,7 +665,7 @@ static const struct software_node *ktd2026_node_group[] = {
665665
};
666666

667667
/*
668-
* For the LEDs which backlight the menu / home / back capacitive buttons on
668+
* For the LEDs which backlight the Menu / Home / Back capacitive buttons on
669669
* the bottom bezel. These are attached to a TPS61158 LED controller which
670670
* is controlled by the "pwm_soc_lpss_2" PWM output.
671671
*/

drivers/platform/x86/x86-android-tablets/shared-psy-info.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const struct software_node fg_bq25890_supply_node = {
3939
.properties = fg_bq25890_supply_props,
4040
};
4141

42-
/* LiPo HighVoltage (max 4.35V) settings used by most devs with a HV bat. */
42+
/* LiPo HighVoltage (max 4.35V) settings used by most devs with a HV battery */
4343
static const struct property_entry generic_lipo_hv_4v35_battery_props[] = {
4444
PROPERTY_ENTRY_STRING("compatible", "simple-battery"),
4545
PROPERTY_ENTRY_STRING("device-chemistry", "lithium-ion"),
@@ -80,7 +80,7 @@ const char * const bq24190_modules[] __initconst = {
8080
NULL
8181
};
8282

83-
/* Generic pdevs array and gpio-lookups for micro USB ID pin handling */
83+
/* Generic platform device array and GPIO lookup table for micro USB ID pin handling */
8484
const struct platform_device_info int3496_pdevs[] __initconst = {
8585
{
8686
/* For micro USB ID pin handling */

drivers/platform/x86/x86-android-tablets/x86-android-tablets.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ struct x86_serdev_info {
6161
const char *ctrl_uid;
6262
const char *ctrl_devname;
6363
/*
64-
* ATM the serdev core only supports of or ACPI matching; and sofar all
64+
* ATM the serdev core only supports of or ACPI matching; and so far all
6565
* Android x86 tablets DSDTs have usable serdev nodes, but sometimes
6666
* under the wrong controller. So we just tie the existing serdev ACPI
6767
* node to the right controller.

0 commit comments

Comments
 (0)