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

i2c: pasemi: Refactor _probe to use devm_*

Browse Source 
Using managed device resources means there's nothing left to be done in
pasemi_smb_pci_remove and also allows to remove base and size from
struct pasemi_smbus.

Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Sven Peter <sven@svenpeter.dev>
Acked-by: Olof Johansson <olof@lixom.net>
Tested-by: Christian Zigotzky <chzigotzky@xenosoft.de>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
This commit is contained in:
Sven Peter 2021-10-08 18:35:30 +02:00 committed by Wolfram Sang
parent fd664ab231
commit a2c34bfd2c
3 changed files with 15 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/i2c/busses/i2c-pasemi-core.c
View File

@ -41,8 +41,7 @@
static inline void reg_write(struct pasemi_smbus *smbus, int reg, int val) static inline void reg_write(struct pasemi_smbus *smbus, int reg, int val)
{ {
dev_dbg(smbus->dev, "smbus write reg %lx val %08x\n", dev_dbg(smbus->dev, "smbus write reg %x val %08x\n", reg, val);
smbus->base + reg, val);
iowrite32(val, smbus->ioaddr + reg); iowrite32(val, smbus->ioaddr + reg);
} }
@ -50,8 +49,7 @@ static inline int reg_read(struct pasemi_smbus *smbus, int reg)
{ {
int ret; int ret;
ret = ioread32(smbus->ioaddr + reg); ret = ioread32(smbus->ioaddr + reg);
dev_dbg(smbus->dev, "smbus read reg %lx val %08x\n", dev_dbg(smbus->dev, "smbus read reg %x val %08x\n", reg, ret);
smbus->base + reg, ret);
return ret; return ret;
} }
@ -339,7 +337,7 @@ int pasemi_i2c_common_probe(struct pasemi_smbus *smbus)
pasemi_reset(smbus); pasemi_reset(smbus);
error = i2c_add_adapter(&smbus->adapter); error = devm_i2c_add_adapter(smbus->dev, &smbus->adapter);
if (error) if (error)
return error; return error;

2
drivers/i2c/busses/i2c-pasemi-core.h
View File

@ -12,8 +12,6 @@ struct pasemi_smbus {
struct device *dev; struct device *dev;
struct i2c_adapter adapter; struct i2c_adapter adapter;
void __iomem *ioaddr; void __iomem *ioaddr;
unsigned long base;
int size;
unsigned int clk_div; unsigned int clk_div;
}; };

45
drivers/i2c/busses/i2c-pasemi-pci.c
View File

@ -26,57 +26,37 @@ static int pasemi_smb_pci_probe(struct pci_dev *dev,
const struct pci_device_id *id) const struct pci_device_id *id)
{ {
struct pasemi_smbus *smbus; struct pasemi_smbus *smbus;
unsigned long base;
int size;
int error; int error;
if (!(pci_resource_flags(dev, 0) & IORESOURCE_IO)) if (!(pci_resource_flags(dev, 0) & IORESOURCE_IO))
return -ENODEV; return -ENODEV;
smbus = kzalloc(sizeof(struct pasemi_smbus), GFP_KERNEL); smbus = devm_kzalloc(&dev->dev, sizeof(*smbus), GFP_KERNEL);
if (!smbus) if (!smbus)
return -ENOMEM; return -ENOMEM;
smbus->dev = &dev->dev; smbus->dev = &dev->dev;
smbus->base = pci_resource_start(dev, 0); base = pci_resource_start(dev, 0);
smbus->size = pci_resource_len(dev, 0); size = pci_resource_len(dev, 0);
smbus->clk_div = CLK_100K_DIV; smbus->clk_div = CLK_100K_DIV;
if (!request_region(smbus->base, smbus->size, if (!devm_request_region(&dev->dev, base, size,
pasemi_smb_pci_driver.name)) { pasemi_smb_pci_driver.name))
error = -EBUSY; return -EBUSY;
goto out_kfree;
}
smbus->ioaddr = pci_iomap(dev, 0, 0); smbus->ioaddr = pcim_iomap(dev, 0, 0);
if (!smbus->ioaddr) { if (!smbus->ioaddr)
error = -EBUSY; return -EBUSY;
goto out_release_region;
}
error = pasemi_i2c_common_probe(smbus); error = pasemi_i2c_common_probe(smbus);
if (error) if (error)
goto out_ioport_unmap; return error;
pci_set_drvdata(dev, smbus); pci_set_drvdata(dev, smbus);
return 0; return 0;
out_ioport_unmap:
pci_iounmap(dev, smbus->ioaddr);
out_release_region:
release_region(smbus->base, smbus->size);
out_kfree:
kfree(smbus);
return error;
}
static void pasemi_smb_pci_remove(struct pci_dev *dev)
{
struct pasemi_smbus *smbus = pci_get_drvdata(dev);
i2c_del_adapter(&smbus->adapter);
pci_iounmap(dev, smbus->ioaddr);
release_region(smbus->base, smbus->size);
kfree(smbus);
} }
static const struct pci_device_id pasemi_smb_pci_ids[] = { static const struct pci_device_id pasemi_smb_pci_ids[] = {
@ -90,7 +70,6 @@ static struct pci_driver pasemi_smb_pci_driver = {
.name = "i2c-pasemi", .name = "i2c-pasemi",
.id_table = pasemi_smb_pci_ids, .id_table = pasemi_smb_pci_ids,
.probe = pasemi_smb_pci_probe, .probe = pasemi_smb_pci_probe,
.remove = pasemi_smb_pci_remove,
}; };
module_pci_driver(pasemi_smb_pci_driver); module_pci_driver(pasemi_smb_pci_driver);