Commit 3636fc25 authored by Douglas Anderson's avatar Douglas Anderson
Browse files

drm/bridge: ti-sn65dsi86: Add local var for "dev" to simplify probe 



Tiny cleanup for probe so we don't keep having to specify
"&client->dev" or "pdata->dev". No functional changes intended.

Signed-off-by: default avatarDouglas Anderson <dianders@chromium.org>
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20210423095743.v5.6.I83925d8ca228bdc5f55b17854c90754efc6a470e@changeid
parent 52d54819

drivers/gpu/drm/bridge/ti-sn65dsi86.c

+12 −14
Original line number Diff line number Diff line
@@ -1233,6 +1233,7 @@ static void ti_sn65dsi86_runtime_disable(void *data) 
static int ti_sn65dsi86_probe(struct i2c_client *client,

			      const struct i2c_device_id *id)

{

	struct device *dev = &client->dev;

	struct ti_sn65dsi86 *pdata;

	int ret;
@@ -1241,8 +1242,7 @@ static int ti_sn65dsi86_probe(struct i2c_client *client, 
		return -ENODEV;

	}



	pdata = devm_kzalloc(&client->dev, sizeof(struct ti_sn65dsi86),

			     GFP_KERNEL);

	pdata = devm_kzalloc(dev, sizeof(struct ti_sn65dsi86), GFP_KERNEL);

	if (!pdata)

		return -ENOMEM;
@@ -1253,26 +1253,24 @@ static int ti_sn65dsi86_probe(struct i2c_client *client, 
		return PTR_ERR(pdata->regmap);

	}



	pdata->dev = &client->dev;

	pdata->dev = dev;



	ret = drm_of_find_panel_or_bridge(pdata->dev->of_node, 1, 0,

					  &pdata->panel, NULL);

	ret = drm_of_find_panel_or_bridge(dev->of_node, 1, 0, &pdata->panel, NULL);

	if (ret) {

		DRM_ERROR("could not find any panel node\n");

		return ret;

	}



	dev_set_drvdata(&client->dev, pdata);

	dev_set_drvdata(dev, pdata);



	pdata->enable_gpio = devm_gpiod_get(pdata->dev, "enable",

					    GPIOD_OUT_LOW);

	pdata->enable_gpio = devm_gpiod_get(dev, "enable", GPIOD_OUT_LOW);

	if (IS_ERR(pdata->enable_gpio)) {

		DRM_ERROR("failed to get enable gpio from DT\n");

		ret = PTR_ERR(pdata->enable_gpio);

		return ret;

	}



	ti_sn_bridge_parse_lanes(pdata, client->dev.of_node);

	ti_sn_bridge_parse_lanes(pdata, dev->of_node);



	ret = ti_sn65dsi86_parse_regulators(pdata);

	if (ret) {
@@ -1280,7 +1278,7 @@ static int ti_sn65dsi86_probe(struct i2c_client *client, 
		return ret;

	}



	pdata->refclk = devm_clk_get_optional(pdata->dev, "refclk");

	pdata->refclk = devm_clk_get_optional(dev, "refclk");

	if (IS_ERR(pdata->refclk))

		return PTR_ERR(pdata->refclk);
@@ -1288,8 +1286,8 @@ static int ti_sn65dsi86_probe(struct i2c_client *client, 
	if (ret)

		return ret;



	pm_runtime_enable(pdata->dev);

	ret = devm_add_action_or_reset(pdata->dev, ti_sn65dsi86_runtime_disable, pdata->dev);

	pm_runtime_enable(dev);

	ret = devm_add_action_or_reset(dev, ti_sn65dsi86_runtime_disable, dev);

	if (ret)

		return ret;
@@ -1300,12 +1298,12 @@ static int ti_sn65dsi86_probe(struct i2c_client *client, 
	i2c_set_clientdata(client, pdata);



	pdata->aux.name = "ti-sn65dsi86-aux";

	pdata->aux.dev = pdata->dev;

	pdata->aux.dev = dev;

	pdata->aux.transfer = ti_sn_aux_transfer;

	drm_dp_aux_init(&pdata->aux);



	pdata->bridge.funcs = &ti_sn_bridge_funcs;

	pdata->bridge.of_node = client->dev.of_node;

	pdata->bridge.of_node = dev->of_node;



	drm_bridge_add(&pdata->bridge);