leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i2c: i801: Use managed pcim_* PCI device initialization and reservation

Browse Source 
Simplifies the code a bit and makes easier to disable PCI device on driver
detach by removing the pcim_pin_device() call in the future if needed.

Reason why i2c-i801.c doesn't ever call pci_disable_device() was because it
made some systems to hang during power-off. See commit d6fcb3b9cf
("[PATCH] i2c-i801.c: don't pci_disable_device() after it was just enabled")
and
http://marc.info/?l=linux-kernel&m=115160053309535&w=2

Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Reviewed-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
Jarkko Nikula 2015-02-13 15:52:25 +02:00 committed by Wolfram Sang
parent f85da3f5de
commit fef220da43
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/i2c/busses/i2c-i801.c
View File

@ -1180,35 +1180,35 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
} }
priv->features &= ~disable_features; priv->features &= ~disable_features;
err = pci_enable_device(dev); err = pcim_enable_device(dev);
if (err) { if (err) {
dev_err(&dev->dev, "Failed to enable SMBus PCI device (%d)\n", dev_err(&dev->dev, "Failed to enable SMBus PCI device (%d)\n",
err); err);
goto exit; return err;
} }
pcim_pin_device(dev);
/* Determine the address of the SMBus area */ /* Determine the address of the SMBus area */
priv->smba = pci_resource_start(dev, SMBBAR); priv->smba = pci_resource_start(dev, SMBBAR);
if (!priv->smba) { if (!priv->smba) {
dev_err(&dev->dev, dev_err(&dev->dev,
"SMBus base address uninitialized, upgrade BIOS\n"); "SMBus base address uninitialized, upgrade BIOS\n");
err = -ENODEV; return -ENODEV;
goto exit;
} }
err = acpi_check_resource_conflict(&dev->resource[SMBBAR]); err = acpi_check_resource_conflict(&dev->resource[SMBBAR]);
if (err) { if (err) {
err = -ENODEV; return -ENODEV;
goto exit;
} }
err = pci_request_region(dev, SMBBAR, dev_driver_string(&dev->dev)); err = pcim_iomap_regions(dev, 1 << SMBBAR,
dev_driver_string(&dev->dev));
if (err) { if (err) {
dev_err(&dev->dev, dev_err(&dev->dev,
"Failed to request SMBus region 0x%lx-0x%Lx\n", "Failed to request SMBus region 0x%lx-0x%Lx\n",
priv->smba, priv->smba,
(unsigned long long)pci_resource_end(dev, SMBBAR)); (unsigned long long)pci_resource_end(dev, SMBBAR));
goto exit; return err;
} }
pci_read_config_byte(priv->pci_dev, SMBHSTCFG, &temp); pci_read_config_byte(priv->pci_dev, SMBHSTCFG, &temp);
@ -1276,7 +1276,7 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
err = i2c_add_adapter(&priv->adapter); err = i2c_add_adapter(&priv->adapter);
if (err) { if (err) {
dev_err(&dev->dev, "Failed to add SMBus adapter\n"); dev_err(&dev->dev, "Failed to add SMBus adapter\n");
goto exit_release; return err;
} }
i801_probe_optional_slaves(priv); i801_probe_optional_slaves(priv);
@ -1286,11 +1286,6 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
pci_set_drvdata(dev, priv); pci_set_drvdata(dev, priv);
return 0; return 0;
exit_release:
pci_release_region(dev, SMBBAR);
exit:
return err;
} }
static void i801_remove(struct pci_dev *dev) static void i801_remove(struct pci_dev *dev)
@ -1301,8 +1296,6 @@ static void i801_remove(struct pci_dev *dev)
i2c_del_adapter(&priv->adapter); i2c_del_adapter(&priv->adapter);
pci_write_config_byte(dev, SMBHSTCFG, priv->original_hstcfg); pci_write_config_byte(dev, SMBHSTCFG, priv->original_hstcfg);
pci_release_region(dev, SMBBAR);
/* /*
* do not call pci_disable_device(dev) since it can cause hard hangs on * do not call pci_disable_device(dev) since it can cause hard hangs on
* some systems during power-off (eg. Fujitsu-Siemens Lifebook E8010) * some systems during power-off (eg. Fujitsu-Siemens Lifebook E8010)