Skip to content

Commit

Permalink
platform/x86: x86-android-tablets: Add an init() callback to struct x…
Browse files Browse the repository at this point in the history
…86_dev_info

Add an init() callback to struct x86_dev_info, board descriptions can use
this to do some custom setup before registering the i2c_clients, platform-
devices and servdevs.

Also add an exit() callback to also allow for cleanup of the custom setup.

Signed-off-by: Hans de Goede <[email protected]>
Reviewed-By: Lubomir Rintel <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
  • Loading branch information
jwrdegoede committed Jan 24, 2022
1 parent 4ce2a32 commit 84c2dcd
Showing 1 changed file with 15 additions and 0 deletions.
15 changes: 15 additions & 0 deletions drivers/platform/x86/x86-android-tablets.c
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@ struct x86_dev_info {
int i2c_client_count;
int pdev_count;
int serdev_count;
int (*init)(void);
void (*exit)(void);
};

/* Generic / shared bq24190 settings */
Expand Down Expand Up @@ -674,6 +676,7 @@ static struct i2c_client **i2c_clients;
static struct platform_device **pdevs;
static struct serdev_device **serdevs;
static struct gpiod_lookup_table **gpiod_lookup_tables;
static void (*exit_handler)(void);

static __init int x86_instantiate_i2c_client(const struct x86_dev_info *dev_info,
int idx)
Expand Down Expand Up @@ -791,6 +794,9 @@ static void x86_android_tablet_cleanup(void)

kfree(i2c_clients);

if (exit_handler)
exit_handler();

for (i = 0; gpiod_lookup_tables && gpiod_lookup_tables[i]; i++)
gpiod_remove_lookup_table(gpiod_lookup_tables[i]);
}
Expand Down Expand Up @@ -833,6 +839,15 @@ static __init int x86_android_tablet_init(void)
for (i = 0; gpiod_lookup_tables && gpiod_lookup_tables[i]; i++)
gpiod_add_lookup_table(gpiod_lookup_tables[i]);

if (dev_info->init) {
ret = dev_info->init();
if (ret < 0) {
x86_android_tablet_cleanup();
return ret;
}
exit_handler = dev_info->exit;
}

i2c_clients = kcalloc(dev_info->i2c_client_count, sizeof(*i2c_clients), GFP_KERNEL);
if (!i2c_clients) {
x86_android_tablet_cleanup();
Expand Down

0 comments on commit 84c2dcd

Please sign in to comment.