lkml.org 
[lkml]   [2013]   [Jun]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v7 9/9] usb: phy: twl4030-usb: remove *set_suspend* and *phy_init* ops
    Date
    Now that twl4030-usb is adapted to the new generic PHY framework,
    *set_suspend* and *phy_init* ops can be removed from twl4030-usb driver.

    Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
    ---
    drivers/usb/phy/phy-twl4030-usb.c | 55 ++++++++-----------------------------
    1 file changed, 12 insertions(+), 43 deletions(-)

    diff --git a/drivers/usb/phy/phy-twl4030-usb.c b/drivers/usb/phy/phy-twl4030-usb.c
    index fba9697..5245b86 100644
    --- a/drivers/usb/phy/phy-twl4030-usb.c
    +++ b/drivers/usb/phy/phy-twl4030-usb.c
    @@ -422,25 +422,20 @@ static void twl4030_phy_power(struct twl4030_usb *twl, int on)
    }
    }

    -static void twl4030_phy_suspend(struct twl4030_usb *twl, int controller_off)
    +static int twl4030_phy_power_off(struct phy *phy)
    {
    + struct twl4030_usb *twl = dev_get_drvdata(&phy->dev);
    +
    if (twl->asleep)
    - return;
    + return 0;

    twl4030_phy_power(twl, 0);
    twl->asleep = 1;
    dev_dbg(twl->dev, "%s\n", __func__);
    -}
    -
    -static int twl4030_phy_power_off(struct phy *phy)
    -{
    - struct twl4030_usb *twl = dev_get_drvdata(&phy->dev);
    -
    - twl4030_phy_suspend(twl, 0);
    return 0;
    }

    -static void __twl4030_phy_resume(struct twl4030_usb *twl)
    +static void __twl4030_phy_power_on(struct twl4030_usb *twl)
    {
    twl4030_phy_power(twl, 1);
    twl4030_i2c_access(twl, 1);
    @@ -449,11 +444,13 @@ static void __twl4030_phy_resume(struct twl4030_usb *twl)
    twl4030_i2c_access(twl, 0);
    }

    -static void twl4030_phy_resume(struct twl4030_usb *twl)
    +static int twl4030_phy_power_on(struct phy *phy)
    {
    + struct twl4030_usb *twl = dev_get_drvdata(&phy->dev);
    +
    if (!twl->asleep)
    - return;
    - __twl4030_phy_resume(twl);
    + return 0;
    + __twl4030_phy_power_on(twl);
    twl->asleep = 0;
    dev_dbg(twl->dev, "%s\n", __func__);

    @@ -466,13 +463,6 @@ static void twl4030_phy_resume(struct twl4030_usb *twl)
    cancel_delayed_work(&twl->id_workaround_work);
    schedule_delayed_work(&twl->id_workaround_work, HZ);
    }
    -}
    -
    -static int twl4030_phy_power_on(struct phy *phy)
    -{
    - struct twl4030_usb *twl = dev_get_drvdata(&phy->dev);
    -
    - twl4030_phy_resume(twl);
    return 0;
    }

    @@ -604,9 +594,9 @@ static void twl4030_id_workaround_work(struct work_struct *work)
    }
    }

    -static int twl4030_usb_phy_init(struct usb_phy *phy)
    +static int twl4030_phy_init(struct phy *phy)
    {
    - struct twl4030_usb *twl = phy_to_twl(phy);
    + struct twl4030_usb *twl = dev_get_drvdata(&phy->dev);
    enum omap_musb_vbus_id_status status;

    /*
    @@ -628,25 +618,6 @@ static int twl4030_usb_phy_init(struct usb_phy *phy)
    return 0;
    }

    -static int twl4030_phy_init(struct phy *phy)
    -{
    - struct twl4030_usb *twl = dev_get_drvdata(&phy->dev);
    -
    - return twl4030_usb_phy_init(&twl->phy);
    -}
    -
    -static int twl4030_set_suspend(struct usb_phy *x, int suspend)
    -{
    - struct twl4030_usb *twl = phy_to_twl(x);
    -
    - if (suspend)
    - twl4030_phy_suspend(twl, 1);
    - else
    - twl4030_phy_resume(twl);
    -
    - return 0;
    -}
    -
    static int twl4030_set_peripheral(struct usb_otg *otg,
    struct usb_gadget *gadget)
    {
    @@ -717,8 +688,6 @@ static int twl4030_usb_probe(struct platform_device *pdev)
    twl->phy.label = "twl4030";
    twl->phy.otg = otg;
    twl->phy.type = USB_PHY_TYPE_USB2;
    - twl->phy.set_suspend = twl4030_set_suspend;
    - twl->phy.init = twl4030_usb_phy_init;

    otg->phy = &twl->phy;
    otg->set_host = twl4030_set_host;
    --
    1.7.10.4


    \
     
     \ /
      Last update: 2013-06-13 11:21    [W:5.259 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site