Merge remote-tracking branch 'usb-gadget/next'

[deliverable/linux.git] / drivers / usb / dwc3 / ulpi.c

diff --git a/drivers/usb/dwc3/ulpi.c b/drivers/usb/dwc3/ulpi.c
index ec004c6d76f23a793e60793aeee688afe9a44606..bd86f84f37901da174cc87229504d9d895b2b0e9 100644 (file)
--- a/drivers/usb/dwc3/ulpi.c
+++ b/drivers/usb/dwc3/ulpi.c
@@ -35,9 +35,9 @@ static int dwc3_ulpi_busyloop(struct dwc3 *dwc)
        return -ETIMEDOUT;
 }
 
-static int dwc3_ulpi_read(struct ulpi_ops *ops, u8 addr)
+static int dwc3_ulpi_read(struct device *dev, u8 addr)
 {
-       struct dwc3 *dwc = dev_get_drvdata(ops->dev);
+       struct dwc3 *dwc = dev_get_drvdata(dev);
        u32 reg;
        int ret;
 
@@ -53,9 +53,9 @@ static int dwc3_ulpi_read(struct ulpi_ops *ops, u8 addr)
        return DWC3_GUSB2PHYACC_DATA(reg);
 }
 
-static int dwc3_ulpi_write(struct ulpi_ops *ops, u8 addr, u8 val)
+static int dwc3_ulpi_write(struct device *dev, u8 addr, u8 val)
 {
-       struct dwc3 *dwc = dev_get_drvdata(ops->dev);
+       struct dwc3 *dwc = dev_get_drvdata(dev);
        u32 reg;
 
        reg = DWC3_GUSB2PHYACC_NEWREGREQ | DWC3_ULPI_ADDR(addr);
@@ -65,7 +65,7 @@ static int dwc3_ulpi_write(struct ulpi_ops *ops, u8 addr, u8 val)
        return dwc3_ulpi_busyloop(dwc);
 }
 
-static struct ulpi_ops dwc3_ulpi_ops = {
+static const struct ulpi_ops dwc3_ulpi_ops = {
        .read = dwc3_ulpi_read,
        .write = dwc3_ulpi_write,
 };