git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
i2c
/
busses
/
i2c-ali15x3.c
diff --git
a/drivers/i2c/busses/i2c-ali15x3.c
b/drivers/i2c/busses/i2c-ali15x3.c
index
ef4a625
..
5bd6a4a
100644
(file)
--- a/
drivers/i2c/busses/i2c-ali15x3.c
+++ b/
drivers/i2c/busses/i2c-ali15x3.c
@@
-126,8
+126,8
@@
/* If force_addr is set to anything different from 0, we forcibly enable
the device at the given address. */
/* If force_addr is set to anything different from 0, we forcibly enable
the device at the given address. */
-static
int
force_addr = 0;
-
MODULE_PARM(force_addr, "i"
);
+static
u16
force_addr = 0;
+
module_param(force_addr, ushort, 0
);
MODULE_PARM_DESC(force_addr,
"Initialize the base address of the i2c controller");
MODULE_PARM_DESC(force_addr,
"Initialize the base address of the i2c controller");
@@
-477,15
+477,12
@@
static struct i2c_adapter ali15x3_adapter = {
};
static struct pci_device_id ali15x3_ids[] = {
};
static struct pci_device_id ali15x3_ids[] = {
- {
- .vendor = PCI_VENDOR_ID_AL,
- .device = PCI_DEVICE_ID_AL_M7101,
- .subvendor = PCI_ANY_ID,
- .subdevice = PCI_ANY_ID,
- },
+ { PCI_DEVICE(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101) },
{ 0, }
};
{ 0, }
};
+MODULE_DEVICE_TABLE (pci, ali15x3_ids);
+
static int __devinit ali15x3_probe(struct pci_dev *dev, const struct pci_device_id *id)
{
if (ali15x3_setup(dev)) {
static int __devinit ali15x3_probe(struct pci_dev *dev, const struct pci_device_id *id)
{
if (ali15x3_setup(dev)) {
@@
-509,7
+506,7
@@
static void __devexit ali15x3_remove(struct pci_dev *dev)
}
static struct pci_driver ali15x3_driver = {
}
static struct pci_driver ali15x3_driver = {
- .name = "ali15x3
smbus",
+ .name = "ali15x3
_
smbus",
.id_table = ali15x3_ids,
.probe = ali15x3_probe,
.remove = __devexit_p(ali15x3_remove),
.id_table = ali15x3_ids,
.probe = ali15x3_probe,
.remove = __devexit_p(ali15x3_remove),
@@
-517,7
+514,7
@@
static struct pci_driver ali15x3_driver = {
static int __init i2c_ali15x3_init(void)
{
static int __init i2c_ali15x3_init(void)
{
- return pci_
module_init
(&ali15x3_driver);
+ return pci_
register_driver
(&ali15x3_driver);
}
static void __exit i2c_ali15x3_exit(void)
}
static void __exit i2c_ali15x3_exit(void)