Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1453386

[PATCH v2 03/10] usb: ulpi: use new api functions if available

Show all headers | View raw

If the registered has the new api callbacks {read|write}_dev, call
these instead of the deprecated read, write functions. If the
registered does not support the new callbacks, revert to calling the
old ones as before.

Signed-off-by: Tal Shorer <tal.shorer@gmail.com>
---
 drivers/usb/common/ulpi.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/common/ulpi.c b/drivers/usb/common/ulpi.c
index d1f419c..a877ddb 100644
--- a/drivers/usb/common/ulpi.c
+++ b/drivers/usb/common/ulpi.c
@@ -21,13 +21,17 @@
 
 int ulpi_read(struct ulpi *ulpi, u8 addr)
 {
-	return ulpi->ops->read(ulpi->ops, 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)
 {
-	return ulpi->ops->write(ulpi->ops, addr, 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);
 
-- 
2.7.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 00/10] usb: ulpi: remove "dev" field from struct ulpi_ops Tal Shorer <tal.shorer@gmail.com> - 2016-08-01 20:20 +0200
  [PATCH v2 06/10] usb: ulpi: remove old api callbacks from struct ulpi_ops Tal Shorer <tal.shorer@gmail.com> - 2016-08-01 20:20 +0200
  [PATCH v2 10/10] usb: dwc3: ulpi: make dwc3_ulpi_ops constant Tal Shorer <tal.shorer@gmail.com> - 2016-08-01 20:20 +0200
  [PATCH v2 03/10] usb: ulpi: use new api functions if available Tal Shorer <tal.shorer@gmail.com> - 2016-08-01 20:20 +0200
  [PATCH v2 08/10] usb: ulpi: remove "dev" field from struct ulpi_ops Tal Shorer <tal.shorer@gmail.com> - 2016-08-01 20:20 +0200
  [PATCH v2 07/10] usb: ulpi: rename operations {read|write}_dev to simply {read|write} Tal Shorer <tal.shorer@gmail.com> - 2016-08-01 20:20 +0200
  [PATCH v2 04/10] usb: dwc3: ulpi: use new api Tal Shorer <tal.shorer@gmail.com> - 2016-08-01 20:20 +0200
  [PATCH v2 09/10] usb: ulpi: make ops struct constant Tal Shorer <tal.shorer@gmail.com> - 2016-08-01 20:20 +0200
  Re: [PATCH v2 00/10] usb: ulpi: remove "dev" field from struct  ulpi_ops Greg KH <gregkh@linuxfoundation.org> - 2016-08-09 16:10 +0200
    Re: [PATCH v2 00/10] usb: ulpi: remove "dev" field from struct ulpi_ops Tal Shorer <tal.shorer@gmail.com> - 2016-08-09 18:00 +0200
      Re: [PATCH v2 00/10] usb: ulpi: remove "dev" field from struct  ulpi_ops Greg KH <gregkh@linuxfoundation.org> - 2016-08-09 18:50 +0200

csiph-web