Commit 4f02f8220562591322c118d07a32bebf705318b7
Exists in
master
and in
7 other branches
Merge branch 'smsc47b397-new-id' into release
Showing 1 changed file Side-by-side Diff
drivers/hwmon/smsc47b397.c
| ... | ... | @@ -335,11 +335,23 @@ |
| 335 | 335 | static int __init smsc47b397_find(unsigned short *addr) |
| 336 | 336 | { |
| 337 | 337 | u8 id, rev; |
| 338 | + char *name; | |
| 338 | 339 | |
| 339 | 340 | superio_enter(); |
| 340 | 341 | id = force_id ? force_id : superio_inb(SUPERIO_REG_DEVID); |
| 341 | 342 | |
| 342 | - if ((id != 0x6f) && (id != 0x81) && (id != 0x85)) { | |
| 343 | + switch(id) { | |
| 344 | + case 0x81: | |
| 345 | + name = "SCH5307-NS"; | |
| 346 | + break; | |
| 347 | + case 0x6f: | |
| 348 | + name = "LPC47B397-NC"; | |
| 349 | + break; | |
| 350 | + case 0x85: | |
| 351 | + case 0x8c: | |
| 352 | + name = "SCH5317"; | |
| 353 | + break; | |
| 354 | + default: | |
| 343 | 355 | superio_exit(); |
| 344 | 356 | return -ENODEV; |
| 345 | 357 | } |
| ... | ... | @@ -352,8 +364,7 @@ |
| 352 | 364 | |
| 353 | 365 | printk(KERN_INFO DRVNAME ": found SMSC %s " |
| 354 | 366 | "(base address 0x%04x, revision %u)\n", |
| 355 | - id == 0x81 ? "SCH5307-NS" : id == 0x85 ? "SCH5317" : | |
| 356 | - "LPC47B397-NC", *addr, rev); | |
| 367 | + name, *addr, rev); | |
| 357 | 368 | |
| 358 | 369 | superio_exit(); |
| 359 | 370 | return 0; |