Commit 69735698 authored by Jean Delvare's avatar Jean Delvare Committed by Jean Delvare

i2c-ali1563: Improve the status messages

Improve the status messages printed by the i2c-ali1563 driver.
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Cc: Rudolf Marek <r.marek@assembler.cz>
parent ec2f9d13
...@@ -328,7 +328,6 @@ static int __devinit ali1563_setup(struct pci_dev * dev) ...@@ -328,7 +328,6 @@ static int __devinit ali1563_setup(struct pci_dev * dev)
u16 ctrl; u16 ctrl;
pci_read_config_word(dev,ALI1563_SMBBA,&ctrl); pci_read_config_word(dev,ALI1563_SMBBA,&ctrl);
printk("ali1563: SMBus control = %04x\n",ctrl);
/* Check if device is even enabled first */ /* Check if device is even enabled first */
if (!(ctrl & ALI1563_SMB_IOEN)) { if (!(ctrl & ALI1563_SMB_IOEN)) {
...@@ -353,9 +352,11 @@ static int __devinit ali1563_setup(struct pci_dev * dev) ...@@ -353,9 +352,11 @@ static int __devinit ali1563_setup(struct pci_dev * dev)
} }
if (!request_region(ali1563_smba, ALI1563_SMB_IOSIZE, if (!request_region(ali1563_smba, ALI1563_SMB_IOSIZE,
ali1563_pci_driver.name)) { ali1563_pci_driver.name)) {
dev_warn(&dev->dev,"Could not allocate I/O space"); dev_err(&dev->dev, "Could not allocate I/O space at 0x%04x\n",
ali1563_smba);
goto Err; goto Err;
} }
dev_info(&dev->dev, "Found ALi1563 SMBus at 0x%04x\n", ali1563_smba);
return 0; return 0;
Err: Err:
...@@ -384,13 +385,18 @@ static int __devinit ali1563_probe(struct pci_dev * dev, ...@@ -384,13 +385,18 @@ static int __devinit ali1563_probe(struct pci_dev * dev,
int error; int error;
if ((error = ali1563_setup(dev))) if ((error = ali1563_setup(dev)))
return error; goto exit;
ali1563_adapter.dev.parent = &dev->dev; ali1563_adapter.dev.parent = &dev->dev;
sprintf(ali1563_adapter.name,"SMBus ALi 1563 Adapter @ %04x", sprintf(ali1563_adapter.name,"SMBus ALi 1563 Adapter @ %04x",
ali1563_smba); ali1563_smba);
if ((error = i2c_add_adapter(&ali1563_adapter))) if ((error = i2c_add_adapter(&ali1563_adapter)))
ali1563_shutdown(dev); goto exit_shutdown;
printk("%s: Returning %d\n",__FUNCTION__,error); return 0;
exit_shutdown:
ali1563_shutdown(dev);
exit:
dev_warn(&dev->dev, "ALi1563 SMBus probe failed (%d)\n", error);
return error; return error;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment