Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c42f387 authored by Tal Shorer's avatar Tal Shorer Committed by Felipe Balbi
Browse files

usb: ulpi: remove calls to old api callbacks 



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

Acked-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarTal Shorer <tal.shorer@gmail.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent b7cf1dc3

drivers/usb/common/ulpi.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -21,16 +21,12 @@ 




int ulpi_read(struct ulpi *ulpi, u8 addr)

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);

	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)

{

{

	if (!ulpi->ops->write_dev)

		return ulpi->ops->write(ulpi->ops, addr, val);

	return ulpi->ops->write_dev(ulpi->dev.parent, addr, val);

	return ulpi->ops->write_dev(ulpi->dev.parent, addr, val);

}

}

EXPORT_SYMBOL_GPL(ulpi_write);

EXPORT_SYMBOL_GPL(ulpi_write);

include/linux/ulpi/interface.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -13,8 +13,6 @@ struct ulpi; 
 */

 */

struct ulpi_ops {

struct ulpi_ops {

	struct device *dev;

	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 (*read_dev)(struct device *dev, u8 addr);

	int (*write_dev)(struct device *dev, u8 addr, u8 val);

	int (*write_dev)(struct device *dev, u8 addr, u8 val);

};

};