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

Groups > linux.kernel > #1463917

[PATCH v3 4/8] usb: ulpi: remove calls to old api callbacks

Show all headers | View raw

Now that all users use the new api callbacks, remove the old api
callbacks and force new interface drivers to use the new api.

Signed-off-by: Tal Shorer <tal.shorer@gmail.com>
---
 drivers/usb/common/ulpi.c      | 4 ----
 include/linux/ulpi/interface.h | 2 --
 2 files changed, 6 deletions(-)

diff --git a/drivers/usb/common/ulpi.c b/drivers/usb/common/ulpi.c
index 15e4a14..d682cf2 100644
--- a/drivers/usb/common/ulpi.c
+++ b/drivers/usb/common/ulpi.c
@@ -21,16 +21,12 @@
 
 int ulpi_read(struct ulpi *ulpi, u8 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)
 {
-	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);
diff --git a/include/linux/ulpi/interface.h b/include/linux/ulpi/interface.h
index d8189d0..71f3c99 100644
--- a/include/linux/ulpi/interface.h
+++ b/include/linux/ulpi/interface.h
@@ -13,8 +13,6 @@ struct ulpi;
  */
 struct ulpi_ops {
 	struct device *dev;
-	int (*read)(struct ulpi_ops *ops, u8 addr);
-	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);
 };
-- 
2.7.4

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

Thread

[PATCH v3 0/8] usb: ulpi: remove "dev" field from struct ulpi_ops Tal Shorer <tal.shorer@gmail.com> - 2016-08-16 18:10 +0200
  [PATCH v3 1/8] usb: ulpi: move setting of ulpi->dev parent up in ulpi_register() Tal Shorer <tal.shorer@gmail.com> - 2016-08-16 18:10 +0200
    Re: [PATCH v3 1/8] usb: ulpi: move setting of ulpi->dev parent up in  ulpi_register() Heikki Krogerus <heikki.krogerus@linux.intel.com> - 2016-08-17 13:20 +0200
  [PATCH v3 3/8] usb: dwc3: ulpi: use new api Tal Shorer <tal.shorer@gmail.com> - 2016-08-16 18:10 +0200
    Re: [PATCH v3 3/8] usb: dwc3: ulpi: use new api Heikki Krogerus <heikki.krogerus@linux.intel.com> - 2016-08-17 13:20 +0200
  [PATCH v3 5/8] usb: ulpi: rename operations {read|write}_dev to simply {read|write} Tal Shorer <tal.shorer@gmail.com> - 2016-08-16 18:10 +0200
    Re: [PATCH v3 5/8] usb: ulpi: rename operations {read|write}_dev to  simply {read|write} Heikki Krogerus <heikki.krogerus@linux.intel.com> - 2016-08-17 13:20 +0200
  [PATCH v3 7/8] usb: ulpi: make ops struct constant Tal Shorer <tal.shorer@gmail.com> - 2016-08-16 18:10 +0200
    Re: [PATCH v3 7/8] usb: ulpi: make ops struct constant Heikki Krogerus <heikki.krogerus@linux.intel.com> - 2016-08-17 13:20 +0200
  [PATCH v3 4/8] usb: ulpi: remove calls to old api callbacks Tal Shorer <tal.shorer@gmail.com> - 2016-08-16 18:10 +0200
    Re: [PATCH v3 4/8] usb: ulpi: remove calls to old api callbacks Heikki Krogerus <heikki.krogerus@linux.intel.com> - 2016-08-17 13:20 +0200
  [PATCH v3 6/8] usb: ulpi: remove "dev" field from struct ulpi_ops Tal Shorer <tal.shorer@gmail.com> - 2016-08-16 18:10 +0200
    Re: [PATCH v3 6/8] usb: ulpi: remove "dev" field from struct ulpi_ops Heikki Krogerus <heikki.krogerus@linux.intel.com> - 2016-08-17 13:20 +0200
  [PATCH v3 8/8] usb: dwc3: ulpi: make dwc3_ulpi_ops constant Tal Shorer <tal.shorer@gmail.com> - 2016-08-16 18:10 +0200
    Re: [PATCH v3 8/8] usb: dwc3: ulpi: make dwc3_ulpi_ops constant Heikki Krogerus <heikki.krogerus@linux.intel.com> - 2016-08-17 13:20 +0200

csiph-web