Prepare dropping the alias "dev" for struct drm_crtc::drm_dev. "drm_dev"
is the better name as "dev" is usually a struct device pointer.
No semantic changes.
Signed-off-by: Uwe Kleine-König <u.kleine-koe...@pengutronix.de>
---
drivers/gpu/drm/mxsfb/lcdif_kms.c | 18 +++++++++---------
drivers/gpu/drm/mxsfb/mxsfb_kms.c | 16 ++++++++--------
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/drivers/gpu/drm/mxsfb/lcdif_kms.c
b/drivers/gpu/drm/mxsfb/lcdif_kms.c
index 2541d2de4e45..28353ad09119 100644
--- a/drivers/gpu/drm/mxsfb/lcdif_kms.c
+++ b/drivers/gpu/drm/mxsfb/lcdif_kms.c
@@ -402,7 +402,7 @@ static void lcdif_crtc_mode_set_nofb(struct drm_crtc_state
*crtc_state,
struct drm_plane_state *plane_state)
{
struct lcdif_crtc_state *lcdif_crtc_state =
to_lcdif_crtc_state(crtc_state);
- struct drm_device *drm = crtc_state->crtc->dev;
+ struct drm_device *drm = crtc_state->crtc->drm_dev;
struct lcdif_drm_private *lcdif = to_lcdif_drm_private(drm);
struct drm_display_mode *m = &crtc_state->adjusted_mode;
@@ -424,7 +424,7 @@ static void lcdif_crtc_mode_set_nofb(struct drm_crtc_state
*crtc_state,
static int lcdif_crtc_atomic_check(struct drm_crtc *crtc,
struct drm_atomic_state *state)
{
- struct drm_device *drm = crtc->dev;
+ struct drm_device *drm = crtc->drm_dev;
struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state,
crtc);
struct lcdif_crtc_state *lcdif_crtc_state =
to_lcdif_crtc_state(crtc_state);
@@ -505,7 +505,7 @@ static int lcdif_crtc_atomic_check(struct drm_crtc *crtc,
static void lcdif_crtc_atomic_flush(struct drm_crtc *crtc,
struct drm_atomic_state *state)
{
- struct lcdif_drm_private *lcdif = to_lcdif_drm_private(crtc->dev);
+ struct lcdif_drm_private *lcdif = to_lcdif_drm_private(crtc->drm_dev);
struct drm_pending_vblank_event *event;
u32 reg;
@@ -519,18 +519,18 @@ static void lcdif_crtc_atomic_flush(struct drm_crtc *crtc,
if (!event)
return;
- spin_lock_irq(&crtc->dev->event_lock);
+ spin_lock_irq(&crtc->drm_dev->event_lock);
if (drm_crtc_vblank_get(crtc) == 0)
drm_crtc_arm_vblank_event(crtc, event);
else
drm_crtc_send_vblank_event(crtc, event);
- spin_unlock_irq(&crtc->dev->event_lock);
+ spin_unlock_irq(&crtc->drm_dev->event_lock);
}
static void lcdif_crtc_atomic_enable(struct drm_crtc *crtc,
struct drm_atomic_state *state)
{
- struct lcdif_drm_private *lcdif = to_lcdif_drm_private(crtc->dev);
+ struct lcdif_drm_private *lcdif = to_lcdif_drm_private(crtc->drm_dev);
struct drm_crtc_state *new_cstate =
drm_atomic_get_new_crtc_state(state, crtc);
struct drm_plane_state *new_pstate =
drm_atomic_get_new_plane_state(state,
crtc->primary);
@@ -560,7 +560,7 @@ static void lcdif_crtc_atomic_enable(struct drm_crtc *crtc,
static void lcdif_crtc_atomic_disable(struct drm_crtc *crtc,
struct drm_atomic_state *state)
{
- struct lcdif_drm_private *lcdif = to_lcdif_drm_private(crtc->dev);
+ struct lcdif_drm_private *lcdif = to_lcdif_drm_private(crtc->drm_dev);
struct drm_device *drm = lcdif->drm;
struct drm_pending_vblank_event *event;
@@ -623,7 +623,7 @@ lcdif_crtc_atomic_duplicate_state(struct drm_crtc *crtc)
static int lcdif_crtc_enable_vblank(struct drm_crtc *crtc)
{
- struct lcdif_drm_private *lcdif = to_lcdif_drm_private(crtc->dev);
+ struct lcdif_drm_private *lcdif = to_lcdif_drm_private(crtc->drm_dev);
/* Clear and enable VBLANK IRQ */
writel(INT_STATUS_D0_VS_BLANK, lcdif->base + LCDC_V8_INT_STATUS_D0);
@@ -634,7 +634,7 @@ static int lcdif_crtc_enable_vblank(struct drm_crtc *crtc)
static void lcdif_crtc_disable_vblank(struct drm_crtc *crtc)
{
- struct lcdif_drm_private *lcdif = to_lcdif_drm_private(crtc->dev);
+ struct lcdif_drm_private *lcdif = to_lcdif_drm_private(crtc->drm_dev);
/* Disable and clear VBLANK IRQ */
writel(0, lcdif->base + LCDC_V8_INT_ENABLE_D0);
diff --git a/drivers/gpu/drm/mxsfb/mxsfb_kms.c
b/drivers/gpu/drm/mxsfb/mxsfb_kms.c
index 3bcc9c0f2019..934529b785ff 100644
--- a/drivers/gpu/drm/mxsfb/mxsfb_kms.c
+++ b/drivers/gpu/drm/mxsfb/mxsfb_kms.c
@@ -279,7 +279,7 @@ static void mxsfb_crtc_mode_set_nofb(struct
mxsfb_drm_private *mxsfb,
struct drm_bridge_state *bridge_state,
const u32 bus_format)
{
- struct drm_device *drm = mxsfb->crtc.dev;
+ struct drm_device *drm = mxsfb->crtc.drm_dev;
struct drm_display_mode *m = &mxsfb->crtc.state->adjusted_mode;
u32 bus_flags = mxsfb->connector->display_info.bus_flags;
int err;
@@ -335,18 +335,18 @@ static void mxsfb_crtc_atomic_flush(struct drm_crtc *crtc,
if (!event)
return;
- spin_lock_irq(&crtc->dev->event_lock);
+ spin_lock_irq(&crtc->drm_dev->event_lock);
if (drm_crtc_vblank_get(crtc) == 0)
drm_crtc_arm_vblank_event(crtc, event);
else
drm_crtc_send_vblank_event(crtc, event);
- spin_unlock_irq(&crtc->dev->event_lock);
+ spin_unlock_irq(&crtc->drm_dev->event_lock);
}
static void mxsfb_crtc_atomic_enable(struct drm_crtc *crtc,
struct drm_atomic_state *state)
{
- struct mxsfb_drm_private *mxsfb = to_mxsfb_drm_private(crtc->dev);
+ struct mxsfb_drm_private *mxsfb = to_mxsfb_drm_private(crtc->drm_dev);
struct drm_plane_state *new_pstate =
drm_atomic_get_new_plane_state(state,
crtc->primary);
struct drm_bridge_state *bridge_state = NULL;
@@ -400,7 +400,7 @@ static void mxsfb_crtc_atomic_enable(struct drm_crtc *crtc,
static void mxsfb_crtc_atomic_disable(struct drm_crtc *crtc,
struct drm_atomic_state *state)
{
- struct mxsfb_drm_private *mxsfb = to_mxsfb_drm_private(crtc->dev);
+ struct mxsfb_drm_private *mxsfb = to_mxsfb_drm_private(crtc->drm_dev);
struct drm_device *drm = mxsfb->drm;
struct drm_pending_vblank_event *event;
@@ -422,7 +422,7 @@ static void mxsfb_crtc_atomic_disable(struct drm_crtc *crtc,
static int mxsfb_crtc_enable_vblank(struct drm_crtc *crtc)
{
- struct mxsfb_drm_private *mxsfb = to_mxsfb_drm_private(crtc->dev);
+ struct mxsfb_drm_private *mxsfb = to_mxsfb_drm_private(crtc->drm_dev);
/* Clear and enable VBLANK IRQ */
writel(CTRL1_CUR_FRAME_DONE_IRQ, mxsfb->base + LCDC_CTRL1 + REG_CLR);
@@ -433,7 +433,7 @@ static int mxsfb_crtc_enable_vblank(struct drm_crtc *crtc)
static void mxsfb_crtc_disable_vblank(struct drm_crtc *crtc)
{
- struct mxsfb_drm_private *mxsfb = to_mxsfb_drm_private(crtc->dev);
+ struct mxsfb_drm_private *mxsfb = to_mxsfb_drm_private(crtc->drm_dev);
/* Disable and clear VBLANK IRQ */
writel(CTRL1_CUR_FRAME_DONE_IRQ_EN, mxsfb->base + LCDC_CTRL1 + REG_CLR);
@@ -447,7 +447,7 @@ static int mxsfb_crtc_set_crc_source(struct drm_crtc *crtc,
const char *source)
if (!crtc)
return -ENODEV;
- mxsfb = to_mxsfb_drm_private(crtc->dev);
+ mxsfb = to_mxsfb_drm_private(crtc->drm_dev);
if (source && strcmp(source, "auto") == 0)
mxsfb->crc_active = true;
--
2.39.2
