From df50e2b4682d8d70243747f5e47a45ac86212248 Mon Sep 17 00:00:00 2001 From: Benson Leung Date: Thu, 21 Feb 2013 12:14:56 -0800 Subject: [PATCH] --- yaml --- r: 360571 b: refs/heads/master c: e7b28845d794b0f382a3942558c24e63d5e45c32 h: refs/heads/master i: 360569: d60b7ebbf6c115a485c862af62bf34cd33707b5c 360567: fe0a75c257ba23e73c46871a37562d500fafc618 v: v3 --- [refs] | 2 +- trunk/drivers/platform/x86/chromeos_laptop.c | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 97c9655ef209..4c492acdaf73 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 33a84f8a7694e442a624556ef3ae40e91e31bd11 +refs/heads/master: e7b28845d794b0f382a3942558c24e63d5e45c32 diff --git a/trunk/drivers/platform/x86/chromeos_laptop.c b/trunk/drivers/platform/x86/chromeos_laptop.c index e5380e772b26..6bde4e4c93b4 100644 --- a/trunk/drivers/platform/x86/chromeos_laptop.c +++ b/trunk/drivers/platform/x86/chromeos_laptop.c @@ -181,16 +181,24 @@ static __init struct i2c_client *add_probed_i2c_device( * info->addr. * Returns NULL if no device found. */ -static struct i2c_client __init *add_smbus_device(const char *name, - struct i2c_board_info *info) +static __init struct i2c_client *add_i2c_device(const char *name, + enum i2c_adapter_type type, + struct i2c_board_info *info) { const unsigned short addr_list[] = { info->addr, I2C_CLIENT_END }; return __add_probed_i2c_device(name, - find_i2c_adapter_num(I2C_ADAPTER_SMBUS), + find_i2c_adapter_num(type), info, addr_list); } + +static struct i2c_client __init *add_smbus_device(const char *name, + struct i2c_board_info *info) +{ + return add_i2c_device(name, I2C_ADAPTER_SMBUS, info); +} + static int __init setup_cyapa_smbus_tp(const struct dmi_system_id *id) { /* add cyapa touchpad on smbus */