瀏覽代碼

usb: ulpi: add new api functions, {read|write}_dev()

Add these two new api callbacks to struct ulpi_ops. These are different
than read, write in that they pass the parent device directly instead
of via the ops argument.
They are intended to replace the old api functions.

If the new api callbacks are missing, revert to calling the old ones
as before.

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>
Tal Shorer 9 年之前
父節點
當前提交
6691402313
共有 2 個文件被更改,包括 8 次插入2 次删除
  1. 6 2
      drivers/usb/common/ulpi.c
  2. 2 0
      include/linux/ulpi/interface.h

+ 6 - 2
drivers/usb/common/ulpi.c

@@ -21,13 +21,17 @@
 
 
 int ulpi_read(struct ulpi *ulpi, u8 addr)
 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);
 EXPORT_SYMBOL_GPL(ulpi_read);
 
 
 int ulpi_write(struct ulpi *ulpi, u8 addr, u8 val)
 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);
 EXPORT_SYMBOL_GPL(ulpi_write);
 
 

+ 2 - 0
include/linux/ulpi/interface.h

@@ -15,6 +15,8 @@ struct ulpi_ops {
 	struct device *dev;
 	struct device *dev;
 	int (*read)(struct ulpi_ops *ops, u8 addr);
 	int (*read)(struct ulpi_ops *ops, u8 addr);
 	int (*write)(struct ulpi_ops *ops, u8 addr, u8 val);
 	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);
 };
 };
 
 
 struct ulpi *ulpi_register_interface(struct device *, struct ulpi_ops *);
 struct ulpi *ulpi_register_interface(struct device *, struct ulpi_ops *);