i2c: pasemi: Split pci driver to its own file
authorSven Peter <sven@svenpeter.dev>
Fri, 8 Oct 2021 16:35:27 +0000 (18:35 +0200)
committerWolfram Sang <wsa@kernel.org>
Mon, 11 Oct 2021 09:45:16 +0000 (11:45 +0200)
Split off the PCI driver so that we can reuse common code for the
platform driver.

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>
drivers/i2c/busses/Makefile
drivers/i2c/busses/i2c-pasemi-core.c [new file with mode: 0644]
drivers/i2c/busses/i2c-pasemi-core.h [new file with mode: 0644]
drivers/i2c/busses/i2c-pasemi-pci.c [new file with mode: 0644]
drivers/i2c/busses/i2c-pasemi.c [deleted file]

index 1336b04f40e2a6e0ea4b8cb7d4cc796d65028c02..0ab1b4cb2228a175c85d8e286ebabf50be89738d 100644 (file)
@@ -84,6 +84,7 @@ obj-$(CONFIG_I2C_NPCM7XX)     += i2c-npcm7xx.o
 obj-$(CONFIG_I2C_OCORES)       += i2c-ocores.o
 obj-$(CONFIG_I2C_OMAP)         += i2c-omap.o
 obj-$(CONFIG_I2C_OWL)          += i2c-owl.o
+i2c-pasemi-objs := i2c-pasemi-core.o i2c-pasemi-pci.o
 obj-$(CONFIG_I2C_PASEMI)       += i2c-pasemi.o
 obj-$(CONFIG_I2C_PCA_PLATFORM) += i2c-pca-platform.o
 obj-$(CONFIG_I2C_PNX)          += i2c-pnx.o
diff --git a/drivers/i2c/busses/i2c-pasemi-core.c b/drivers/i2c/busses/i2c-pasemi-core.c
new file mode 100644 (file)
index 0000000..d1cab11
--- /dev/null
@@ -0,0 +1,346 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (C) 2006-2007 PA Semi, Inc
+ *
+ * SMBus host driver for PA Semi PWRficient
+ */
+
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/kernel.h>
+#include <linux/stddef.h>
+#include <linux/sched.h>
+#include <linux/i2c.h>
+#include <linux/delay.h>
+#include <linux/slab.h>
+#include <linux/io.h>
+
+#include "i2c-pasemi-core.h"
+
+/* Register offsets */
+#define REG_MTXFIFO    0x00
+#define REG_MRXFIFO    0x04
+#define REG_SMSTA      0x14
+#define REG_CTL                0x1c
+
+/* Register defs */
+#define MTXFIFO_READ   0x00000400
+#define MTXFIFO_STOP   0x00000200
+#define MTXFIFO_START  0x00000100
+#define MTXFIFO_DATA_M 0x000000ff
+
+#define MRXFIFO_EMPTY  0x00000100
+#define MRXFIFO_DATA_M 0x000000ff
+
+#define SMSTA_XEN      0x08000000
+#define SMSTA_MTN      0x00200000
+
+#define CTL_MRR                0x00000400
+#define CTL_MTR                0x00000200
+#define CTL_CLK_M      0x000000ff
+
+#define CLK_100K_DIV   84
+#define CLK_400K_DIV   21
+
+static inline void reg_write(struct pasemi_smbus *smbus, int reg, int val)
+{
+       dev_dbg(smbus->dev, "smbus write reg %lx val %08x\n",
+               smbus->base + reg, val);
+       iowrite32(val, smbus->ioaddr + reg);
+}
+
+static inline int reg_read(struct pasemi_smbus *smbus, int reg)
+{
+       int ret;
+       ret = ioread32(smbus->ioaddr + reg);
+       dev_dbg(smbus->dev, "smbus read reg %lx val %08x\n",
+               smbus->base + reg, ret);
+       return ret;
+}
+
+#define TXFIFO_WR(smbus, reg)  reg_write((smbus), REG_MTXFIFO, (reg))
+#define RXFIFO_RD(smbus)       reg_read((smbus), REG_MRXFIFO)
+
+static void pasemi_smb_clear(struct pasemi_smbus *smbus)
+{
+       unsigned int status;
+
+       status = reg_read(smbus, REG_SMSTA);
+       reg_write(smbus, REG_SMSTA, status);
+}
+
+static int pasemi_smb_waitready(struct pasemi_smbus *smbus)
+{
+       int timeout = 10;
+       unsigned int status;
+
+       status = reg_read(smbus, REG_SMSTA);
+
+       while (!(status & SMSTA_XEN) && timeout--) {
+               msleep(1);
+               status = reg_read(smbus, REG_SMSTA);
+       }
+
+       /* Got NACK? */
+       if (status & SMSTA_MTN)
+               return -ENXIO;
+
+       if (timeout < 0) {
+               dev_warn(smbus->dev, "Timeout, status 0x%08x\n", status);
+               reg_write(smbus, REG_SMSTA, status);
+               return -ETIME;
+       }
+
+       /* Clear XEN */
+       reg_write(smbus, REG_SMSTA, SMSTA_XEN);
+
+       return 0;
+}
+
+static int pasemi_i2c_xfer_msg(struct i2c_adapter *adapter,
+                              struct i2c_msg *msg, int stop)
+{
+       struct pasemi_smbus *smbus = adapter->algo_data;
+       int read, i, err;
+       u32 rd;
+
+       read = msg->flags & I2C_M_RD ? 1 : 0;
+
+       TXFIFO_WR(smbus, MTXFIFO_START | i2c_8bit_addr_from_msg(msg));
+
+       if (read) {
+               TXFIFO_WR(smbus, msg->len | MTXFIFO_READ |
+                                (stop ? MTXFIFO_STOP : 0));
+
+               err = pasemi_smb_waitready(smbus);
+               if (err)
+                       goto reset_out;
+
+               for (i = 0; i < msg->len; i++) {
+                       rd = RXFIFO_RD(smbus);
+                       if (rd & MRXFIFO_EMPTY) {
+                               err = -ENODATA;
+                               goto reset_out;
+                       }
+                       msg->buf[i] = rd & MRXFIFO_DATA_M;
+               }
+       } else {
+               for (i = 0; i < msg->len - 1; i++)
+                       TXFIFO_WR(smbus, msg->buf[i]);
+
+               TXFIFO_WR(smbus, msg->buf[msg->len-1] |
+                         (stop ? MTXFIFO_STOP : 0));
+       }
+
+       return 0;
+
+ reset_out:
+       reg_write(smbus, REG_CTL, (CTL_MTR | CTL_MRR |
+                 (CLK_100K_DIV & CTL_CLK_M)));
+       return err;
+}
+
+static int pasemi_i2c_xfer(struct i2c_adapter *adapter,
+                          struct i2c_msg *msgs, int num)
+{
+       struct pasemi_smbus *smbus = adapter->algo_data;
+       int ret, i;
+
+       pasemi_smb_clear(smbus);
+
+       ret = 0;
+
+       for (i = 0; i < num && !ret; i++)
+               ret = pasemi_i2c_xfer_msg(adapter, &msgs[i], (i == (num - 1)));
+
+       return ret ? ret : num;
+}
+
+static int pasemi_smb_xfer(struct i2c_adapter *adapter,
+               u16 addr, unsigned short flags, char read_write, u8 command,
+               int size, union i2c_smbus_data *data)
+{
+       struct pasemi_smbus *smbus = adapter->algo_data;
+       unsigned int rd;
+       int read_flag, err;
+       int len = 0, i;
+
+       /* All our ops take 8-bit shifted addresses */
+       addr <<= 1;
+       read_flag = read_write == I2C_SMBUS_READ;
+
+       pasemi_smb_clear(smbus);
+
+       switch (size) {
+       case I2C_SMBUS_QUICK:
+               TXFIFO_WR(smbus, addr | read_flag | MTXFIFO_START |
+                         MTXFIFO_STOP);
+               break;
+       case I2C_SMBUS_BYTE:
+               TXFIFO_WR(smbus, addr | read_flag | MTXFIFO_START);
+               if (read_write)
+                       TXFIFO_WR(smbus, 1 | MTXFIFO_STOP | MTXFIFO_READ);
+               else
+                       TXFIFO_WR(smbus, MTXFIFO_STOP | command);
+               break;
+       case I2C_SMBUS_BYTE_DATA:
+               TXFIFO_WR(smbus, addr | MTXFIFO_START);
+               TXFIFO_WR(smbus, command);
+               if (read_write) {
+                       TXFIFO_WR(smbus, addr | I2C_SMBUS_READ | MTXFIFO_START);
+                       TXFIFO_WR(smbus, 1 | MTXFIFO_READ | MTXFIFO_STOP);
+               } else {
+                       TXFIFO_WR(smbus, MTXFIFO_STOP | data->byte);
+               }
+               break;
+       case I2C_SMBUS_WORD_DATA:
+               TXFIFO_WR(smbus, addr | MTXFIFO_START);
+               TXFIFO_WR(smbus, command);
+               if (read_write) {
+                       TXFIFO_WR(smbus, addr | I2C_SMBUS_READ | MTXFIFO_START);
+                       TXFIFO_WR(smbus, 2 | MTXFIFO_READ | MTXFIFO_STOP);
+               } else {
+                       TXFIFO_WR(smbus, data->word & MTXFIFO_DATA_M);
+                       TXFIFO_WR(smbus, MTXFIFO_STOP | (data->word >> 8));
+               }
+               break;
+       case I2C_SMBUS_BLOCK_DATA:
+               TXFIFO_WR(smbus, addr | MTXFIFO_START);
+               TXFIFO_WR(smbus, command);
+               if (read_write) {
+                       TXFIFO_WR(smbus, addr | I2C_SMBUS_READ | MTXFIFO_START);
+                       TXFIFO_WR(smbus, 1 | MTXFIFO_READ);
+                       rd = RXFIFO_RD(smbus);
+                       len = min_t(u8, (rd & MRXFIFO_DATA_M),
+                                   I2C_SMBUS_BLOCK_MAX);
+                       TXFIFO_WR(smbus, len | MTXFIFO_READ |
+                                        MTXFIFO_STOP);
+               } else {
+                       len = min_t(u8, data->block[0], I2C_SMBUS_BLOCK_MAX);
+                       TXFIFO_WR(smbus, len);
+                       for (i = 1; i < len; i++)
+                               TXFIFO_WR(smbus, data->block[i]);
+                       TXFIFO_WR(smbus, data->block[len] | MTXFIFO_STOP);
+               }
+               break;
+       case I2C_SMBUS_PROC_CALL:
+               read_write = I2C_SMBUS_READ;
+               TXFIFO_WR(smbus, addr | MTXFIFO_START);
+               TXFIFO_WR(smbus, command);
+               TXFIFO_WR(smbus, data->word & MTXFIFO_DATA_M);
+               TXFIFO_WR(smbus, (data->word >> 8) & MTXFIFO_DATA_M);
+               TXFIFO_WR(smbus, addr | I2C_SMBUS_READ | MTXFIFO_START);
+               TXFIFO_WR(smbus, 2 | MTXFIFO_STOP | MTXFIFO_READ);
+               break;
+       case I2C_SMBUS_BLOCK_PROC_CALL:
+               len = min_t(u8, data->block[0], I2C_SMBUS_BLOCK_MAX - 1);
+               read_write = I2C_SMBUS_READ;
+               TXFIFO_WR(smbus, addr | MTXFIFO_START);
+               TXFIFO_WR(smbus, command);
+               TXFIFO_WR(smbus, len);
+               for (i = 1; i <= len; i++)
+                       TXFIFO_WR(smbus, data->block[i]);
+               TXFIFO_WR(smbus, addr | I2C_SMBUS_READ);
+               TXFIFO_WR(smbus, MTXFIFO_READ | 1);
+               rd = RXFIFO_RD(smbus);
+               len = min_t(u8, (rd & MRXFIFO_DATA_M),
+                           I2C_SMBUS_BLOCK_MAX - len);
+               TXFIFO_WR(smbus, len | MTXFIFO_READ | MTXFIFO_STOP);
+               break;
+
+       default:
+               dev_warn(&adapter->dev, "Unsupported transaction %d\n", size);
+               return -EINVAL;
+       }
+
+       err = pasemi_smb_waitready(smbus);
+       if (err)
+               goto reset_out;
+
+       if (read_write == I2C_SMBUS_WRITE)
+               return 0;
+
+       switch (size) {
+       case I2C_SMBUS_BYTE:
+       case I2C_SMBUS_BYTE_DATA:
+               rd = RXFIFO_RD(smbus);
+               if (rd & MRXFIFO_EMPTY) {
+                       err = -ENODATA;
+                       goto reset_out;
+               }
+               data->byte = rd & MRXFIFO_DATA_M;
+               break;
+       case I2C_SMBUS_WORD_DATA:
+       case I2C_SMBUS_PROC_CALL:
+               rd = RXFIFO_RD(smbus);
+               if (rd & MRXFIFO_EMPTY) {
+                       err = -ENODATA;
+                       goto reset_out;
+               }
+               data->word = rd & MRXFIFO_DATA_M;
+               rd = RXFIFO_RD(smbus);
+               if (rd & MRXFIFO_EMPTY) {
+                       err = -ENODATA;
+                       goto reset_out;
+               }
+               data->word |= (rd & MRXFIFO_DATA_M) << 8;
+               break;
+       case I2C_SMBUS_BLOCK_DATA:
+       case I2C_SMBUS_BLOCK_PROC_CALL:
+               data->block[0] = len;
+               for (i = 1; i <= len; i ++) {
+                       rd = RXFIFO_RD(smbus);
+                       if (rd & MRXFIFO_EMPTY) {
+                               err = -ENODATA;
+                               goto reset_out;
+                       }
+                       data->block[i] = rd & MRXFIFO_DATA_M;
+               }
+               break;
+       }
+
+       return 0;
+
+ reset_out:
+       reg_write(smbus, REG_CTL, (CTL_MTR | CTL_MRR |
+                 (CLK_100K_DIV & CTL_CLK_M)));
+       return err;
+}
+
+static u32 pasemi_smb_func(struct i2c_adapter *adapter)
+{
+       return I2C_FUNC_SMBUS_QUICK | I2C_FUNC_SMBUS_BYTE |
+              I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA |
+              I2C_FUNC_SMBUS_BLOCK_DATA | I2C_FUNC_SMBUS_PROC_CALL |
+              I2C_FUNC_SMBUS_BLOCK_PROC_CALL | I2C_FUNC_I2C;
+}
+
+static const struct i2c_algorithm smbus_algorithm = {
+       .master_xfer    = pasemi_i2c_xfer,
+       .smbus_xfer     = pasemi_smb_xfer,
+       .functionality  = pasemi_smb_func,
+};
+
+int pasemi_i2c_common_probe(struct pasemi_smbus *smbus)
+{
+       int error;
+
+       smbus->adapter.owner = THIS_MODULE;
+       snprintf(smbus->adapter.name, sizeof(smbus->adapter.name),
+                "PA Semi SMBus adapter (%s)", dev_name(smbus->dev));
+       smbus->adapter.class = I2C_CLASS_HWMON | I2C_CLASS_SPD;
+       smbus->adapter.algo = &smbus_algorithm;
+       smbus->adapter.algo_data = smbus;
+
+       /* set up the sysfs linkage to our parent device */
+       smbus->adapter.dev.parent = smbus->dev;
+
+       reg_write(smbus, REG_CTL, (CTL_MTR | CTL_MRR |
+                 (CLK_100K_DIV & CTL_CLK_M)));
+
+       error = i2c_add_adapter(&smbus->adapter);
+       if (error)
+               return error;
+
+       return 0;
+}
diff --git a/drivers/i2c/busses/i2c-pasemi-core.h b/drivers/i2c/busses/i2c-pasemi-core.h
new file mode 100644 (file)
index 0000000..7acc33d
--- /dev/null
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include <linux/atomic.h>
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/device.h>
+#include <linux/i2c.h>
+#include <linux/i2c-smbus.h>
+#include <linux/io.h>
+#include <linux/kernel.h>
+
+struct pasemi_smbus {
+       struct device           *dev;
+       struct i2c_adapter       adapter;
+       void __iomem            *ioaddr;
+       unsigned long            base;
+       int                      size;
+};
+
+int pasemi_i2c_common_probe(struct pasemi_smbus *smbus);
diff --git a/drivers/i2c/busses/i2c-pasemi-pci.c b/drivers/i2c/busses/i2c-pasemi-pci.c
new file mode 100644 (file)
index 0000000..644656e
--- /dev/null
@@ -0,0 +1,96 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (C) 2006-2007 PA Semi, Inc
+ *
+ * SMBus host driver for PA Semi PWRficient
+ */
+
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/kernel.h>
+#include <linux/stddef.h>
+#include <linux/sched.h>
+#include <linux/i2c.h>
+#include <linux/delay.h>
+#include <linux/slab.h>
+#include <linux/io.h>
+
+#include "i2c-pasemi-core.h"
+
+static struct pci_driver pasemi_smb_pci_driver;
+
+static int pasemi_smb_pci_probe(struct pci_dev *dev,
+                                     const struct pci_device_id *id)
+{
+       struct pasemi_smbus *smbus;
+       int error;
+
+       if (!(pci_resource_flags(dev, 0) & IORESOURCE_IO))
+               return -ENODEV;
+
+       smbus = kzalloc(sizeof(struct pasemi_smbus), GFP_KERNEL);
+       if (!smbus)
+               return -ENOMEM;
+
+       smbus->dev = &dev->dev;
+       smbus->base = pci_resource_start(dev, 0);
+       smbus->size = pci_resource_len(dev, 0);
+
+       if (!request_region(smbus->base, smbus->size,
+                           pasemi_smb_pci_driver.name)) {
+               error = -EBUSY;
+               goto out_kfree;
+       }
+
+       smbus->ioaddr = pci_iomap(dev, 0, 0);
+       if (!smbus->ioaddr) {
+               error = -EBUSY;
+               goto out_release_region;
+       }
+
+       error = pasemi_i2c_common_probe(smbus);
+       if (error)
+               goto out_ioport_unmap;
+
+       pci_set_drvdata(dev, smbus);
+
+       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[] = {
+       { PCI_DEVICE(0x1959, 0xa003) },
+       { 0, }
+};
+
+MODULE_DEVICE_TABLE(pci, pasemi_smb_pci_ids);
+
+static struct pci_driver pasemi_smb_pci_driver = {
+       .name           = "i2c-pasemi",
+       .id_table       = pasemi_smb_pci_ids,
+       .probe          = pasemi_smb_pci_probe,
+       .remove         = pasemi_smb_pci_remove,
+};
+
+module_pci_driver(pasemi_smb_pci_driver);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Olof Johansson <olof@lixom.net>");
+MODULE_DESCRIPTION("PA Semi PWRficient SMBus driver");
diff --git a/drivers/i2c/busses/i2c-pasemi.c b/drivers/i2c/busses/i2c-pasemi.c
deleted file mode 100644 (file)
index baf3381..0000000
+++ /dev/null
@@ -1,430 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Copyright (C) 2006-2007 PA Semi, Inc
- *
- * SMBus host driver for PA Semi PWRficient
- */
-
-#include <linux/module.h>
-#include <linux/pci.h>
-#include <linux/kernel.h>
-#include <linux/stddef.h>
-#include <linux/sched.h>
-#include <linux/i2c.h>
-#include <linux/delay.h>
-#include <linux/slab.h>
-#include <linux/io.h>
-
-static struct pci_driver pasemi_smb_driver;
-
-struct pasemi_smbus {
-       struct device           *dev;
-       struct i2c_adapter       adapter;
-       void __iomem            *ioaddr;
-       unsigned long            base;
-       int                      size;
-};
-
-/* Register offsets */
-#define REG_MTXFIFO    0x00
-#define REG_MRXFIFO    0x04
-#define REG_SMSTA      0x14
-#define REG_CTL                0x1c
-
-/* Register defs */
-#define MTXFIFO_READ   0x00000400
-#define MTXFIFO_STOP   0x00000200
-#define MTXFIFO_START  0x00000100
-#define MTXFIFO_DATA_M 0x000000ff
-
-#define MRXFIFO_EMPTY  0x00000100
-#define MRXFIFO_DATA_M 0x000000ff
-
-#define SMSTA_XEN      0x08000000
-#define SMSTA_MTN      0x00200000
-
-#define CTL_MRR                0x00000400
-#define CTL_MTR                0x00000200
-#define CTL_CLK_M      0x000000ff
-
-#define CLK_100K_DIV   84
-#define CLK_400K_DIV   21
-
-static inline void reg_write(struct pasemi_smbus *smbus, int reg, int val)
-{
-       dev_dbg(smbus->dev, "smbus write reg %lx val %08x\n",
-               smbus->base + reg, val);
-       iowrite32(val, smbus->ioaddr + reg);
-}
-
-static inline int reg_read(struct pasemi_smbus *smbus, int reg)
-{
-       int ret;
-       ret = ioread32(smbus->ioaddr + reg);
-       dev_dbg(smbus->dev, "smbus read reg %lx val %08x\n",
-               smbus->base + reg, ret);
-       return ret;
-}
-
-#define TXFIFO_WR(smbus, reg)  reg_write((smbus), REG_MTXFIFO, (reg))
-#define RXFIFO_RD(smbus)       reg_read((smbus), REG_MRXFIFO)
-
-static void pasemi_smb_clear(struct pasemi_smbus *smbus)
-{
-       unsigned int status;
-
-       status = reg_read(smbus, REG_SMSTA);
-       reg_write(smbus, REG_SMSTA, status);
-}
-
-static int pasemi_smb_waitready(struct pasemi_smbus *smbus)
-{
-       int timeout = 10;
-       unsigned int status;
-
-       status = reg_read(smbus, REG_SMSTA);
-
-       while (!(status & SMSTA_XEN) && timeout--) {
-               msleep(1);
-               status = reg_read(smbus, REG_SMSTA);
-       }
-
-       /* Got NACK? */
-       if (status & SMSTA_MTN)
-               return -ENXIO;
-
-       if (timeout < 0) {
-               dev_warn(smbus->dev, "Timeout, status 0x%08x\n", status);
-               reg_write(smbus, REG_SMSTA, status);
-               return -ETIME;
-       }
-
-       /* Clear XEN */
-       reg_write(smbus, REG_SMSTA, SMSTA_XEN);
-
-       return 0;
-}
-
-static int pasemi_i2c_xfer_msg(struct i2c_adapter *adapter,
-                              struct i2c_msg *msg, int stop)
-{
-       struct pasemi_smbus *smbus = adapter->algo_data;
-       int read, i, err;
-       u32 rd;
-
-       read = msg->flags & I2C_M_RD ? 1 : 0;
-
-       TXFIFO_WR(smbus, MTXFIFO_START | i2c_8bit_addr_from_msg(msg));
-
-       if (read) {
-               TXFIFO_WR(smbus, msg->len | MTXFIFO_READ |
-                                (stop ? MTXFIFO_STOP : 0));
-
-               err = pasemi_smb_waitready(smbus);
-               if (err)
-                       goto reset_out;
-
-               for (i = 0; i < msg->len; i++) {
-                       rd = RXFIFO_RD(smbus);
-                       if (rd & MRXFIFO_EMPTY) {
-                               err = -ENODATA;
-                               goto reset_out;
-                       }
-                       msg->buf[i] = rd & MRXFIFO_DATA_M;
-               }
-       } else {
-               for (i = 0; i < msg->len - 1; i++)
-                       TXFIFO_WR(smbus, msg->buf[i]);
-
-               TXFIFO_WR(smbus, msg->buf[msg->len-1] |
-                         (stop ? MTXFIFO_STOP : 0));
-       }
-
-       return 0;
-
- reset_out:
-       reg_write(smbus, REG_CTL, (CTL_MTR | CTL_MRR |
-                 (CLK_100K_DIV & CTL_CLK_M)));
-       return err;
-}
-
-static int pasemi_i2c_xfer(struct i2c_adapter *adapter,
-                          struct i2c_msg *msgs, int num)
-{
-       struct pasemi_smbus *smbus = adapter->algo_data;
-       int ret, i;
-
-       pasemi_smb_clear(smbus);
-
-       ret = 0;
-
-       for (i = 0; i < num && !ret; i++)
-               ret = pasemi_i2c_xfer_msg(adapter, &msgs[i], (i == (num - 1)));
-
-       return ret ? ret : num;
-}
-
-static int pasemi_smb_xfer(struct i2c_adapter *adapter,
-               u16 addr, unsigned short flags, char read_write, u8 command,
-               int size, union i2c_smbus_data *data)
-{
-       struct pasemi_smbus *smbus = adapter->algo_data;
-       unsigned int rd;
-       int read_flag, err;
-       int len = 0, i;
-
-       /* All our ops take 8-bit shifted addresses */
-       addr <<= 1;
-       read_flag = read_write == I2C_SMBUS_READ;
-
-       pasemi_smb_clear(smbus);
-
-       switch (size) {
-       case I2C_SMBUS_QUICK:
-               TXFIFO_WR(smbus, addr | read_flag | MTXFIFO_START |
-                         MTXFIFO_STOP);
-               break;
-       case I2C_SMBUS_BYTE:
-               TXFIFO_WR(smbus, addr | read_flag | MTXFIFO_START);
-               if (read_write)
-                       TXFIFO_WR(smbus, 1 | MTXFIFO_STOP | MTXFIFO_READ);
-               else
-                       TXFIFO_WR(smbus, MTXFIFO_STOP | command);
-               break;
-       case I2C_SMBUS_BYTE_DATA:
-               TXFIFO_WR(smbus, addr | MTXFIFO_START);
-               TXFIFO_WR(smbus, command);
-               if (read_write) {
-                       TXFIFO_WR(smbus, addr | I2C_SMBUS_READ | MTXFIFO_START);
-                       TXFIFO_WR(smbus, 1 | MTXFIFO_READ | MTXFIFO_STOP);
-               } else {
-                       TXFIFO_WR(smbus, MTXFIFO_STOP | data->byte);
-               }
-               break;
-       case I2C_SMBUS_WORD_DATA:
-               TXFIFO_WR(smbus, addr | MTXFIFO_START);
-               TXFIFO_WR(smbus, command);
-               if (read_write) {
-                       TXFIFO_WR(smbus, addr | I2C_SMBUS_READ | MTXFIFO_START);
-                       TXFIFO_WR(smbus, 2 | MTXFIFO_READ | MTXFIFO_STOP);
-               } else {
-                       TXFIFO_WR(smbus, data->word & MTXFIFO_DATA_M);
-                       TXFIFO_WR(smbus, MTXFIFO_STOP | (data->word >> 8));
-               }
-               break;
-       case I2C_SMBUS_BLOCK_DATA:
-               TXFIFO_WR(smbus, addr | MTXFIFO_START);
-               TXFIFO_WR(smbus, command);
-               if (read_write) {
-                       TXFIFO_WR(smbus, addr | I2C_SMBUS_READ | MTXFIFO_START);
-                       TXFIFO_WR(smbus, 1 | MTXFIFO_READ);
-                       rd = RXFIFO_RD(smbus);
-                       len = min_t(u8, (rd & MRXFIFO_DATA_M),
-                                   I2C_SMBUS_BLOCK_MAX);
-                       TXFIFO_WR(smbus, len | MTXFIFO_READ |
-                                        MTXFIFO_STOP);
-               } else {
-                       len = min_t(u8, data->block[0], I2C_SMBUS_BLOCK_MAX);
-                       TXFIFO_WR(smbus, len);
-                       for (i = 1; i < len; i++)
-                               TXFIFO_WR(smbus, data->block[i]);
-                       TXFIFO_WR(smbus, data->block[len] | MTXFIFO_STOP);
-               }
-               break;
-       case I2C_SMBUS_PROC_CALL:
-               read_write = I2C_SMBUS_READ;
-               TXFIFO_WR(smbus, addr | MTXFIFO_START);
-               TXFIFO_WR(smbus, command);
-               TXFIFO_WR(smbus, data->word & MTXFIFO_DATA_M);
-               TXFIFO_WR(smbus, (data->word >> 8) & MTXFIFO_DATA_M);
-               TXFIFO_WR(smbus, addr | I2C_SMBUS_READ | MTXFIFO_START);
-               TXFIFO_WR(smbus, 2 | MTXFIFO_STOP | MTXFIFO_READ);
-               break;
-       case I2C_SMBUS_BLOCK_PROC_CALL:
-               len = min_t(u8, data->block[0], I2C_SMBUS_BLOCK_MAX - 1);
-               read_write = I2C_SMBUS_READ;
-               TXFIFO_WR(smbus, addr | MTXFIFO_START);
-               TXFIFO_WR(smbus, command);
-               TXFIFO_WR(smbus, len);
-               for (i = 1; i <= len; i++)
-                       TXFIFO_WR(smbus, data->block[i]);
-               TXFIFO_WR(smbus, addr | I2C_SMBUS_READ);
-               TXFIFO_WR(smbus, MTXFIFO_READ | 1);
-               rd = RXFIFO_RD(smbus);
-               len = min_t(u8, (rd & MRXFIFO_DATA_M),
-                           I2C_SMBUS_BLOCK_MAX - len);
-               TXFIFO_WR(smbus, len | MTXFIFO_READ | MTXFIFO_STOP);
-               break;
-
-       default:
-               dev_warn(&adapter->dev, "Unsupported transaction %d\n", size);
-               return -EINVAL;
-       }
-
-       err = pasemi_smb_waitready(smbus);
-       if (err)
-               goto reset_out;
-
-       if (read_write == I2C_SMBUS_WRITE)
-               return 0;
-
-       switch (size) {
-       case I2C_SMBUS_BYTE:
-       case I2C_SMBUS_BYTE_DATA:
-               rd = RXFIFO_RD(smbus);
-               if (rd & MRXFIFO_EMPTY) {
-                       err = -ENODATA;
-                       goto reset_out;
-               }
-               data->byte = rd & MRXFIFO_DATA_M;
-               break;
-       case I2C_SMBUS_WORD_DATA:
-       case I2C_SMBUS_PROC_CALL:
-               rd = RXFIFO_RD(smbus);
-               if (rd & MRXFIFO_EMPTY) {
-                       err = -ENODATA;
-                       goto reset_out;
-               }
-               data->word = rd & MRXFIFO_DATA_M;
-               rd = RXFIFO_RD(smbus);
-               if (rd & MRXFIFO_EMPTY) {
-                       err = -ENODATA;
-                       goto reset_out;
-               }
-               data->word |= (rd & MRXFIFO_DATA_M) << 8;
-               break;
-       case I2C_SMBUS_BLOCK_DATA:
-       case I2C_SMBUS_BLOCK_PROC_CALL:
-               data->block[0] = len;
-               for (i = 1; i <= len; i ++) {
-                       rd = RXFIFO_RD(smbus);
-                       if (rd & MRXFIFO_EMPTY) {
-                               err = -ENODATA;
-                               goto reset_out;
-                       }
-                       data->block[i] = rd & MRXFIFO_DATA_M;
-               }
-               break;
-       }
-
-       return 0;
-
- reset_out:
-       reg_write(smbus, REG_CTL, (CTL_MTR | CTL_MRR |
-                 (CLK_100K_DIV & CTL_CLK_M)));
-       return err;
-}
-
-static u32 pasemi_smb_func(struct i2c_adapter *adapter)
-{
-       return I2C_FUNC_SMBUS_QUICK | I2C_FUNC_SMBUS_BYTE |
-              I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA |
-              I2C_FUNC_SMBUS_BLOCK_DATA | I2C_FUNC_SMBUS_PROC_CALL |
-              I2C_FUNC_SMBUS_BLOCK_PROC_CALL | I2C_FUNC_I2C;
-}
-
-static const struct i2c_algorithm smbus_algorithm = {
-       .master_xfer    = pasemi_i2c_xfer,
-       .smbus_xfer     = pasemi_smb_xfer,
-       .functionality  = pasemi_smb_func,
-};
-
-static int pasemi_i2c_common_probe(struct pasemi_smbus *smbus)
-{
-       int error;
-
-       smbus->adapter.owner = THIS_MODULE;
-       snprintf(smbus->adapter.name, sizeof(smbus->adapter.name),
-                "PA Semi SMBus adapter (%s)", dev_name(smbus->dev));
-       smbus->adapter.class = I2C_CLASS_HWMON | I2C_CLASS_SPD;
-       smbus->adapter.algo = &smbus_algorithm;
-       smbus->adapter.algo_data = smbus;
-
-       /* set up the sysfs linkage to our parent device */
-       smbus->adapter.dev.parent = smbus->dev;
-
-       reg_write(smbus, REG_CTL, (CTL_MTR | CTL_MRR |
-                 (CLK_100K_DIV & CTL_CLK_M)));
-
-       error = i2c_add_adapter(&smbus->adapter);
-       if (error)
-               return error;
-
-       return 0;
-}
-
-static int pasemi_smb_probe(struct pci_dev *dev,
-                                     const struct pci_device_id *id)
-{
-       struct pasemi_smbus *smbus;
-       int error;
-
-       if (!(pci_resource_flags(dev, 0) & IORESOURCE_IO))
-               return -ENODEV;
-
-       smbus = kzalloc(sizeof(struct pasemi_smbus), GFP_KERNEL);
-       if (!smbus)
-               return -ENOMEM;
-
-       smbus->dev = &dev->dev;
-       smbus->base = pci_resource_start(dev, 0);
-       smbus->size = pci_resource_len(dev, 0);
-
-       if (!request_region(smbus->base, smbus->size,
-                           pasemi_smb_driver.name)) {
-               error = -EBUSY;
-               goto out_kfree;
-       }
-
-       smbus->ioaddr = pci_iomap(dev, 0, 0);
-       if (!smbus->ioaddr) {
-               error = -EBUSY;
-               goto out_release_region;
-       }
-
-       int error = pasemi_i2c_common_probe(smbus);
-       if (error)
-               goto out_ioport_unmap;
-
-       pci_set_drvdata(dev, smbus);
-
-       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_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_ids[] = {
-       { PCI_DEVICE(0x1959, 0xa003) },
-       { 0, }
-};
-
-MODULE_DEVICE_TABLE(pci, pasemi_smb_ids);
-
-static struct pci_driver pasemi_smb_driver = {
-       .name           = "i2c-pasemi",
-       .id_table       = pasemi_smb_ids,
-       .probe          = pasemi_smb_probe,
-       .remove         = pasemi_smb_remove,
-};
-
-module_pci_driver(pasemi_smb_driver);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR ("Olof Johansson <olof@lixom.net>");
-MODULE_DESCRIPTION("PA Semi PWRficient SMBus driver");