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>

diff --git a/drivers/usb/common/ulpi.c b/drivers/usb/common/ulpi.c
index 43142c3d94d7b2a20659a4a3bcb0abd211872650..fdaed7c26c127839b80d320920f96b3e03c77d5b 100644 (file)
--- 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 94eeb7a42dbd77aa43e27091c6fa1d0fe5f25ba5..51ac939b2dfc424dddb246a2eaca6a1f652b70e4 100644 (file)
--- 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 71f3c99771aa7f9dd7abda2fa64351a87983c11f..ac3cd8058d9cf3a08ad8543efcbad55219e10ad2 100644 (file)
--- 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 *);