summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTal Shorer <tal.shorer@gmail.com>2016-08-16 19:04:49 +0300
committerFelipe Balbi <felipe.balbi@linux.intel.com>2016-09-06 10:47:24 +0300
commit5c42f38795645834a7c23998bd74d35a37bff078 (patch)
treea0dcc5625fa45f1e2048893c1865961fd45438a9
parentb7cf1dc3414de59f178734466f6cfff5171a8ffb (diff)
downloadblackbird-op-linux-5c42f38795645834a7c23998bd74d35a37bff078.tar.gz
blackbird-op-linux-5c42f38795645834a7c23998bd74d35a37bff078.zip
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>
-rw-r--r--drivers/usb/common/ulpi.c4
-rw-r--r--include/linux/ulpi/interface.h2
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/usb/common/ulpi.c b/drivers/usb/common/ulpi.c
index a877ddbbe826..43142c3d94d7 100644
--- 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 d8189d08eddb..71f3c99771aa 100644
--- 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);
};
OpenPOWER on IntegriCloud