Commit 492b1194 authored by Hans de Goede's avatar Hans de Goede

platform/x86: x86-android-tablets: Pass struct device to init()

Pass a struct device pointer for x86_android_tablet_device to the board
specific init() functions, so that these functions can use this for
e.g. devm_*() functions.
Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20240509141207.63570-1-hdegoede@redhat.com
parent ac0729c1
...@@ -341,7 +341,7 @@ static __init int x86_android_tablet_probe(struct platform_device *pdev) ...@@ -341,7 +341,7 @@ static __init int x86_android_tablet_probe(struct platform_device *pdev)
gpiod_add_lookup_table(gpiod_lookup_tables[i]); gpiod_add_lookup_table(gpiod_lookup_tables[i]);
if (dev_info->init) { if (dev_info->init) {
ret = dev_info->init(); ret = dev_info->init(&pdev->dev);
if (ret < 0) { if (ret < 0) {
x86_android_tablet_remove(pdev); x86_android_tablet_remove(pdev);
return ret; return ret;
......
...@@ -230,7 +230,7 @@ static struct gpiod_lookup_table * const lenovo_yb1_x90_gpios[] = { ...@@ -230,7 +230,7 @@ static struct gpiod_lookup_table * const lenovo_yb1_x90_gpios[] = {
NULL NULL
}; };
static int __init lenovo_yb1_x90_init(void) static int __init lenovo_yb1_x90_init(struct device *dev)
{ {
/* Enable the regulators used by the touchscreens */ /* Enable the regulators used by the touchscreens */
...@@ -412,7 +412,7 @@ static struct gpiod_lookup_table * const lenovo_yoga_tab2_830_1050_gpios[] = { ...@@ -412,7 +412,7 @@ static struct gpiod_lookup_table * const lenovo_yoga_tab2_830_1050_gpios[] = {
NULL NULL
}; };
static int __init lenovo_yoga_tab2_830_1050_init(void); static int __init lenovo_yoga_tab2_830_1050_init(struct device *dev);
static void lenovo_yoga_tab2_830_1050_exit(void); static void lenovo_yoga_tab2_830_1050_exit(void);
const struct x86_dev_info lenovo_yoga_tab2_830_1050_info __initconst = { const struct x86_dev_info lenovo_yoga_tab2_830_1050_info __initconst = {
...@@ -534,7 +534,7 @@ static int lenovo_yoga_tab2_830_1050_power_off(struct sys_off_data *data) ...@@ -534,7 +534,7 @@ static int lenovo_yoga_tab2_830_1050_power_off(struct sys_off_data *data)
return NOTIFY_DONE; return NOTIFY_DONE;
} }
static int __init lenovo_yoga_tab2_830_1050_init(void) static int __init lenovo_yoga_tab2_830_1050_init(struct device *dev)
{ {
int ret; int ret;
...@@ -731,7 +731,7 @@ const char * const lenovo_yoga_tab2_1380_modules[] __initconst = { ...@@ -731,7 +731,7 @@ const char * const lenovo_yoga_tab2_1380_modules[] __initconst = {
NULL NULL
}; };
static int __init lenovo_yoga_tab2_1380_init(void) static int __init lenovo_yoga_tab2_1380_init(struct device *dev)
{ {
int ret; int ret;
...@@ -978,7 +978,7 @@ static const struct x86_spi_dev_info lenovo_yt3_spi_devs[] __initconst = { ...@@ -978,7 +978,7 @@ static const struct x86_spi_dev_info lenovo_yt3_spi_devs[] __initconst = {
} }
}; };
static int __init lenovo_yt3_init(void) static int __init lenovo_yt3_init(struct device *dev)
{ {
int ret; int ret;
......
...@@ -183,7 +183,7 @@ static const struct x86_i2c_client_info chuwi_hi8_i2c_clients[] __initconst = { ...@@ -183,7 +183,7 @@ static const struct x86_i2c_client_info chuwi_hi8_i2c_clients[] __initconst = {
}, },
}; };
static int __init chuwi_hi8_init(void) static int __init chuwi_hi8_init(struct device *dev)
{ {
/* /*
* Avoid the acpi_unregister_gsi() call in x86_acpi_irq_helper_get() * Avoid the acpi_unregister_gsi() call in x86_acpi_irq_helper_get()
...@@ -244,7 +244,7 @@ const struct x86_dev_info cyberbook_t116_info __initconst = { ...@@ -244,7 +244,7 @@ const struct x86_dev_info cyberbook_t116_info __initconst = {
#define CZC_EC_EXTRA_PORT 0x68 #define CZC_EC_EXTRA_PORT 0x68
#define CZC_EC_ANDROID_KEYS 0x63 #define CZC_EC_ANDROID_KEYS 0x63
static int __init czc_p10t_init(void) static int __init czc_p10t_init(struct device *dev)
{ {
/* /*
* The device boots up in "Windows 7" mode, when the home button sends a * The device boots up in "Windows 7" mode, when the home button sends a
...@@ -662,7 +662,7 @@ static const struct software_node *ktd2026_node_group[] = { ...@@ -662,7 +662,7 @@ static const struct software_node *ktd2026_node_group[] = {
NULL NULL
}; };
static int __init xiaomi_mipad2_init(void) static int __init xiaomi_mipad2_init(struct device *dev)
{ {
return software_node_register_node_group(ktd2026_node_group); return software_node_register_node_group(ktd2026_node_group);
} }
......
...@@ -89,7 +89,7 @@ struct x86_dev_info { ...@@ -89,7 +89,7 @@ struct x86_dev_info {
int pdev_count; int pdev_count;
int serdev_count; int serdev_count;
int gpio_button_count; int gpio_button_count;
int (*init)(void); int (*init)(struct device *dev);
void (*exit)(void); void (*exit)(void);
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment