aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTal Shorer <tal.shorer@gmail.com>2016-08-16 19:04:50 +0300
committerFelipe Balbi <felipe.balbi@linux.intel.com>2016-09-06 10:47:24 +0300
commite6f74849784ccf275226d5d3ddfb96c71fa90383 (patch)
treea7f2ba33065d9479ace41b6efb3af54f875ea557
parentusb: ulpi: remove calls to old api callbacks (diff)
downloadlinux-dev-e6f74849784ccf275226d5d3ddfb96c71fa90383.tar.xz
linux-dev-e6f74849784ccf275226d5d3ddfb96c71fa90383.zip
usb: ulpi: rename operations {read|write}_dev to simply {read|write}
With the removal of the old {read|write} operations, we can now safely rename the new api operations {read|write}_dev to use the shorter and clearer names {read|write}, respectively. 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--drivers/usb/dwc3/ulpi.c4
-rw-r--r--include/linux/ulpi/interface.h4
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/usb/common/ulpi.c b/drivers/usb/common/ulpi.c
index 43142c3d94d7..fdaed7c26c12 100644
--- a/drivers/usb/common/ulpi.c
+++ b/drivers/usb/common/ulpi.c
@@ -21,13 +21,13 @@
int ulpi_read(struct ulpi *ulpi, u8 addr)
{
- return ulpi->ops->read_dev(ulpi->dev.parent, addr);
+ return ulpi->ops->read(ulpi->dev.parent, addr);
}
EXPORT_SYMBOL_GPL(ulpi_read);
int ulpi_write(struct ulpi *ulpi, u8 addr, u8 val)
{
- return ulpi->ops->write_dev(ulpi->dev.parent, addr, val);
+ return ulpi->ops->write(ulpi->dev.parent, addr, val);
}
EXPORT_SYMBOL_GPL(ulpi_write);
diff --git a/drivers/usb/dwc3/ulpi.c b/drivers/usb/dwc3/ulpi.c
index 94eeb7a42dbd..51ac939b2dfc 100644
--- a/drivers/usb/dwc3/ulpi.c
+++ b/drivers/usb/dwc3/ulpi.c
@@ -66,8 +66,8 @@ static int dwc3_ulpi_write(struct device *dev, u8 addr, u8 val)
}
static struct ulpi_ops dwc3_ulpi_ops = {
- .read_dev = dwc3_ulpi_read,
- .write_dev = dwc3_ulpi_write,
+ .read = dwc3_ulpi_read,
+ .write = dwc3_ulpi_write,
};
int dwc3_ulpi_init(struct dwc3 *dwc)
diff --git a/include/linux/ulpi/interface.h b/include/linux/ulpi/interface.h
index 71f3c99771aa..ac3cd8058d9c 100644
--- a/include/linux/ulpi/interface.h
+++ b/include/linux/ulpi/interface.h
@@ -13,8 +13,8 @@ struct ulpi;
*/
struct ulpi_ops {
struct device *dev;
- int (*read_dev)(struct device *dev, u8 addr);
- int (*write_dev)(struct device *dev, u8 addr, u8 val);
+ int (*read)(struct device *dev, u8 addr);
+ int (*write)(struct device *dev, u8 addr, u8 val);
};
struct ulpi *ulpi_register_interface(struct device *, struct ulpi_ops *);