usb: ulpi: remove calls to old api callbacks

Now that all users use the new api callbacks, remove the old api
callbacks and force new interface drivers to use the new api.

Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Tal Shorer <tal.shorer@gmail.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>

diff --git a/drivers/usb/common/ulpi.c b/drivers/usb/common/ulpi.c
index a877ddbbe826254f7b92a959f77b9d02e8d72738..43142c3d94d7b2a20659a4a3bcb0abd211872650 100644 (file)
--- a/drivers/usb/common/ulpi.c
+++ b/drivers/usb/common/ulpi.c
@@ -21,16 +21,12 @@
 
 int ulpi_read(struct ulpi *ulpi, u8 addr)
 {
-       if (!ulpi->ops->read_dev)
-               return ulpi->ops->read(ulpi->ops, addr);
        return ulpi->ops->read_dev(ulpi->dev.parent, addr);
 }
 EXPORT_SYMBOL_GPL(ulpi_read);
 
 int ulpi_write(struct ulpi *ulpi, u8 addr, u8 val)
 {
-       if (!ulpi->ops->write_dev)
-               return ulpi->ops->write(ulpi->ops, addr, val);
        return ulpi->ops->write_dev(ulpi->dev.parent, addr, val);
 }
 EXPORT_SYMBOL_GPL(ulpi_write);

diff --git a/include/linux/ulpi/interface.h b/include/linux/ulpi/interface.h
index d8189d08eddb9889989b8cb957d23080fcdaf771..71f3c99771aa7f9dd7abda2fa64351a87983c11f 100644 (file)
--- a/include/linux/ulpi/interface.h
+++ b/include/linux/ulpi/interface.h
@@ -13,8 +13,6 @@ struct ulpi;
  */
 struct ulpi_ops {
        struct device *dev;
-       int (*read)(struct ulpi_ops *ops, u8 addr);
-       int (*write)(struct ulpi_ops *ops, u8 addr, u8 val);
        int (*read_dev)(struct device *dev, u8 addr);
        int (*write_dev)(struct device *dev, u8 addr, u8 val);
 };