Skip to content

Commit 7a195f1

Browse files
author
Thomas Zimmermann
committed
drm/bochs: Pass bochs device to various functions
Avoid upcasting from struct drm_device by passing the bochs device directly to functions. Signed-off-by: Thomas Zimmermann <[email protected]> Acked-by: Gerd Hoffmann <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 58e980c commit 7a195f1

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/gpu/drm/tiny/bochs.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,9 @@ static const struct drm_edid *bochs_hw_read_edid(struct drm_connector *connector
204204
return drm_edid_read_custom(connector, bochs_get_edid_block, bochs);
205205
}
206206

207-
static int bochs_hw_init(struct drm_device *dev)
207+
static int bochs_hw_init(struct bochs_device *bochs)
208208
{
209-
struct bochs_device *bochs = dev->dev_private;
209+
struct drm_device *dev = bochs->dev;
210210
struct pci_dev *pdev = to_pci_dev(dev->dev);
211211
unsigned long addr, size, mem, ioaddr, iosize;
212212
u16 id;
@@ -481,9 +481,9 @@ static const struct drm_connector_funcs bochs_connector_connector_funcs = {
481481
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
482482
};
483483

484-
static void bochs_connector_init(struct drm_device *dev)
484+
static void bochs_connector_init(struct bochs_device *bochs)
485485
{
486-
struct bochs_device *bochs = dev->dev_private;
486+
struct drm_device *dev = bochs->dev;
487487
struct drm_connector *connector = &bochs->connector;
488488

489489
drm_connector_init(dev, connector, &bochs_connector_connector_funcs,
@@ -516,7 +516,7 @@ static int bochs_kms_init(struct bochs_device *bochs)
516516

517517
bochs->dev->mode_config.funcs = &bochs_mode_funcs;
518518

519-
bochs_connector_init(bochs->dev);
519+
bochs_connector_init(bochs);
520520
drm_simple_display_pipe_init(bochs->dev,
521521
&bochs->pipe,
522522
&bochs_pipe_funcs,
@@ -544,7 +544,7 @@ static int bochs_load(struct drm_device *dev)
544544
dev->dev_private = bochs;
545545
bochs->dev = dev;
546546

547-
ret = bochs_hw_init(dev);
547+
ret = bochs_hw_init(bochs);
548548
if (ret)
549549
return ret;
550550

0 commit comments

Comments
 (0)