From: Craig Kelley <[email protected]>
Added a new ID (0x8c) for the smsc47b397 hardware monitor driver.
This ID is used by HP in, at least, their dc7700 line.
Signed-off-by: Craig Kelley <[email protected]>
---
--- drivers/hwmon/smsc47b397.c-orig 2008-02-29 07:54:18.000000000 -0800
+++ drivers/hwmon/smsc47b397.c 2008-02-29 07:53:00.000000000 -0800
@@ -331,11 +331,23 @@ exit:
static int __init smsc47b397_find(unsigned short *addr)
{
u8 id, rev;
+ char *name;
superio_enter();
id = superio_inb(SUPERIO_REG_DEVID);
- if ((id != 0x6f) && (id != 0x81) && (id != 0x85)) {
+ switch(id) {
+ case 0x81:
+ name = "SCH5307-NS";
+ break;
+ case 0x6f:
+ name = "LPC47B397-NC";
+ break;
+ case 0x85:
+ case 0x8c:
+ name = "SCH5317";
+ break;
+ default:
superio_exit();
return -ENODEV;
}
@@ -348,8 +360,7 @@ static int __init smsc47b397_find(unsign
printk(KERN_INFO DRVNAME ": found SMSC %s "
"(base address 0x%04x, revision %u)\n",
- id == 0x81 ? "SCH5307-NS" : id == 0x85 ? "SCH5317" :
- "LPC47B397-NC", *addr, rev);
+ name, *addr, rev);
superio_exit();
return 0;
Hi Craig:
* Craig Kelley <[email protected]> [2008-02-29 10:24:44 -0700]:
> From: Craig Kelley <[email protected]>
>
> Added a new ID (0x8c) for the smsc47b397 hardware monitor driver.
> This ID is used by HP in, at least, their dc7700 line.
>
> Signed-off-by: Craig Kelley <[email protected]>
> ---
>
> --- drivers/hwmon/smsc47b397.c-orig 2008-02-29 07:54:18.000000000 -0800
> +++ drivers/hwmon/smsc47b397.c 2008-02-29 07:53:00.000000000 -0800
> @@ -331,11 +331,23 @@ exit:
> static int __init smsc47b397_find(unsigned short *addr)
> {
> u8 id, rev;
> + char *name;
>
> superio_enter();
> id = superio_inb(SUPERIO_REG_DEVID);
>
> - if ((id != 0x6f) && (id != 0x81) && (id != 0x85)) {
> + switch(id) {
> + case 0x81:
> + name = "SCH5307-NS";
> + break;
> + case 0x6f:
> + name = "LPC47B397-NC";
> + break;
> + case 0x85:
> + case 0x8c:
> + name = "SCH5317";
> + break;
> + default:
> superio_exit();
> return -ENODEV;
> }
> @@ -348,8 +360,7 @@ static int __init smsc47b397_find(unsign
>
> printk(KERN_INFO DRVNAME ": found SMSC %s "
> "(base address 0x%04x, revision %u)\n",
> - id == 0x81 ? "SCH5307-NS" : id == 0x85 ? "SCH5317" :
> - "LPC47B397-NC", *addr, rev);
> + name, *addr, rev);
>
> superio_exit();
> return 0;
Some problems with this patch...
1) The whitespace is all busted (spaces where tabs should be).
Did you copy-paste this patch into your mailer?
2) This patch requires 'patch -p0' to apply, whereas standard practice
for Linux kernel patches is to use 'patch -p1'.
3) It's not obvious: to which revision does this patch apply?
Despite these problems, I fixed it up and applied it to my testing
branch... so the change will get to Linus after 2.6.25 is final.
You can find the result here:
http://lm-sensors.org/kernel?p=kernel/mhoffman/hwmon-2.6.git;a=shortlog;h=testing
I try to cut some slack for first-time patch submitters (not to mention
former customers, heh). But next time, please try to check those things
above before you send a patch.
Thanks & regards,
--
Mark M. Hoffman
[email protected]