| Message ID | 20161117013525.6452-1-stefan@agner.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 2016-11-16 17:35, Stefan Agner wrote: > The separate file fsl_dcu_drm_fbdev.c only initialized fbdev > emulation which is a one-line operation. There is not much more > code on sight which justifies a separate file, hence call the > initialization helper directly from the drv file. Both applied to my for-next branch. > > Signed-off-by: Stefan Agner <stefan@agner.ch> > --- > drivers/gpu/drm/fsl-dcu/Makefile | 1 - > drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 2 +- > drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h | 1 - > drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_fbdev.c | 23 ----------------------- > 4 files changed, 1 insertion(+), 26 deletions(-) > delete mode 100644 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_fbdev.c > > diff --git a/drivers/gpu/drm/fsl-dcu/Makefile b/drivers/gpu/drm/fsl-dcu/Makefile > index b35a292..aca34f6 100644 > --- a/drivers/gpu/drm/fsl-dcu/Makefile > +++ b/drivers/gpu/drm/fsl-dcu/Makefile > @@ -3,6 +3,5 @@ fsl-dcu-drm-y := fsl_dcu_drm_drv.o \ > fsl_dcu_drm_rgb.o \ > fsl_dcu_drm_plane.o \ > fsl_dcu_drm_crtc.o \ > - fsl_dcu_drm_fbdev.o \ > fsl_tcon.o > obj-$(CONFIG_DRM_FSL_DCU) += fsl-dcu-drm.o > diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c > b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c > index 13569b8..c3c9349 100644 > --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c > +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c > @@ -85,7 +85,7 @@ static int fsl_dcu_load(struct drm_device *dev, > unsigned long flags) > goto done; > dev->irq_enabled = true; > > - fsl_dcu_fbdev_init(dev); > + fsl_dev->fbdev = drm_fbdev_cma_init(dev, 24, 1, 1); > > return 0; > done: > diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h > b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h > index 3b371fe7..e9e9aee 100644 > --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h > +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h > @@ -197,7 +197,6 @@ struct fsl_dcu_drm_device { > struct drm_atomic_state *state; > }; > > -void fsl_dcu_fbdev_init(struct drm_device *dev); > int fsl_dcu_drm_modeset_init(struct fsl_dcu_drm_device *fsl_dev); > > #endif /* __FSL_DCU_DRM_DRV_H__ */ > diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_fbdev.c > b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_fbdev.c > deleted file mode 100644 > index 8b8b819..0000000 > --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_fbdev.c > +++ /dev/null > @@ -1,23 +0,0 @@ > -/* > - * Copyright 2015 Freescale Semiconductor, Inc. > - * > - * Freescale DCU drm device driver > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; either version 2 of the License, or > - * (at your option) any later version. > - */ > - > -#include <drm/drmP.h> > -#include <drm/drm_fb_cma_helper.h> > - > -#include "fsl_dcu_drm_drv.h" > - > -/* initialize fbdev helper */ > -void fsl_dcu_fbdev_init(struct drm_device *dev) > -{ > - struct fsl_dcu_drm_device *fsl_dev = dev_get_drvdata(dev->dev); > - > - fsl_dev->fbdev = drm_fbdev_cma_init(dev, 24, 1, 1); > -}
diff --git a/drivers/gpu/drm/fsl-dcu/Makefile b/drivers/gpu/drm/fsl-dcu/Makefile index b35a292..aca34f6 100644 --- a/drivers/gpu/drm/fsl-dcu/Makefile +++ b/drivers/gpu/drm/fsl-dcu/Makefile @@ -3,6 +3,5 @@ fsl-dcu-drm-y := fsl_dcu_drm_drv.o \ fsl_dcu_drm_rgb.o \ fsl_dcu_drm_plane.o \ fsl_dcu_drm_crtc.o \ - fsl_dcu_drm_fbdev.o \ fsl_tcon.o obj-$(CONFIG_DRM_FSL_DCU) += fsl-dcu-drm.o diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c index 13569b8..c3c9349 100644 --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c @@ -85,7 +85,7 @@ static int fsl_dcu_load(struct drm_device *dev, unsigned long flags) goto done; dev->irq_enabled = true; - fsl_dcu_fbdev_init(dev); + fsl_dev->fbdev = drm_fbdev_cma_init(dev, 24, 1, 1); return 0; done: diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h index 3b371fe7..e9e9aee 100644 --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h @@ -197,7 +197,6 @@ struct fsl_dcu_drm_device { struct drm_atomic_state *state; }; -void fsl_dcu_fbdev_init(struct drm_device *dev); int fsl_dcu_drm_modeset_init(struct fsl_dcu_drm_device *fsl_dev); #endif /* __FSL_DCU_DRM_DRV_H__ */ diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_fbdev.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_fbdev.c deleted file mode 100644 index 8b8b819..0000000 --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_fbdev.c +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright 2015 Freescale Semiconductor, Inc. - * - * Freescale DCU drm device driver - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - */ - -#include <drm/drmP.h> -#include <drm/drm_fb_cma_helper.h> - -#include "fsl_dcu_drm_drv.h" - -/* initialize fbdev helper */ -void fsl_dcu_fbdev_init(struct drm_device *dev) -{ - struct fsl_dcu_drm_device *fsl_dev = dev_get_drvdata(dev->dev); - - fsl_dev->fbdev = drm_fbdev_cma_init(dev, 24, 1, 1); -}
The separate file fsl_dcu_drm_fbdev.c only initialized fbdev emulation which is a one-line operation. There is not much more code on sight which justifies a separate file, hence call the initialization helper directly from the drv file. Signed-off-by: Stefan Agner <stefan@agner.ch> --- drivers/gpu/drm/fsl-dcu/Makefile | 1 - drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 2 +- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h | 1 - drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_fbdev.c | 23 ----------------------- 4 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_fbdev.c