From 36a113db00583624b37323a199f8935bd1579812 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 23 Apr 2003 23:38:03 -0700 Subject: [PATCH] [PATCH] i2c: remove a lot of dupliated macros from i2c-sensor.h and use the current values in i2c.h --- drivers/i2c/chips/adm1021.c | 8 +-- drivers/i2c/chips/it87.c | 8 +-- drivers/i2c/chips/lm75.c | 8 +-- drivers/i2c/chips/via686a.c | 8 +-- drivers/i2c/chips/w83781d.c | 10 ++-- drivers/i2c/i2c-sensor.c | 30 +++++----- include/linux/i2c-sensor.h | 113 ++++++++++++------------------------ include/linux/i2c.h | 20 ++++--- 8 files changed, 86 insertions(+), 119 deletions(-) diff --git a/drivers/i2c/chips/adm1021.c b/drivers/i2c/chips/adm1021.c index 2ddcf4a7302c4..f7afe0b4b4ea5 100644 --- a/drivers/i2c/chips/adm1021.c +++ b/drivers/i2c/chips/adm1021.c @@ -39,12 +39,12 @@ #define ADM1021_ALARM_RTEMP_NA 0x04 /* Addresses to scan */ -static unsigned short normal_i2c[] = { SENSORS_I2C_END }; +static unsigned short normal_i2c[] = { I2C_CLIENT_END }; static unsigned short normal_i2c_range[] = { 0x18, 0x1a, 0x29, 0x2b, - 0x4c, 0x4e, SENSORS_I2C_END + 0x4c, 0x4e, I2C_CLIENT_END }; -static unsigned int normal_isa[] = { SENSORS_ISA_END }; -static unsigned int normal_isa_range[] = { SENSORS_ISA_END }; +static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; +static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END }; /* Insmod parameters */ SENSORS_INSMOD_8(adm1021, adm1023, max1617, max1617a, thmc10, lm84, gl523sm, mc1066); diff --git a/drivers/i2c/chips/it87.c b/drivers/i2c/chips/it87.c index a4c99e4c0fc2f..f6a3d017a3dde 100644 --- a/drivers/i2c/chips/it87.c +++ b/drivers/i2c/chips/it87.c @@ -40,10 +40,10 @@ /* Addresses to scan */ -static unsigned short normal_i2c[] = { SENSORS_I2C_END }; -static unsigned short normal_i2c_range[] = { 0x20, 0x2f, SENSORS_I2C_END }; -static unsigned int normal_isa[] = { 0x0290, SENSORS_ISA_END }; -static unsigned int normal_isa_range[] = { SENSORS_ISA_END }; +static unsigned short normal_i2c[] = { I2C_CLIENT_END }; +static unsigned short normal_i2c_range[] = { 0x20, 0x2f, I2C_CLIENT_END }; +static unsigned int normal_isa[] = { 0x0290, I2C_CLIENT_ISA_END }; +static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END }; /* Insmod parameters */ SENSORS_INSMOD_4(it87, it8705, it8712, sis950); diff --git a/drivers/i2c/chips/lm75.c b/drivers/i2c/chips/lm75.c index f17984cf6ab8a..f4acc1649917e 100644 --- a/drivers/i2c/chips/lm75.c +++ b/drivers/i2c/chips/lm75.c @@ -28,10 +28,10 @@ /* Addresses to scan */ -static unsigned short normal_i2c[] = { SENSORS_I2C_END }; -static unsigned short normal_i2c_range[] = { 0x48, 0x4f, SENSORS_I2C_END }; -static unsigned int normal_isa[] = { SENSORS_ISA_END }; -static unsigned int normal_isa_range[] = { SENSORS_ISA_END }; +static unsigned short normal_i2c[] = { I2C_CLIENT_END }; +static unsigned short normal_i2c_range[] = { 0x48, 0x4f, I2C_CLIENT_END }; +static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; +static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END }; /* Insmod parameters */ SENSORS_INSMOD_1(lm75); diff --git a/drivers/i2c/chips/via686a.c b/drivers/i2c/chips/via686a.c index b412d4b02e54e..83859fead850c 100644 --- a/drivers/i2c/chips/via686a.c +++ b/drivers/i2c/chips/via686a.c @@ -51,10 +51,10 @@ MODULE_PARM_DESC(force_addr, /* Addresses to scan. Note that we can't determine the ISA address until we have initialized our module */ -static unsigned short normal_i2c[] = { SENSORS_I2C_END }; -static unsigned short normal_i2c_range[] = { SENSORS_I2C_END }; -static unsigned int normal_isa[] = { 0x0000, SENSORS_ISA_END }; -static unsigned int normal_isa_range[] = { SENSORS_ISA_END }; +static unsigned short normal_i2c[] = { I2C_CLIENT_END }; +static unsigned short normal_i2c_range[] = { I2C_CLIENT_END }; +static unsigned int normal_isa[] = { 0x0000, I2C_CLIENT_ISA_END }; +static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END }; /* Insmod parameters */ SENSORS_INSMOD_1(via686a); diff --git a/drivers/i2c/chips/w83781d.c b/drivers/i2c/chips/w83781d.c index a60c1d61a8392..c1fbf4c728737 100644 --- a/drivers/i2c/chips/w83781d.c +++ b/drivers/i2c/chips/w83781d.c @@ -46,14 +46,14 @@ #define W83781D_RT 1 /* Addresses to scan */ -static unsigned short normal_i2c[] = { SENSORS_I2C_END }; -static unsigned short normal_i2c_range[] = { 0x20, 0x2f, SENSORS_I2C_END }; -static unsigned int normal_isa[] = { 0x0290, SENSORS_ISA_END }; -static unsigned int normal_isa_range[] = { SENSORS_ISA_END }; +static unsigned short normal_i2c[] = { I2C_CLIENT_END }; +static unsigned short normal_i2c_range[] = { 0x20, 0x2f, I2C_CLIENT_END }; +static unsigned int normal_isa[] = { 0x0290, I2C_CLIENT_ISA_END }; +static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END }; /* Insmod parameters */ SENSORS_INSMOD_6(w83781d, w83782d, w83783s, w83627hf, as99127f, w83697hf); -SENSORS_MODULE_PARM(force_subclients, "List of subclient addresses: " +I2C_CLIENT_MODULE_PARM(force_subclients, "List of subclient addresses: " "{bus, clientaddr, subclientaddr1, subclientaddr2}"); static int init = 1; diff --git a/drivers/i2c/i2c-sensor.c b/drivers/i2c/i2c-sensor.c index b844e7b0bbdaf..6cf3139e39916 100644 --- a/drivers/i2c/i2c-sensor.c +++ b/drivers/i2c/i2c-sensor.c @@ -42,7 +42,7 @@ int i2c_detect(struct i2c_adapter *adapter, struct i2c_force_data *this_force; int is_isa = i2c_is_isa_adapter(adapter); int adapter_id = - is_isa ? SENSORS_ISA_BUS : i2c_adapter_id(adapter); + is_isa ? ANY_I2C_ISA_BUS : i2c_adapter_id(adapter); /* Forget it if we can't probe using SMBUS_QUICK */ if ((!is_isa) && @@ -59,9 +59,9 @@ int i2c_detect(struct i2c_adapter *adapter, detection at all */ found = 0; for (i = 0; !found && (this_force = address_data->forces + i, this_force->force); i++) { - for (j = 0; !found && (this_force->force[j] != SENSORS_I2C_END); j += 2) { + for (j = 0; !found && (this_force->force[j] != I2C_CLIENT_END); j += 2) { if ( ((adapter_id == this_force->force[j]) || - ((this_force->force[j] == SENSORS_ANY_I2C_BUS) && !is_isa)) && + ((this_force->force[j] == ANY_I2C_BUS) && !is_isa)) && (addr == this_force->force[j + 1]) ) { dev_dbg(&adapter->dev, "found force parameter for adapter %d, addr %04x\n", adapter_id, addr); if ((err = found_proc(adapter, addr, this_force->kind))) @@ -75,18 +75,18 @@ int i2c_detect(struct i2c_adapter *adapter, /* If this address is in one of the ignores, we can forget about it right now */ - for (i = 0; !found && (address_data->ignore[i] != SENSORS_I2C_END); i += 2) { + for (i = 0; !found && (address_data->ignore[i] != I2C_CLIENT_END); i += 2) { if ( ((adapter_id == address_data->ignore[i]) || - ((address_data->ignore[i] == SENSORS_ANY_I2C_BUS) && + ((address_data->ignore[i] == ANY_I2C_BUS) && !is_isa)) && (addr == address_data->ignore[i + 1])) { dev_dbg(&adapter->dev, "found ignore parameter for adapter %d, addr %04x\n", adapter_id, addr); found = 1; } } - for (i = 0; !found && (address_data->ignore_range[i] != SENSORS_I2C_END); i += 3) { + for (i = 0; !found && (address_data->ignore_range[i] != I2C_CLIENT_END); i += 3) { if ( ((adapter_id == address_data->ignore_range[i]) || - ((address_data-> ignore_range[i] == SENSORS_ANY_I2C_BUS) & + ((address_data-> ignore_range[i] == ANY_I2C_BUS) & !is_isa)) && (addr >= address_data->ignore_range[i + 1]) && (addr <= address_data->ignore_range[i + 2])) { @@ -100,13 +100,13 @@ int i2c_detect(struct i2c_adapter *adapter, /* Now, we will do a detection, but only if it is in the normal or probe entries */ if (is_isa) { - for (i = 0; !found && (address_data->normal_isa[i] != SENSORS_ISA_END); i += 1) { + for (i = 0; !found && (address_data->normal_isa[i] != I2C_CLIENT_ISA_END); i += 1) { if (addr == address_data->normal_isa[i]) { dev_dbg(&adapter->dev, "found normal isa entry for adapter %d, addr %04x\n", adapter_id, addr); found = 1; } } - for (i = 0; !found && (address_data->normal_isa_range[i] != SENSORS_ISA_END); i += 3) { + for (i = 0; !found && (address_data->normal_isa_range[i] != I2C_CLIENT_ISA_END); i += 3) { if ((addr >= address_data->normal_isa_range[i]) && (addr <= address_data->normal_isa_range[i + 1]) && ((addr - address_data->normal_isa_range[i]) % address_data->normal_isa_range[i + 2] == 0)) { @@ -115,13 +115,13 @@ int i2c_detect(struct i2c_adapter *adapter, } } } else { - for (i = 0; !found && (address_data->normal_i2c[i] != SENSORS_I2C_END); i += 1) { + for (i = 0; !found && (address_data->normal_i2c[i] != I2C_CLIENT_END); i += 1) { if (addr == address_data->normal_i2c[i]) { found = 1; dev_dbg(&adapter->dev, "found normal i2c entry for adapter %d, addr %02x", adapter_id, addr); } } - for (i = 0; !found && (address_data->normal_i2c_range[i] != SENSORS_I2C_END); i += 2) { + for (i = 0; !found && (address_data->normal_i2c_range[i] != I2C_CLIENT_END); i += 2) { if ((addr >= address_data->normal_i2c_range[i]) && (addr <= address_data->normal_i2c_range[i + 1])) { dev_dbg(&adapter->dev, "found normal i2c_range entry for adapter %d, addr %04x\n", adapter_id, addr); @@ -131,19 +131,19 @@ int i2c_detect(struct i2c_adapter *adapter, } for (i = 0; - !found && (address_data->probe[i] != SENSORS_I2C_END); + !found && (address_data->probe[i] != I2C_CLIENT_END); i += 2) { if (((adapter_id == address_data->probe[i]) || ((address_data-> - probe[i] == SENSORS_ANY_I2C_BUS) & !is_isa)) + probe[i] == ANY_I2C_BUS) & !is_isa)) && (addr == address_data->probe[i + 1])) { dev_dbg(&adapter->dev, "found probe parameter for adapter %d, addr %04x\n", adapter_id, addr); found = 1; } } - for (i = 0; !found && (address_data->probe_range[i] != SENSORS_I2C_END); i += 3) { + for (i = 0; !found && (address_data->probe_range[i] != I2C_CLIENT_END); i += 3) { if ( ((adapter_id == address_data->probe_range[i]) || - ((address_data->probe_range[i] == SENSORS_ANY_I2C_BUS) & !is_isa)) && + ((address_data->probe_range[i] == ANY_I2C_BUS) & !is_isa)) && (addr >= address_data->probe_range[i + 1]) && (addr <= address_data->probe_range[i + 2])) { found = 1; diff --git a/include/linux/i2c-sensor.h b/include/linux/i2c-sensor.h index fc17856482059..6db8f915147e5 100644 --- a/include/linux/i2c-sensor.h +++ b/include/linux/i2c-sensor.h @@ -29,8 +29,8 @@ will still try to figure out what type of chip is present. This is useful if for some reasons the detect for SMBus or ISA address space filled fails. - probe: insmod parameter. Initialize this list with SENSORS_I2C_END values. - A list of pairs. The first value is a bus number (SENSORS_ISA_BUS for + probe: insmod parameter. Initialize this list with I2C_CLIENT_ISA_END values. + A list of pairs. The first value is a bus number (ANY_I2C_ISA_BUS for the ISA bus, -1 for any I2C bus), the second is the address. kind: The kind of chip. 0 equals any chip. */ @@ -40,10 +40,10 @@ struct i2c_force_data { }; /* A structure containing the detect information. - normal_i2c: filled in by the module writer. Terminated by SENSORS_I2C_END. + normal_i2c: filled in by the module writer. Terminated by I2C_CLIENT_ISA_END. A list of I2C addresses which should normally be examined. normal_i2c_range: filled in by the module writer. Terminated by - SENSORS_I2C_END + I2C_CLIENT_ISA_END A list of pairs of I2C addresses, each pair being an inclusive range of addresses which should normally be examined. normal_isa: filled in by the module writer. Terminated by SENSORS_ISA_END. @@ -54,24 +54,24 @@ struct i2c_force_data { range of addresses which should normally be examined. The third is the modulo parameter: only addresses which are 0 module this value relative to the first address of the range are actually considered. - probe: insmod parameter. Initialize this list with SENSORS_I2C_END values. - A list of pairs. The first value is a bus number (SENSORS_ISA_BUS for + probe: insmod parameter. Initialize this list with I2C_CLIENT_ISA_END values. + A list of pairs. The first value is a bus number (ANY_I2C_ISA_BUS for the ISA bus, -1 for any I2C bus), the second is the address. These addresses are also probed, as if they were in the 'normal' list. - probe_range: insmod parameter. Initialize this list with SENSORS_I2C_END + probe_range: insmod parameter. Initialize this list with I2C_CLIENT_ISA_END values. - A list of triples. The first value is a bus number (SENSORS_ISA_BUS for + A list of triples. The first value is a bus number (ANY_I2C_ISA_BUS for the ISA bus, -1 for any I2C bus), the second and third are addresses. These form an inclusive range of addresses that are also probed, as if they were in the 'normal' list. - ignore: insmod parameter. Initialize this list with SENSORS_I2C_END values. - A list of pairs. The first value is a bus number (SENSORS_ISA_BUS for + ignore: insmod parameter. Initialize this list with I2C_CLIENT_ISA_END values. + A list of pairs. The first value is a bus number (ANY_I2C_ISA_BUS for the ISA bus, -1 for any I2C bus), the second is the I2C address. These addresses are never probed. This parameter overrules 'normal' and 'probe', but not the 'force' lists. - ignore_range: insmod parameter. Initialize this list with SENSORS_I2C_END + ignore_range: insmod parameter. Initialize this list with I2C_CLIENT_ISA_END values. - A list of triples. The first value is a bus number (SENSORS_ISA_BUS for + A list of triples. The first value is a bus number (ANY_I2C_ISA_BUS for the ISA bus, -1 for any I2C bus), the second and third are addresses. These form an inclusive range of I2C addresses that are never probed. This parameter overrules 'normal' and 'probe', but not the 'force' lists. @@ -90,74 +90,35 @@ struct i2c_address_data { struct i2c_force_data *forces; }; -/* Internal numbers to terminate lists */ -#define SENSORS_I2C_END 0xfffe -#define SENSORS_ISA_END 0xfffefffe - -/* The numbers to use to set an ISA or I2C bus address */ -#define SENSORS_ISA_BUS 9191 -#define SENSORS_ANY_I2C_BUS 0xffff - -/* The length of the option lists */ -#define SENSORS_MAX_OPTS 48 - -/* Default fill of many variables */ -#define SENSORS_DEFAULTS {SENSORS_I2C_END, SENSORS_I2C_END, SENSORS_I2C_END, \ - SENSORS_I2C_END, SENSORS_I2C_END, SENSORS_I2C_END, \ - SENSORS_I2C_END, SENSORS_I2C_END, SENSORS_I2C_END, \ - SENSORS_I2C_END, SENSORS_I2C_END, SENSORS_I2C_END, \ - SENSORS_I2C_END, SENSORS_I2C_END, SENSORS_I2C_END, \ - SENSORS_I2C_END, SENSORS_I2C_END, SENSORS_I2C_END, \ - SENSORS_I2C_END, SENSORS_I2C_END, SENSORS_I2C_END, \ - SENSORS_I2C_END, SENSORS_I2C_END, SENSORS_I2C_END, \ - SENSORS_I2C_END, SENSORS_I2C_END, SENSORS_I2C_END, \ - SENSORS_I2C_END, SENSORS_I2C_END, SENSORS_I2C_END, \ - SENSORS_I2C_END, SENSORS_I2C_END, SENSORS_I2C_END, \ - SENSORS_I2C_END, SENSORS_I2C_END, SENSORS_I2C_END, \ - SENSORS_I2C_END, SENSORS_I2C_END, SENSORS_I2C_END, \ - SENSORS_I2C_END, SENSORS_I2C_END, SENSORS_I2C_END, \ - SENSORS_I2C_END, SENSORS_I2C_END, SENSORS_I2C_END, \ - SENSORS_I2C_END, SENSORS_I2C_END, SENSORS_I2C_END} - -/* This is ugly. We need to evaluate SENSORS_MAX_OPTS before it is - stringified */ -#define SENSORS_MODPARM_AUX1(x) "1-" #x "h" -#define SENSORS_MODPARM_AUX(x) SENSORS_MODPARM_AUX1(x) -#define SENSORS_MODPARM SENSORS_MODPARM_AUX(SENSORS_MAX_OPTS) - -/* SENSORS_MODULE_PARM creates a module parameter, and puts it in the - module header */ -#define SENSORS_MODULE_PARM(var,desc) \ - static unsigned short var[SENSORS_MAX_OPTS] = SENSORS_DEFAULTS; \ - MODULE_PARM(var,SENSORS_MODPARM); \ - MODULE_PARM_DESC(var,desc) - -/* SENSORS_MODULE_PARM creates a 'force_*' module parameter, and puts it in - the module header */ #define SENSORS_MODULE_PARM_FORCE(name) \ - SENSORS_MODULE_PARM(force_ ## name, \ + I2C_CLIENT_MODULE_PARM(force_ ## name, \ "List of adapter,address pairs which are unquestionably" \ " assumed to contain a `" # name "' chip") /* This defines several insmod variables, and the addr_data structure */ #define SENSORS_INSMOD \ - SENSORS_MODULE_PARM(probe, \ + I2C_CLIENT_MODULE_PARM(probe, \ "List of adapter,address pairs to scan additionally"); \ - SENSORS_MODULE_PARM(probe_range, \ + I2C_CLIENT_MODULE_PARM(probe_range, \ "List of adapter,start-addr,end-addr triples to scan " \ "additionally"); \ - SENSORS_MODULE_PARM(ignore, \ + I2C_CLIENT_MODULE_PARM(ignore, \ "List of adapter,address pairs not to scan"); \ - SENSORS_MODULE_PARM(ignore_range, \ + I2C_CLIENT_MODULE_PARM(ignore_range, \ "List of adapter,start-addr,end-addr triples not to " \ "scan"); \ - static struct i2c_address_data addr_data = \ - {normal_i2c, normal_i2c_range, \ - normal_isa, normal_isa_range, \ - probe, probe_range, \ - ignore, ignore_range, \ - forces} + static struct i2c_address_data addr_data = { \ + .normal_i2c = normal_i2c, \ + .normal_i2c_range = normal_i2c_range, \ + .normal_isa = normal_isa, \ + .normal_isa_range = normal_isa_range, \ + .probe = probe, \ + .probe_range = probe_range, \ + .ignore = ignore, \ + .ignore_range = ignore_range, \ + .forces = forces, \ + } /* The following functions create an enum with the chip names as elements. The first element of the enum is any_chip. These are the only macros @@ -165,7 +126,7 @@ struct i2c_address_data { #define SENSORS_INSMOD_0 \ enum chips { any_chip }; \ - SENSORS_MODULE_PARM(force, \ + I2C_CLIENT_MODULE_PARM(force, \ "List of adapter,address pairs to boldly assume " \ "to be present"); \ static struct i2c_force_data forces[] = {{force,any_chip},{NULL}}; \ @@ -173,7 +134,7 @@ struct i2c_address_data { #define SENSORS_INSMOD_1(chip1) \ enum chips { any_chip, chip1 }; \ - SENSORS_MODULE_PARM(force, \ + I2C_CLIENT_MODULE_PARM(force, \ "List of adapter,address pairs to boldly assume " \ "to be present"); \ SENSORS_MODULE_PARM_FORCE(chip1); \ @@ -184,7 +145,7 @@ struct i2c_address_data { #define SENSORS_INSMOD_2(chip1,chip2) \ enum chips { any_chip, chip1, chip2 }; \ - SENSORS_MODULE_PARM(force, \ + I2C_CLIENT_MODULE_PARM(force, \ "List of adapter,address pairs to boldly assume " \ "to be present"); \ SENSORS_MODULE_PARM_FORCE(chip1); \ @@ -197,7 +158,7 @@ struct i2c_address_data { #define SENSORS_INSMOD_3(chip1,chip2,chip3) \ enum chips { any_chip, chip1, chip2, chip3 }; \ - SENSORS_MODULE_PARM(force, \ + I2C_CLIENT_MODULE_PARM(force, \ "List of adapter,address pairs to boldly assume " \ "to be present"); \ SENSORS_MODULE_PARM_FORCE(chip1); \ @@ -212,7 +173,7 @@ struct i2c_address_data { #define SENSORS_INSMOD_4(chip1,chip2,chip3,chip4) \ enum chips { any_chip, chip1, chip2, chip3, chip4 }; \ - SENSORS_MODULE_PARM(force, \ + I2C_CLIENT_MODULE_PARM(force, \ "List of adapter,address pairs to boldly assume " \ "to be present"); \ SENSORS_MODULE_PARM_FORCE(chip1); \ @@ -229,7 +190,7 @@ struct i2c_address_data { #define SENSORS_INSMOD_5(chip1,chip2,chip3,chip4,chip5) \ enum chips { any_chip, chip1, chip2, chip3, chip4, chip5 }; \ - SENSORS_MODULE_PARM(force, \ + I2C_CLIENT_MODULE_PARM(force, \ "List of adapter,address pairs to boldly assume " \ "to be present"); \ SENSORS_MODULE_PARM_FORCE(chip1); \ @@ -248,7 +209,7 @@ struct i2c_address_data { #define SENSORS_INSMOD_6(chip1,chip2,chip3,chip4,chip5,chip6) \ enum chips { any_chip, chip1, chip2, chip3, chip4, chip5, chip6 }; \ - SENSORS_MODULE_PARM(force, \ + I2C_CLIENT_MODULE_PARM(force, \ "List of adapter,address pairs to boldly assume " \ "to be present"); \ SENSORS_MODULE_PARM_FORCE(chip1); \ @@ -269,7 +230,7 @@ struct i2c_address_data { #define SENSORS_INSMOD_7(chip1,chip2,chip3,chip4,chip5,chip6,chip7) \ enum chips { any_chip, chip1, chip2, chip3, chip4, chip5, chip6, chip7 }; \ - SENSORS_MODULE_PARM(force, \ + I2C_CLIENT_MODULE_PARM(force, \ "List of adapter,address pairs to boldly assume " \ "to be present"); \ SENSORS_MODULE_PARM_FORCE(chip1); \ @@ -292,7 +253,7 @@ struct i2c_address_data { #define SENSORS_INSMOD_8(chip1,chip2,chip3,chip4,chip5,chip6,chip7,chip8) \ enum chips { any_chip, chip1, chip2, chip3, chip4, chip5, chip6, chip7, chip8 }; \ - SENSORS_MODULE_PARM(force, \ + I2C_CLIENT_MODULE_PARM(force, \ "List of adapter,address pairs to boldly assume " \ "to be present"); \ SENSORS_MODULE_PARM_FORCE(chip1); \ diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 1797afd7289a4..c506e41b93030 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -290,10 +290,12 @@ struct i2c_client_address_data { }; /* Internal numbers to terminate lists */ -#define I2C_CLIENT_END 0xfffe +#define I2C_CLIENT_END 0xfffe +#define I2C_CLIENT_ISA_END 0xfffefffe /* The numbers to use to set I2C bus address */ -#define ANY_I2C_BUS 0xffff +#define ANY_I2C_BUS 0xffff +#define ANY_I2C_ISA_BUS 9191 /* The length of the option lists */ #define I2C_CLIENT_MAX_OPTS 48 @@ -556,11 +558,15 @@ union i2c_smbus_data { I2C_CLIENT_MODULE_PARM(force, \ "List of adapter,address pairs to boldly assume " \ "to be present"); \ - static struct i2c_client_address_data addr_data = \ - {normal_i2c, normal_i2c_range, \ - probe, probe_range, \ - ignore, ignore_range, \ - force} + static struct i2c_client_address_data addr_data = { \ + .normal_i2c = normal_i2c, \ + .normal_i2c_range = normal_i2c_range, \ + .probe = probe, \ + .probe_range = probe_range, \ + .ignore = ignore, \ + .ignore_range = ignore_range, \ + .force = force, \ + } /* Detect whether we are on the isa bus. If this returns true, all i2c access will fail! */ -- 2.53.0