diff options
Diffstat (limited to 'drivers/i2c/busses/i2c-keywest.c')
-rw-r--r-- | drivers/i2c/busses/i2c-keywest.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/i2c/busses/i2c-keywest.c b/drivers/i2c/busses/i2c-keywest.c index 94ae808314f7..37b49c2daf5f 100644 --- a/drivers/i2c/busses/i2c-keywest.c +++ b/drivers/i2c/busses/i2c-keywest.c | |||
@@ -87,12 +87,9 @@ static const char *__kw_state_names[] = { | |||
87 | }; | 87 | }; |
88 | #endif /* DEBUG */ | 88 | #endif /* DEBUG */ |
89 | 89 | ||
90 | static int probe; | ||
91 | |||
92 | MODULE_AUTHOR("Benjamin Herrenschmidt <benh@kernel.crashing.org>"); | 90 | MODULE_AUTHOR("Benjamin Herrenschmidt <benh@kernel.crashing.org>"); |
93 | MODULE_DESCRIPTION("I2C driver for Apple's Keywest"); | 91 | MODULE_DESCRIPTION("I2C driver for Apple's Keywest"); |
94 | MODULE_LICENSE("GPL"); | 92 | MODULE_LICENSE("GPL"); |
95 | module_param(probe, bool, 0); | ||
96 | 93 | ||
97 | #ifdef POLLED_MODE | 94 | #ifdef POLLED_MODE |
98 | /* Don't schedule, the g5 fan controller is too | 95 | /* Don't schedule, the g5 fan controller is too |
@@ -498,8 +495,6 @@ keywest_func(struct i2c_adapter * adapter) | |||
498 | 495 | ||
499 | /* For now, we only handle combined mode (smbus) */ | 496 | /* For now, we only handle combined mode (smbus) */ |
500 | static struct i2c_algorithm keywest_algorithm = { | 497 | static struct i2c_algorithm keywest_algorithm = { |
501 | .name = "Keywest i2c", | ||
502 | .id = I2C_ALGO_SMBUS, | ||
503 | .smbus_xfer = keywest_smbus_xfer, | 498 | .smbus_xfer = keywest_smbus_xfer, |
504 | .master_xfer = keywest_xfer, | 499 | .master_xfer = keywest_xfer, |
505 | .functionality = keywest_func, | 500 | .functionality = keywest_func, |
@@ -621,7 +616,6 @@ create_iface(struct device_node *np, struct device *dev) | |||
621 | sprintf(chan->adapter.name, "%s %d", np->parent->name, i); | 616 | sprintf(chan->adapter.name, "%s %d", np->parent->name, i); |
622 | chan->iface = iface; | 617 | chan->iface = iface; |
623 | chan->chan_no = i; | 618 | chan->chan_no = i; |
624 | chan->adapter.id = I2C_ALGO_SMBUS; | ||
625 | chan->adapter.algo = &keywest_algorithm; | 619 | chan->adapter.algo = &keywest_algorithm; |
626 | chan->adapter.algo_data = NULL; | 620 | chan->adapter.algo_data = NULL; |
627 | chan->adapter.client_register = NULL; | 621 | chan->adapter.client_register = NULL; |
@@ -635,15 +629,6 @@ create_iface(struct device_node *np, struct device *dev) | |||
635 | chan->adapter.name); | 629 | chan->adapter.name); |
636 | i2c_set_adapdata(&chan->adapter, NULL); | 630 | i2c_set_adapdata(&chan->adapter, NULL); |
637 | } | 631 | } |
638 | if (probe) { | ||
639 | printk("Probe: "); | ||
640 | for (addr = 0x00; addr <= 0x7f; addr++) { | ||
641 | if (i2c_smbus_xfer(&chan->adapter,addr, | ||
642 | 0,0,0,I2C_SMBUS_QUICK,NULL) >= 0) | ||
643 | printk("%02x ", addr); | ||
644 | } | ||
645 | printk("\n"); | ||
646 | } | ||
647 | } | 632 | } |
648 | 633 | ||
649 | printk(KERN_INFO "Found KeyWest i2c on \"%s\", %d channel%s, stepping: %d bits\n", | 634 | printk(KERN_INFO "Found KeyWest i2c on \"%s\", %d channel%s, stepping: %d bits\n", |