lkml.org 
[lkml]   [2016]   [Jan]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 5/8] i2c-mux: pinctrl: get rid of the driver private struct device pointer
    Date
    From: Peter Rosin <peda@axentia.se>

    There is a copy of the device pointer in the mux core.

    Signed-off-by: Peter Rosin <peda@axentia.se>
    ---
    drivers/i2c/muxes/i2c-mux-pinctrl.c | 23 ++++++++---------------
    1 file changed, 8 insertions(+), 15 deletions(-)

    diff --git a/drivers/i2c/muxes/i2c-mux-pinctrl.c b/drivers/i2c/muxes/i2c-mux-pinctrl.c
    index 0dc912898813..38129850cbe4 100644
    --- a/drivers/i2c/muxes/i2c-mux-pinctrl.c
    +++ b/drivers/i2c/muxes/i2c-mux-pinctrl.c
    @@ -26,7 +26,6 @@
    #include <linux/of.h>

    struct i2c_mux_pinctrl {
    - struct device *dev;
    struct i2c_mux_pinctrl_platform_data *pdata;
    struct pinctrl *pinctrl;
    struct pinctrl_state **states;
    @@ -51,6 +50,7 @@ static int i2c_mux_pinctrl_deselect(struct i2c_mux_core *muxc, u32 chan)
    static int i2c_mux_pinctrl_parse_dt(struct i2c_mux_pinctrl *mux,
    struct platform_device *pdev)
    {
    + struct i2c_mux_core *muxc = platform_get_drvdata(pdev);
    struct device_node *np = pdev->dev.of_node;
    int num_names, i, ret;
    struct device_node *adapter_np;
    @@ -60,15 +60,12 @@ static int i2c_mux_pinctrl_parse_dt(struct i2c_mux_pinctrl *mux,
    return 0;

    mux->pdata = devm_kzalloc(&pdev->dev, sizeof(*mux->pdata), GFP_KERNEL);
    - if (!mux->pdata) {
    - dev_err(mux->dev,
    - "Cannot allocate i2c_mux_pinctrl_platform_data\n");
    + if (!mux->pdata)
    return -ENOMEM;
    - }

    num_names = of_property_count_strings(np, "pinctrl-names");
    if (num_names < 0) {
    - dev_err(mux->dev, "Cannot parse pinctrl-names: %d\n",
    + dev_err(muxc->dev, "Cannot parse pinctrl-names: %d\n",
    num_names);
    return num_names;
    }
    @@ -76,23 +73,21 @@ static int i2c_mux_pinctrl_parse_dt(struct i2c_mux_pinctrl *mux,
    mux->pdata->pinctrl_states = devm_kzalloc(&pdev->dev,
    sizeof(*mux->pdata->pinctrl_states) * num_names,
    GFP_KERNEL);
    - if (!mux->pdata->pinctrl_states) {
    - dev_err(mux->dev, "Cannot allocate pinctrl_states\n");
    + if (!mux->pdata->pinctrl_states)
    return -ENOMEM;
    - }

    for (i = 0; i < num_names; i++) {
    ret = of_property_read_string_index(np, "pinctrl-names", i,
    &mux->pdata->pinctrl_states[mux->pdata->bus_count]);
    if (ret < 0) {
    - dev_err(mux->dev, "Cannot parse pinctrl-names: %d\n",
    + dev_err(muxc->dev, "Cannot parse pinctrl-names: %d\n",
    ret);
    return ret;
    }
    if (!strcmp(mux->pdata->pinctrl_states[mux->pdata->bus_count],
    "idle")) {
    if (i != num_names - 1) {
    - dev_err(mux->dev, "idle state must be last\n");
    + dev_err(muxc->dev, "idle state must be last\n");
    return -EINVAL;
    }
    mux->pdata->pinctrl_state_idle = "idle";
    @@ -103,13 +98,13 @@ static int i2c_mux_pinctrl_parse_dt(struct i2c_mux_pinctrl *mux,

    adapter_np = of_parse_phandle(np, "i2c-parent", 0);
    if (!adapter_np) {
    - dev_err(mux->dev, "Cannot parse i2c-parent\n");
    + dev_err(muxc->dev, "Cannot parse i2c-parent\n");
    return -ENODEV;
    }
    adapter = of_find_i2c_adapter_by_node(adapter_np);
    of_node_put(adapter_np);
    if (!adapter) {
    - dev_err(mux->dev, "Cannot find parent bus\n");
    + dev_err(muxc->dev, "Cannot find parent bus\n");
    return -EPROBE_DEFER;
    }
    mux->pdata->parent_bus_num = i2c_adapter_id(adapter);
    @@ -139,8 +134,6 @@ static int i2c_mux_pinctrl_probe(struct platform_device *pdev)
    mux = i2c_mux_priv(muxc);
    platform_set_drvdata(pdev, muxc);

    - mux->dev = &pdev->dev;
    -
    mux->pdata = dev_get_platdata(&pdev->dev);
    if (!mux->pdata) {
    ret = i2c_mux_pinctrl_parse_dt(mux, pdev);
    --
    2.1.4


    \
     
     \ /
      Last update: 2016-01-05 17:21    [W:4.046 / U:0.908 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site