Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-02 17:11:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

usb: phy: omap: get rid of omap_get_control_dev()

Browse Source 
This function was preventing us from supporting multiple
instances. Get rid of it. Since we support DT boots only,
users can get the control device phandle from the DT node.

Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Roger Quadros 2013-10-03 18:12:35 +03:00 committed by Greg Kroah-Hartman
parent 8934d3e4d0
commit 0bb85dc2d3
2 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/usb/phy/phy-omap-control.c
View File

@ -26,26 +26,6 @@
#include <linux/clk.h>
#include <linux/usb/omap_control_usb.h>
static struct omap_control_usb *control_usb;
/**
* omap_get_control_dev - returns the device pointer for this control device
*
* This API should be called to get the device pointer for this control
* module device. This device pointer should be used for called other
* exported API's in this driver.
*
* To be used by PHY driver and glue driver.
*/
struct device *omap_get_control_dev(void)
{
if (!control_usb)
return ERR_PTR(-ENODEV);
return control_usb->dev;
}
EXPORT_SYMBOL_GPL(omap_get_control_dev);
/**
* omap_control_usb_phy_power - power on/off the phy using control module reg
* @dev: the control module device
@ -182,11 +162,19 @@ void omap_control_usb_set_mode(struct device *dev,
{
struct omap_control_usb *ctrl_usb;
if (IS_ERR(dev) || control_usb->type != OMAP_CTRL_TYPE_OTGHS)
if (IS_ERR(dev) || !dev)
return;
ctrl_usb = dev_get_drvdata(dev);
if (!ctrl_usb) {
dev_err(dev, "Invalid control usb device\n");
return;
}
if (ctrl_usb->type != OMAP_CTRL_TYPE_OTGHS)
return;
switch (mode) {
case USB_MODE_HOST:
omap_control_usb_host_mode(ctrl_usb);
@ -237,6 +225,7 @@ static int omap_control_usb_probe(struct platform_device *pdev)
{
struct resource *res;
const struct of_device_id *of_id;
struct omap_control_usb *control_usb;
of_id = of_match_device(of_match_ptr(omap_control_usb_id_table),
&pdev->dev);

5
include/linux/usb/omap_control_usb.h
View File

@ -65,15 +65,10 @@ enum omap_control_usb_mode {
#define OMAP_CTRL_USB2_PHY_PD BIT(28)
#if IS_ENABLED(CONFIG_OMAP_CONTROL_USB)
extern struct device *omap_get_control_dev(void);
extern void omap_control_usb_phy_power(struct device *dev, int on);
extern void omap_control_usb_set_mode(struct device *dev,
enum omap_control_usb_mode mode);
#else
static inline struct device *omap_get_control_dev(void)
{
return ERR_PTR(-ENODEV);
}
static inline void omap_control_usb_phy_power(struct device *dev, int on)
{