git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bkl-removal' into next
[pandora-kernel.git]
/
drivers
/
i2c
/
busses
/
i2c-pmcmsp.c
diff --git
a/drivers/i2c/busses/i2c-pmcmsp.c
b/drivers/i2c/busses/i2c-pmcmsp.c
index
b03af56
..
dcf2045
100644
(file)
--- a/
drivers/i2c/busses/i2c-pmcmsp.c
+++ b/
drivers/i2c/busses/i2c-pmcmsp.c
@@
-467,7
+467,7
@@
static enum pmcmsptwi_xfer_result pmcmsptwi_xfer_cmd(
(cmd->read_len == 0 || cmd->write_len == 0))) {
dev_err(&pmcmsptwi_adapter.dev,
"%s: Cannot transfer less than 1 byte\n",
(cmd->read_len == 0 || cmd->write_len == 0))) {
dev_err(&pmcmsptwi_adapter.dev,
"%s: Cannot transfer less than 1 byte\n",
- __
FUNCTION
__);
+ __
func
__);
return -EINVAL;
}
return -EINVAL;
}
@@
-475,7
+475,7
@@
static enum pmcmsptwi_xfer_result pmcmsptwi_xfer_cmd(
cmd->write_len > MSP_MAX_BYTES_PER_RW) {
dev_err(&pmcmsptwi_adapter.dev,
"%s: Cannot transfer more than %d bytes\n",
cmd->write_len > MSP_MAX_BYTES_PER_RW) {
dev_err(&pmcmsptwi_adapter.dev,
"%s: Cannot transfer more than %d bytes\n",
- __
FUNCTION
__, MSP_MAX_BYTES_PER_RW);
+ __
func
__, MSP_MAX_BYTES_PER_RW);
return -EINVAL;
}
return -EINVAL;
}
@@
-622,11
+622,14
@@
static struct i2c_algorithm pmcmsptwi_algo = {
static struct i2c_adapter pmcmsptwi_adapter = {
.owner = THIS_MODULE,
static struct i2c_adapter pmcmsptwi_adapter = {
.owner = THIS_MODULE,
- .class = I2C_CLASS_HWMON,
+ .class = I2C_CLASS_HWMON
| I2C_CLASS_SPD
,
.algo = &pmcmsptwi_algo,
.name = DRV_NAME,
};
.algo = &pmcmsptwi_algo,
.name = DRV_NAME,
};
+/* work with hotplug and coldplug */
+MODULE_ALIAS("platform:" DRV_NAME);
+
static struct platform_driver pmcmsptwi_driver = {
.probe = pmcmsptwi_probe,
.remove = __devexit_p(pmcmsptwi_remove),
static struct platform_driver pmcmsptwi_driver = {
.probe = pmcmsptwi_probe,
.remove = __devexit_p(pmcmsptwi_remove),