Commit d35a4bf6 authored by Hans de Goede's avatar Hans de Goede
Browse files

drm/gma500: Remove a couple of not useful function wrappers 



The gma_crtc_set_config() and psb_unlocked_ioctl() functions are 1:1
wrappers for drm_helpers. Drop these wrappers.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Acked-by: default avatarPatrik Jakobsson <patrik.r.jakobsson@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220909115646.99920-5-hdegoede@redhat.com
parent f3b173e9

drivers/gpu/drm/gma500/gma_display.c

+1 −7
Original line number Diff line number Diff line
@@ -552,17 +552,11 @@ int gma_crtc_page_flip(struct drm_crtc *crtc, 
	return ret;

}



int gma_crtc_set_config(struct drm_mode_set *set,

			struct drm_modeset_acquire_ctx *ctx)

{

	return drm_crtc_helper_set_config(set, ctx);

}



const struct drm_crtc_funcs gma_crtc_funcs = {

	.cursor_set = gma_crtc_cursor_set,

	.cursor_move = gma_crtc_cursor_move,

	.gamma_set = gma_crtc_gamma_set,

	.set_config = gma_crtc_set_config,

	.set_config = drm_crtc_helper_set_config,

	.destroy = gma_crtc_destroy,

	.page_flip = gma_crtc_page_flip,

	.enable_vblank = gma_crtc_enable_vblank,

drivers/gpu/drm/gma500/gma_display.h

+0 −2
Original line number Diff line number Diff line
@@ -69,8 +69,6 @@ extern int gma_crtc_page_flip(struct drm_crtc *crtc, 
			      struct drm_pending_vblank_event *event,

			      uint32_t page_flip_flags,

			      struct drm_modeset_acquire_ctx *ctx);

extern int gma_crtc_set_config(struct drm_mode_set *set,

			       struct drm_modeset_acquire_ctx *ctx);



extern void gma_crtc_save(struct drm_crtc *crtc);

extern void gma_crtc_restore(struct drm_crtc *crtc);

drivers/gpu/drm/gma500/psb_drv.c

+1 −7
Original line number Diff line number Diff line
@@ -430,12 +430,6 @@ static inline void get_brightness(struct backlight_device *bd) 
#endif

}



static long psb_unlocked_ioctl(struct file *filp, unsigned int cmd,

			       unsigned long arg)

{

	return drm_ioctl(filp, cmd, arg);

}



static int psb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

{

	struct drm_psb_private *dev_priv;
@@ -497,7 +491,7 @@ static const struct file_operations psb_gem_fops = { 
	.owner = THIS_MODULE,

	.open = drm_open,

	.release = drm_release,

	.unlocked_ioctl = psb_unlocked_ioctl,

	.unlocked_ioctl = drm_ioctl,

	.compat_ioctl = drm_compat_ioctl,

	.mmap = drm_gem_mmap,

	.poll = drm_poll,