Skip to content

Commit

Permalink
USB: phy: drop unused legacy controller-phy bind helper
Browse files Browse the repository at this point in the history
Drop the unused legacy usb_bind_phy() helper whose last user was removed
in 2016 when OMAP moved to device-tree boot (9080b8d ("ARM: OMAP2+:
Remove legacy usb-host.c platform init code")).

Note that this means that for the last couple of years the phy_bind_list
has been empty (when using mainline kernels) and that consequently all
phy lookups using the usb_get_phy_dev() interface have failed with
-ENODEV. This helper along with its current users will be removed by
follow-on patches.

Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Johan Hovold authored and Greg Kroah-Hartman committed Apr 22, 2018
1 parent c95c975 commit 60b9f94
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 42 deletions.
34 changes: 0 additions & 34 deletions drivers/usb/phy/phy.c
Original file line number Diff line number Diff line change
Expand Up @@ -795,40 +795,6 @@ void usb_remove_phy(struct usb_phy *x)
}
EXPORT_SYMBOL_GPL(usb_remove_phy);

/**
* usb_bind_phy - bind the phy and the controller that uses the phy
* @dev_name: the device name of the device that will bind to the phy
* @index: index to specify the port number
* @phy_dev_name: the device name of the phy
*
* Fills the phy_bind structure with the dev_name and phy_dev_name. This will
* be used when the phy driver registers the phy and when the controller
* requests this phy.
*
* To be used by platform specific initialization code.
*/
int usb_bind_phy(const char *dev_name, u8 index,
const char *phy_dev_name)
{
struct usb_phy_bind *phy_bind;
unsigned long flags;

phy_bind = kzalloc(sizeof(*phy_bind), GFP_KERNEL);
if (!phy_bind)
return -ENOMEM;

phy_bind->dev_name = dev_name;
phy_bind->phy_dev_name = phy_dev_name;
phy_bind->index = index;

spin_lock_irqsave(&phy_lock, flags);
list_add_tail(&phy_bind->list, &phy_bind_list);
spin_unlock_irqrestore(&phy_lock, flags);

return 0;
}
EXPORT_SYMBOL_GPL(usb_bind_phy);

/**
* usb_phy_set_event - set event to phy event
* @x: the phy returned by usb_get_phy();
Expand Down
8 changes: 0 additions & 8 deletions include/linux/usb/phy.h
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,6 @@ extern struct usb_phy *devm_usb_get_phy_by_node(struct device *dev,
struct device_node *node, struct notifier_block *nb);
extern void usb_put_phy(struct usb_phy *);
extern void devm_usb_put_phy(struct device *dev, struct usb_phy *x);
extern int usb_bind_phy(const char *dev_name, u8 index,
const char *phy_dev_name);
extern void usb_phy_set_event(struct usb_phy *x, unsigned long event);
extern void usb_phy_set_charger_current(struct usb_phy *usb_phy,
unsigned int mA);
Expand Down Expand Up @@ -293,12 +291,6 @@ static inline void devm_usb_put_phy(struct device *dev, struct usb_phy *x)
{
}

static inline int usb_bind_phy(const char *dev_name, u8 index,
const char *phy_dev_name)
{
return -EOPNOTSUPP;
}

static inline void usb_phy_set_event(struct usb_phy *x, unsigned long event)
{
}
Expand Down

0 comments on commit 60b9f94

Please sign in to comment.