Commit c06f50ed authored by Sven Peter's avatar Sven Peter Committed by Wolfram Sang
Browse files

i2c: pasemi: Remove usage of pci_dev



Prepare to create a platform driver by removing all usages of pci_dev we
can.

Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarSven Peter <sven@svenpeter.dev>
Acked-by: default avatarOlof Johansson <olof@lixom.net>
Tested-by: default avatarChristian Zigotzky <chzigotzky@xenosoft.de>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent 07e820d4
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@
static struct pci_driver pasemi_smb_driver;

struct pasemi_smbus {
	struct pci_dev		*dev;
	struct device           *dev;
	struct i2c_adapter	 adapter;
	void __iomem		*ioaddr;
	unsigned long		 base;
@@ -52,7 +52,7 @@ struct pasemi_smbus {

static inline void reg_write(struct pasemi_smbus *smbus, int reg, int val)
{
	dev_dbg(&smbus->dev->dev, "smbus write reg %lx val %08x\n",
	dev_dbg(smbus->dev, "smbus write reg %lx val %08x\n",
		smbus->base + reg, val);
	iowrite32(val, smbus->ioaddr + reg);
}
@@ -61,7 +61,7 @@ static inline int reg_read(struct pasemi_smbus *smbus, int reg)
{
	int ret;
	ret = ioread32(smbus->ioaddr + reg);
	dev_dbg(&smbus->dev->dev, "smbus read reg %lx val %08x\n",
	dev_dbg(smbus->dev, "smbus read reg %lx val %08x\n",
		smbus->base + reg, ret);
	return ret;
}
@@ -94,7 +94,7 @@ static int pasemi_smb_waitready(struct pasemi_smbus *smbus)
		return -ENXIO;

	if (timeout < 0) {
		dev_warn(&smbus->dev->dev, "Timeout, status 0x%08x\n", status);
		dev_warn(smbus->dev, "Timeout, status 0x%08x\n", status);
		reg_write(smbus, REG_SMSTA, status);
		return -ETIME;
	}
@@ -342,7 +342,7 @@ static int pasemi_smb_probe(struct pci_dev *dev,
	if (!smbus)
		return -ENOMEM;

	smbus->dev = dev;
	smbus->dev = &dev->dev;
	smbus->base = pci_resource_start(dev, 0);
	smbus->size = pci_resource_len(dev, 0);

@@ -366,7 +366,7 @@ static int pasemi_smb_probe(struct pci_dev *dev,
	smbus->adapter.algo_data = smbus;

	/* set up the sysfs linkage to our parent device */
	smbus->adapter.dev.parent = &dev->dev;
	smbus->adapter.dev.parent = smbus->dev;

	reg_write(smbus, REG_CTL, (CTL_MTR | CTL_MRR |
		  (CLK_100K_DIV & CTL_CLK_M)));