diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2018-12-10 19:55:48 +0100 |
---|---|---|
committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-02-11 09:48:21 +0100 |
commit | 1444f54dd2d2b8316e313f28baa930aecc5dce08 (patch) | |
tree | 4c98e14c1efcc65ca0d63179ea9086e1f98535e5 | |
parent | 92e914280b626e0adfe2ca8dbb164a1658f9d64c (diff) |
drm/bridge: lt8912: stop using the same name for struct and instance
While it is legal it may be confusing to the reader.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
(cherry picked from commit fbc3228c0d26e82038b7658a4bde3ddc2f61cab5)
-rw-r--r-- | drivers/gpu/drm/bridge/lt8912.c | 358 |
1 files changed, 179 insertions, 179 deletions
diff --git a/drivers/gpu/drm/bridge/lt8912.c b/drivers/gpu/drm/bridge/lt8912.c index ff053c8edf06..d2c18259f197 100644 --- a/drivers/gpu/drm/bridge/lt8912.c +++ b/drivers/gpu/drm/bridge/lt8912.c @@ -44,10 +44,10 @@ static inline struct lt8912 *connector_to_lt8912(struct drm_connector *c) } /* LT8912 MIPI to HDMI & LVDS REG setting - 20180115.txt */ -static void lt8912_init(struct lt8912 *lt8912) +static void lt8912_init(struct lt8912 *lt) { - u8 lanes = lt8912->dsi->lanes; - const struct drm_display_mode *mode = <8912->mode; + u8 lanes = lt->dsi->lanes; + const struct drm_display_mode *mode = <->mode; u32 hactive, hfp, hsync, hbp, vfp, vsync, vbp, htotal, vtotal; unsigned int version[2]; @@ -63,183 +63,183 @@ static void lt8912_init(struct lt8912 *lt8912) htotal = mode->htotal; vtotal = mode->vtotal; - regmap_read(lt8912->regmap[0], 0x00, &version[0]); - regmap_read(lt8912->regmap[0], 0x01, &version[1]); + regmap_read(lt->regmap[0], 0x00, &version[0]); + regmap_read(lt->regmap[0], 0x01, &version[1]); - dev_info(lt8912->dev, "LT8912 ID: %02x, %02x\n", + dev_info(lt->dev, "LT8912 ID: %02x, %02x\n", version[0], version[1]); /* DigitalClockEn */ - regmap_write(lt8912->regmap[0], 0x08, 0xff); - regmap_write(lt8912->regmap[0], 0x09, 0x81); - regmap_write(lt8912->regmap[0], 0x0a, 0xff); - regmap_write(lt8912->regmap[0], 0x0b, 0x64); - regmap_write(lt8912->regmap[0], 0x0c, 0xff); + regmap_write(lt->regmap[0], 0x08, 0xff); + regmap_write(lt->regmap[0], 0x09, 0x81); + regmap_write(lt->regmap[0], 0x0a, 0xff); + regmap_write(lt->regmap[0], 0x0b, 0x64); + regmap_write(lt->regmap[0], 0x0c, 0xff); - regmap_write(lt8912->regmap[0], 0x44, 0x31); - regmap_write(lt8912->regmap[0], 0x51, 0x1f); + regmap_write(lt->regmap[0], 0x44, 0x31); + regmap_write(lt->regmap[0], 0x51, 0x1f); /* TxAnalog */ - regmap_write(lt8912->regmap[0], 0x31, 0xa1); - regmap_write(lt8912->regmap[0], 0x32, 0xa1); - regmap_write(lt8912->regmap[0], 0x33, 0x03); - regmap_write(lt8912->regmap[0], 0x37, 0x00); - regmap_write(lt8912->regmap[0], 0x38, 0x22); - regmap_write(lt8912->regmap[0], 0x60, 0x82); + regmap_write(lt->regmap[0], 0x31, 0xa1); + regmap_write(lt->regmap[0], 0x32, 0xa1); + regmap_write(lt->regmap[0], 0x33, 0x03); + regmap_write(lt->regmap[0], 0x37, 0x00); + regmap_write(lt->regmap[0], 0x38, 0x22); + regmap_write(lt->regmap[0], 0x60, 0x82); /* CbusAnalog */ - regmap_write(lt8912->regmap[0], 0x39, 0x45); - regmap_write(lt8912->regmap[0], 0x3b, 0x00); + regmap_write(lt->regmap[0], 0x39, 0x45); + regmap_write(lt->regmap[0], 0x3b, 0x00); /* HDMIPllAnalog */ - regmap_write(lt8912->regmap[0], 0x44, 0x31); - regmap_write(lt8912->regmap[0], 0x55, 0x44); - regmap_write(lt8912->regmap[0], 0x57, 0x01); - regmap_write(lt8912->regmap[0], 0x5a, 0x02); + regmap_write(lt->regmap[0], 0x44, 0x31); + regmap_write(lt->regmap[0], 0x55, 0x44); + regmap_write(lt->regmap[0], 0x57, 0x01); + regmap_write(lt->regmap[0], 0x5a, 0x02); /* MipiBasicSet */ - regmap_write(lt8912->regmap[1], 0x10, 0x01); - regmap_write(lt8912->regmap[1], 0x11, 0x08); - regmap_write(lt8912->regmap[1], 0x12, 0x04); - regmap_write(lt8912->regmap[1], 0x13, lanes % 4); - regmap_write(lt8912->regmap[1], 0x14, 0x00); + regmap_write(lt->regmap[1], 0x10, 0x01); + regmap_write(lt->regmap[1], 0x11, 0x08); + regmap_write(lt->regmap[1], 0x12, 0x04); + regmap_write(lt->regmap[1], 0x13, lanes % 4); + regmap_write(lt->regmap[1], 0x14, 0x00); - regmap_write(lt8912->regmap[1], 0x15, 0x00); - regmap_write(lt8912->regmap[1], 0x1a, 0x03); - regmap_write(lt8912->regmap[1], 0x1b, 0x03); + regmap_write(lt->regmap[1], 0x15, 0x00); + regmap_write(lt->regmap[1], 0x1a, 0x03); + regmap_write(lt->regmap[1], 0x1b, 0x03); /* MIPIDig */ - regmap_write(lt8912->regmap[1], 0x18, hsync); - regmap_write(lt8912->regmap[1], 0x19, vsync); - regmap_write(lt8912->regmap[1], 0x1c, hactive); - regmap_write(lt8912->regmap[1], 0x1d, hactive >> 8); - - regmap_write(lt8912->regmap[1], 0x1e, 0x67); - regmap_write(lt8912->regmap[1], 0x2f, 0x0c); - - regmap_write(lt8912->regmap[1], 0x34, htotal); - regmap_write(lt8912->regmap[1], 0x35, htotal >> 8); - regmap_write(lt8912->regmap[1], 0x36, vtotal); - regmap_write(lt8912->regmap[1], 0x37, vtotal >> 8); - regmap_write(lt8912->regmap[1], 0x38, vbp); - regmap_write(lt8912->regmap[1], 0x39, vbp >> 8); - regmap_write(lt8912->regmap[1], 0x3a, vfp); - regmap_write(lt8912->regmap[1], 0x3b, vfp >> 8); - regmap_write(lt8912->regmap[1], 0x3c, hbp); - regmap_write(lt8912->regmap[1], 0x3d, hbp >> 8); - regmap_write(lt8912->regmap[1], 0x3e, hfp); - regmap_write(lt8912->regmap[1], 0x3f, hfp >> 8); + regmap_write(lt->regmap[1], 0x18, hsync); + regmap_write(lt->regmap[1], 0x19, vsync); + regmap_write(lt->regmap[1], 0x1c, hactive); + regmap_write(lt->regmap[1], 0x1d, hactive >> 8); + + regmap_write(lt->regmap[1], 0x1e, 0x67); + regmap_write(lt->regmap[1], 0x2f, 0x0c); + + regmap_write(lt->regmap[1], 0x34, htotal); + regmap_write(lt->regmap[1], 0x35, htotal >> 8); + regmap_write(lt->regmap[1], 0x36, vtotal); + regmap_write(lt->regmap[1], 0x37, vtotal >> 8); + regmap_write(lt->regmap[1], 0x38, vbp); + regmap_write(lt->regmap[1], 0x39, vbp >> 8); + regmap_write(lt->regmap[1], 0x3a, vfp); + regmap_write(lt->regmap[1], 0x3b, vfp >> 8); + regmap_write(lt->regmap[1], 0x3c, hbp); + regmap_write(lt->regmap[1], 0x3d, hbp >> 8); + regmap_write(lt->regmap[1], 0x3e, hfp); + regmap_write(lt->regmap[1], 0x3f, hfp >> 8); /* DDSConfig */ - regmap_write(lt8912->regmap[1], 0x4e, 0x52); - regmap_write(lt8912->regmap[1], 0x4f, 0xde); - regmap_write(lt8912->regmap[1], 0x50, 0xc0); - regmap_write(lt8912->regmap[1], 0x51, 0x80); - regmap_write(lt8912->regmap[1], 0x51, 0x00); - - regmap_write(lt8912->regmap[1], 0x1f, 0x5e); - regmap_write(lt8912->regmap[1], 0x20, 0x01); - regmap_write(lt8912->regmap[1], 0x21, 0x2c); - regmap_write(lt8912->regmap[1], 0x22, 0x01); - regmap_write(lt8912->regmap[1], 0x23, 0xfa); - regmap_write(lt8912->regmap[1], 0x24, 0x00); - regmap_write(lt8912->regmap[1], 0x25, 0xc8); - regmap_write(lt8912->regmap[1], 0x26, 0x00); - regmap_write(lt8912->regmap[1], 0x27, 0x5e); - regmap_write(lt8912->regmap[1], 0x28, 0x01); - regmap_write(lt8912->regmap[1], 0x29, 0x2c); - regmap_write(lt8912->regmap[1], 0x2a, 0x01); - regmap_write(lt8912->regmap[1], 0x2b, 0xfa); - regmap_write(lt8912->regmap[1], 0x2c, 0x00); - regmap_write(lt8912->regmap[1], 0x2d, 0xc8); - regmap_write(lt8912->regmap[1], 0x2e, 0x00); - - regmap_write(lt8912->regmap[0], 0x03, 0x7f); + regmap_write(lt->regmap[1], 0x4e, 0x52); + regmap_write(lt->regmap[1], 0x4f, 0xde); + regmap_write(lt->regmap[1], 0x50, 0xc0); + regmap_write(lt->regmap[1], 0x51, 0x80); + regmap_write(lt->regmap[1], 0x51, 0x00); + + regmap_write(lt->regmap[1], 0x1f, 0x5e); + regmap_write(lt->regmap[1], 0x20, 0x01); + regmap_write(lt->regmap[1], 0x21, 0x2c); + regmap_write(lt->regmap[1], 0x22, 0x01); + regmap_write(lt->regmap[1], 0x23, 0xfa); + regmap_write(lt->regmap[1], 0x24, 0x00); + regmap_write(lt->regmap[1], 0x25, 0xc8); + regmap_write(lt->regmap[1], 0x26, 0x00); + regmap_write(lt->regmap[1], 0x27, 0x5e); + regmap_write(lt->regmap[1], 0x28, 0x01); + regmap_write(lt->regmap[1], 0x29, 0x2c); + regmap_write(lt->regmap[1], 0x2a, 0x01); + regmap_write(lt->regmap[1], 0x2b, 0xfa); + regmap_write(lt->regmap[1], 0x2c, 0x00); + regmap_write(lt->regmap[1], 0x2d, 0xc8); + regmap_write(lt->regmap[1], 0x2e, 0x00); + + regmap_write(lt->regmap[0], 0x03, 0x7f); usleep_range(10000, 20000); - regmap_write(lt8912->regmap[0], 0x03, 0xff); - - regmap_write(lt8912->regmap[1], 0x42, 0x64); - regmap_write(lt8912->regmap[1], 0x43, 0x00); - regmap_write(lt8912->regmap[1], 0x44, 0x04); - regmap_write(lt8912->regmap[1], 0x45, 0x00); - regmap_write(lt8912->regmap[1], 0x46, 0x59); - regmap_write(lt8912->regmap[1], 0x47, 0x00); - regmap_write(lt8912->regmap[1], 0x48, 0xf2); - regmap_write(lt8912->regmap[1], 0x49, 0x06); - regmap_write(lt8912->regmap[1], 0x4a, 0x00); - regmap_write(lt8912->regmap[1], 0x4b, 0x72); - regmap_write(lt8912->regmap[1], 0x4c, 0x45); - regmap_write(lt8912->regmap[1], 0x4d, 0x00); - regmap_write(lt8912->regmap[1], 0x52, 0x08); - regmap_write(lt8912->regmap[1], 0x53, 0x00); - regmap_write(lt8912->regmap[1], 0x54, 0xb2); - regmap_write(lt8912->regmap[1], 0x55, 0x00); - regmap_write(lt8912->regmap[1], 0x56, 0xe4); - regmap_write(lt8912->regmap[1], 0x57, 0x0d); - regmap_write(lt8912->regmap[1], 0x58, 0x00); - regmap_write(lt8912->regmap[1], 0x59, 0xe4); - regmap_write(lt8912->regmap[1], 0x5a, 0x8a); - regmap_write(lt8912->regmap[1], 0x5b, 0x00); - regmap_write(lt8912->regmap[1], 0x5c, 0x34); - regmap_write(lt8912->regmap[1], 0x1e, 0x4f); - regmap_write(lt8912->regmap[1], 0x51, 0x00); - - regmap_write(lt8912->regmap[0], 0xb2, 0x01); + regmap_write(lt->regmap[0], 0x03, 0xff); + + regmap_write(lt->regmap[1], 0x42, 0x64); + regmap_write(lt->regmap[1], 0x43, 0x00); + regmap_write(lt->regmap[1], 0x44, 0x04); + regmap_write(lt->regmap[1], 0x45, 0x00); + regmap_write(lt->regmap[1], 0x46, 0x59); + regmap_write(lt->regmap[1], 0x47, 0x00); + regmap_write(lt->regmap[1], 0x48, 0xf2); + regmap_write(lt->regmap[1], 0x49, 0x06); + regmap_write(lt->regmap[1], 0x4a, 0x00); + regmap_write(lt->regmap[1], 0x4b, 0x72); + regmap_write(lt->regmap[1], 0x4c, 0x45); + regmap_write(lt->regmap[1], 0x4d, 0x00); + regmap_write(lt->regmap[1], 0x52, 0x08); + regmap_write(lt->regmap[1], 0x53, 0x00); + regmap_write(lt->regmap[1], 0x54, 0xb2); + regmap_write(lt->regmap[1], 0x55, 0x00); + regmap_write(lt->regmap[1], 0x56, 0xe4); + regmap_write(lt->regmap[1], 0x57, 0x0d); + regmap_write(lt->regmap[1], 0x58, 0x00); + regmap_write(lt->regmap[1], 0x59, 0xe4); + regmap_write(lt->regmap[1], 0x5a, 0x8a); + regmap_write(lt->regmap[1], 0x5b, 0x00); + regmap_write(lt->regmap[1], 0x5c, 0x34); + regmap_write(lt->regmap[1], 0x1e, 0x4f); + regmap_write(lt->regmap[1], 0x51, 0x00); + + regmap_write(lt->regmap[0], 0xb2, 0x01); /* AudioIIsEn */ - regmap_write(lt8912->regmap[2], 0x06, 0x08); - regmap_write(lt8912->regmap[2], 0x07, 0xf0); + regmap_write(lt->regmap[2], 0x06, 0x08); + regmap_write(lt->regmap[2], 0x07, 0xf0); - regmap_write(lt8912->regmap[2], 0x34, 0xd2); + regmap_write(lt->regmap[2], 0x34, 0xd2); - regmap_write(lt8912->regmap[2], 0x3c, 0x41); + regmap_write(lt->regmap[2], 0x3c, 0x41); /* MIPIRxLogicRes */ - regmap_write(lt8912->regmap[0], 0x03, 0x7f); + regmap_write(lt->regmap[0], 0x03, 0x7f); usleep_range(10000, 20000); - regmap_write(lt8912->regmap[0], 0x03, 0xff); + regmap_write(lt->regmap[0], 0x03, 0xff); - regmap_write(lt8912->regmap[1], 0x51, 0x80); + regmap_write(lt->regmap[1], 0x51, 0x80); usleep_range(10000, 20000); - regmap_write(lt8912->regmap[1], 0x51, 0x00); + regmap_write(lt->regmap[1], 0x51, 0x00); } -static void lt8912_exit(struct lt8912 *lt8912) +static void lt8912_exit(struct lt8912 *lt) { - regmap_write(lt8912->regmap[0], 0x08, 0x00); - regmap_write(lt8912->regmap[0], 0x09, 0x81); - regmap_write(lt8912->regmap[0], 0x0a, 0x00); - regmap_write(lt8912->regmap[0], 0x0b, 0x20); - regmap_write(lt8912->regmap[0], 0x0c, 0x00); - - regmap_write(lt8912->regmap[0], 0x54, 0x1d); - regmap_write(lt8912->regmap[0], 0x51, 0x15); - - regmap_write(lt8912->regmap[0], 0x44, 0x31); - regmap_write(lt8912->regmap[0], 0x41, 0xbd); - regmap_write(lt8912->regmap[0], 0x5c, 0x11); - - regmap_write(lt8912->regmap[0], 0x30, 0x08); - regmap_write(lt8912->regmap[0], 0x31, 0x00); - regmap_write(lt8912->regmap[0], 0x32, 0x00); - regmap_write(lt8912->regmap[0], 0x33, 0x00); - regmap_write(lt8912->regmap[0], 0x34, 0x00); - regmap_write(lt8912->regmap[0], 0x35, 0x00); - regmap_write(lt8912->regmap[0], 0x36, 0x00); - regmap_write(lt8912->regmap[0], 0x37, 0x00); - regmap_write(lt8912->regmap[0], 0x38, 0x00); + regmap_write(lt->regmap[0], 0x08, 0x00); + regmap_write(lt->regmap[0], 0x09, 0x81); + regmap_write(lt->regmap[0], 0x0a, 0x00); + regmap_write(lt->regmap[0], 0x0b, 0x20); + regmap_write(lt->regmap[0], 0x0c, 0x00); + + regmap_write(lt->regmap[0], 0x54, 0x1d); + regmap_write(lt->regmap[0], 0x51, 0x15); + + regmap_write(lt->regmap[0], 0x44, 0x31); + regmap_write(lt->regmap[0], 0x41, 0xbd); + regmap_write(lt->regmap[0], 0x5c, 0x11); + + regmap_write(lt->regmap[0], 0x30, 0x08); + regmap_write(lt->regmap[0], 0x31, 0x00); + regmap_write(lt->regmap[0], 0x32, 0x00); + regmap_write(lt->regmap[0], 0x33, 0x00); + regmap_write(lt->regmap[0], 0x34, 0x00); + regmap_write(lt->regmap[0], 0x35, 0x00); + regmap_write(lt->regmap[0], 0x36, 0x00); + regmap_write(lt->regmap[0], 0x37, 0x00); + regmap_write(lt->regmap[0], 0x38, 0x00); } -static void lt8912_power_on(struct lt8912 *lt8912) +static void lt8912_power_on(struct lt8912 *lt) { - gpiod_direction_output(lt8912->reset_n, 1); + gpiod_direction_output(lt->reset_n, 1); msleep(120); - gpiod_direction_output(lt8912->reset_n, 0); + gpiod_direction_output(lt->reset_n, 0); } -static void lt8912_power_off(struct lt8912 *lt8912) +static void lt8912_power_off(struct lt8912 *lt) { - gpiod_direction_output(lt8912->reset_n, 1); + gpiod_direction_output(lt->reset_n, 1); } static enum drm_connector_status @@ -261,14 +261,14 @@ static const struct drm_connector_funcs lt8912_connector_funcs = { static struct drm_encoder * lt8912_connector_best_encoder(struct drm_connector *connector) { - struct lt8912 *lt8912 = connector_to_lt8912(connector); + struct lt8912 *lt = connector_to_lt8912(connector); - return lt8912->bridge.encoder; + return lt->bridge.encoder; } static int lt8912_connector_get_modes(struct drm_connector *connector) { - struct lt8912 *lt8912 = connector_to_lt8912(connector); + struct lt8912 *lt = connector_to_lt8912(connector); struct drm_display_mode *mode; u32 bus_flags = 0; int ret; @@ -279,10 +279,10 @@ static int lt8912_connector_get_modes(struct drm_connector *connector) if (!mode) return -EINVAL; - ret = of_get_drm_display_mode(lt8912->dev->of_node, mode, + ret = of_get_drm_display_mode(lt->dev->of_node, mode, &bus_flags, OF_USE_NATIVE_MODE); if (ret) { - dev_err(lt8912->dev, "failed to get display timings\n"); + dev_err(lt->dev, "failed to get display timings\n"); drm_mode_destroy(connector->dev, mode); return 0; } @@ -301,52 +301,52 @@ static const struct drm_connector_helper_funcs lt8912_connector_helper_funcs = { static void lt8912_bridge_post_disable(struct drm_bridge *bridge) { - struct lt8912 *lt8912 = bridge_to_lt8912(bridge); + struct lt8912 *lt = bridge_to_lt8912(bridge); - lt8912_power_off(lt8912); + lt8912_power_off(lt); } static void lt8912_bridge_disable(struct drm_bridge *bridge) { - struct lt8912 *lt8912 = bridge_to_lt8912(bridge); + struct lt8912 *lt = bridge_to_lt8912(bridge); - lt8912_exit(lt8912); + lt8912_exit(lt); } static void lt8912_bridge_enable(struct drm_bridge *bridge) { - struct lt8912 *lt8912 = bridge_to_lt8912(bridge); + struct lt8912 *lt = bridge_to_lt8912(bridge); - lt8912_init(lt8912); + lt8912_init(lt); } static void lt8912_bridge_pre_enable(struct drm_bridge *bridge) { - struct lt8912 *lt8912 = bridge_to_lt8912(bridge); + struct lt8912 *lt = bridge_to_lt8912(bridge); - lt8912_power_on(lt8912); + lt8912_power_on(lt); } static void lt8912_bridge_mode_set(struct drm_bridge *bridge, struct drm_display_mode *mode, struct drm_display_mode *adj) { - struct lt8912 *lt8912 = bridge_to_lt8912(bridge); + struct lt8912 *lt = bridge_to_lt8912(bridge); - drm_mode_copy(<8912->mode, adj); + drm_mode_copy(<->mode, adj); } static int lt8912_bridge_attach(struct drm_bridge *bridge) { - struct lt8912 *lt8912 = bridge_to_lt8912(bridge); - struct drm_connector *connector = <8912->connector; + struct lt8912 *lt = bridge_to_lt8912(bridge); + struct drm_connector *connector = <->connector; int ret; ret = drm_connector_init(bridge->dev, connector, <8912_connector_funcs, DRM_MODE_CONNECTOR_HDMIA); if (ret) { - dev_err(lt8912->dev, "failed to initialize connector\n"); + dev_err(lt->dev, "failed to initialize connector\n"); return ret; } @@ -371,7 +371,7 @@ static const struct regmap_config lt8912_regmap_config = { .max_register = 0xff, }; -static int lt8912_i2c_init(struct lt8912 *lt8912, +static int lt8912_i2c_init(struct lt8912 *lt, struct i2c_adapter *adapter) { struct i2c_board_info info[] = { @@ -393,12 +393,12 @@ static int lt8912_i2c_init(struct lt8912 *lt8912, regmap = devm_regmap_init_i2c(client, <8912_regmap_config); if (IS_ERR(regmap)) { ret = PTR_ERR(regmap); - dev_err(lt8912->dev, + dev_err(lt->dev, "Failed to initialize regmap: %d\n", ret); return ret; } - lt8912->regmap[i] = regmap; + lt->regmap[i] = regmap; } return 0; @@ -407,22 +407,22 @@ static int lt8912_i2c_init(struct lt8912 *lt8912, static int lt8912_probe(struct mipi_dsi_device *dsi) { struct device *dev = &dsi->dev; - struct lt8912 *lt8912; + struct lt8912 *lt; struct device_node *node; struct i2c_adapter *adapter; int ret; - lt8912 = devm_kzalloc(dev, sizeof(*lt8912), GFP_KERNEL); - if (!lt8912) + lt = devm_kzalloc(dev, sizeof(*lt), GFP_KERNEL); + if (!lt) return -ENOMEM; - lt8912->dev = dev; - lt8912->dsi = dsi; - mipi_dsi_set_drvdata(dsi, lt8912); + lt->dev = dev; + lt->dsi = dsi; + mipi_dsi_set_drvdata(dsi, lt); - lt8912->reset_n = devm_gpiod_get(dev, "reset", GPIOD_ASIS); - if (IS_ERR(lt8912->reset_n)) { - ret = PTR_ERR(lt8912->reset_n); + lt->reset_n = devm_gpiod_get(dev, "reset", GPIOD_ASIS); + if (IS_ERR(lt->reset_n)) { + ret = PTR_ERR(lt->reset_n); dev_err(dev, "failed to request reset GPIO: %d\n", ret); return ret; } @@ -440,15 +440,15 @@ static int lt8912_probe(struct mipi_dsi_device *dsi) return -EPROBE_DEFER; } - ret = lt8912_i2c_init(lt8912, adapter); + ret = lt8912_i2c_init(lt, adapter); if (ret) return ret; /* TODO: interrupt handing */ - lt8912->bridge.funcs = <8912_bridge_funcs; - lt8912->bridge.of_node = dev->of_node; - ret = drm_bridge_add(<8912->bridge); + lt->bridge.funcs = <8912_bridge_funcs; + lt->bridge.of_node = dev->of_node; + ret = drm_bridge_add(<->bridge); if (ret) { dev_err(dev, "failed to add bridge: %d\n", ret); return ret; @@ -461,7 +461,7 @@ static int lt8912_probe(struct mipi_dsi_device *dsi) ret = mipi_dsi_attach(dsi); if (ret) { - drm_bridge_remove(<8912->bridge); + drm_bridge_remove(<->bridge); dev_err(dev, "failed to attach dsi to host: %d\n", ret); return ret; } @@ -471,10 +471,10 @@ static int lt8912_probe(struct mipi_dsi_device *dsi) static int lt8912_remove(struct mipi_dsi_device *dsi) { - struct lt8912 *lt8912 = mipi_dsi_get_drvdata(dsi); + struct lt8912 *lt = mipi_dsi_get_drvdata(dsi); mipi_dsi_detach(dsi); - drm_bridge_remove(<8912->bridge); + drm_bridge_remove(<->bridge); return 0; } |