Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
hwmon/w83627ehf: Don't redefine REGION_OFFSET
On ia64, kernel headers define REGION_OFFSET so we can't use that.
Reported by Andrew Morton.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: David Hubbard <david.c.hubbard@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
authored by
Jean Delvare
and committed by
Linus Torvalds
1a641fce
179fb0c7
+7
-7
+7
-7
drivers/hwmon/w83627ehf.c
+7
-7
drivers/hwmon/w83627ehf.c
···
121
121
* ISA constants
122
122
*/
123
123
124
-
#define REGION_ALIGNMENT ~7
125
-
#define REGION_OFFSET 5
126
-
#define REGION_LENGTH 2
124
+
#define IOREGION_ALIGNMENT ~7
125
+
#define IOREGION_OFFSET 5
126
+
#define IOREGION_LENGTH 2
127
127
#define ADDR_REG_OFFSET 5
128
128
#define DATA_REG_OFFSET 6
129
129
···
1194
1194
u8 fan4pin, fan5pin;
1195
1195
int i, err = 0;
1196
1196
1197
-
if (!request_region(address + REGION_OFFSET, REGION_LENGTH,
1197
+
if (!request_region(address + IOREGION_OFFSET, IOREGION_LENGTH,
1198
1198
w83627ehf_driver.driver.name)) {
1199
1199
err = -EBUSY;
1200
1200
goto exit;
···
1322
1322
exit_free:
1323
1323
kfree(data);
1324
1324
exit_release:
1325
-
release_region(address + REGION_OFFSET, REGION_LENGTH);
1325
+
release_region(address + IOREGION_OFFSET, IOREGION_LENGTH);
1326
1326
exit:
1327
1327
return err;
1328
1328
}
···
1337
1337
1338
1338
if ((err = i2c_detach_client(client)))
1339
1339
return err;
1340
-
release_region(client->addr + REGION_OFFSET, REGION_LENGTH);
1340
+
release_region(client->addr + IOREGION_OFFSET, IOREGION_LENGTH);
1341
1341
kfree(data);
1342
1342
1343
1343
return 0;
···
1380
1380
superio_select(W83627EHF_LD_HWM);
1381
1381
val = (superio_inb(SIO_REG_ADDR) << 8)
1382
1382
| superio_inb(SIO_REG_ADDR + 1);
1383
-
*addr = val & REGION_ALIGNMENT;
1383
+
*addr = val & IOREGION_ALIGNMENT;
1384
1384
if (*addr == 0) {
1385
1385
superio_exit();
1386
1386
return -ENODEV;