| Message ID | 20170223132957.2839-4-noralf@tronnes.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Den 23.02.2017 14.29, skrev Noralf Trønnes: > BACKLIGHT_CLASS_DEVICE was selected in the last version of the > tinydrm patchset to fix the backlight dependency, but the > ifdef CONFIG_BACKLIGHT_CLASS_DEVICE was forgotten. Fix that. > > Signed-off-by: Noralf Trønnes <noralf@tronnes.org> > --- Please apply this, it causes a build error if backlight is built as a module. In my haste to fix the problems reported after tinydrm was pulled, I mistook it for a warning so it was mislabeled. Sorry about the noise caused by tinydrm. Noralf. > include/drm/tinydrm/tinydrm-helpers.h | 19 ------------------- > 1 file changed, 19 deletions(-) > > diff --git a/include/drm/tinydrm/tinydrm-helpers.h b/include/drm/tinydrm/tinydrm-helpers.h > index 78175fe..9b9b6cf 100644 > --- a/include/drm/tinydrm/tinydrm-helpers.h > +++ b/include/drm/tinydrm/tinydrm-helpers.h > @@ -44,28 +44,9 @@ void tinydrm_xrgb8888_to_rgb565(u16 *dst, void *vaddr, > struct drm_framebuffer *fb, > struct drm_clip_rect *clip, bool swap); > > -#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE > struct backlight_device *tinydrm_of_find_backlight(struct device *dev); > int tinydrm_enable_backlight(struct backlight_device *backlight); > int tinydrm_disable_backlight(struct backlight_device *backlight); > -#else > -static inline struct backlight_device * > -tinydrm_of_find_backlight(struct device *dev) > -{ > - return NULL; > -} > - > -static inline int tinydrm_enable_backlight(struct backlight_device *backlight) > -{ > - return 0; > -} > - > -static inline int > -tinydrm_disable_backlight(struct backlight_device *backlight) > -{ > - return 0; > -} > -#endif > > size_t tinydrm_spi_max_transfer_size(struct spi_device *spi, size_t max_len); > bool tinydrm_spi_bpw_supported(struct spi_device *spi, u8 bpw);
On Sun, Feb 26, 2017 at 11:44:40PM +0100, Noralf Trønnes wrote: > > Den 23.02.2017 14.29, skrev Noralf Trønnes: > > BACKLIGHT_CLASS_DEVICE was selected in the last version of the > > tinydrm patchset to fix the backlight dependency, but the > > ifdef CONFIG_BACKLIGHT_CLASS_DEVICE was forgotten. Fix that. > > > > Signed-off-by: Noralf Trønnes <noralf@tronnes.org> > > --- > > Please apply this, it causes a build error if backlight is built as > a module. In my haste to fix the problems reported after tinydrm was > pulled, I mistook it for a warning so it was mislabeled. > Sorry about the noise caused by tinydrm. They are all already applied and in Linus' tree. Dave Airlie generally doesn't send out a mail when he merges stuff. -Daniel > > Noralf. > > > > include/drm/tinydrm/tinydrm-helpers.h | 19 ------------------- > > 1 file changed, 19 deletions(-) > > > > diff --git a/include/drm/tinydrm/tinydrm-helpers.h b/include/drm/tinydrm/tinydrm-helpers.h > > index 78175fe..9b9b6cf 100644 > > --- a/include/drm/tinydrm/tinydrm-helpers.h > > +++ b/include/drm/tinydrm/tinydrm-helpers.h > > @@ -44,28 +44,9 @@ void tinydrm_xrgb8888_to_rgb565(u16 *dst, void *vaddr, > > struct drm_framebuffer *fb, > > struct drm_clip_rect *clip, bool swap); > > -#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE > > struct backlight_device *tinydrm_of_find_backlight(struct device *dev); > > int tinydrm_enable_backlight(struct backlight_device *backlight); > > int tinydrm_disable_backlight(struct backlight_device *backlight); > > -#else > > -static inline struct backlight_device * > > -tinydrm_of_find_backlight(struct device *dev) > > -{ > > - return NULL; > > -} > > - > > -static inline int tinydrm_enable_backlight(struct backlight_device *backlight) > > -{ > > - return 0; > > -} > > - > > -static inline int > > -tinydrm_disable_backlight(struct backlight_device *backlight) > > -{ > > - return 0; > > -} > > -#endif > > size_t tinydrm_spi_max_transfer_size(struct spi_device *spi, size_t max_len); > > bool tinydrm_spi_bpw_supported(struct spi_device *spi, u8 bpw); >
diff --git a/include/drm/tinydrm/tinydrm-helpers.h b/include/drm/tinydrm/tinydrm-helpers.h index 78175fe..9b9b6cf 100644 --- a/include/drm/tinydrm/tinydrm-helpers.h +++ b/include/drm/tinydrm/tinydrm-helpers.h @@ -44,28 +44,9 @@ void tinydrm_xrgb8888_to_rgb565(u16 *dst, void *vaddr, struct drm_framebuffer *fb, struct drm_clip_rect *clip, bool swap); -#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE struct backlight_device *tinydrm_of_find_backlight(struct device *dev); int tinydrm_enable_backlight(struct backlight_device *backlight); int tinydrm_disable_backlight(struct backlight_device *backlight); -#else -static inline struct backlight_device * -tinydrm_of_find_backlight(struct device *dev) -{ - return NULL; -} - -static inline int tinydrm_enable_backlight(struct backlight_device *backlight) -{ - return 0; -} - -static inline int -tinydrm_disable_backlight(struct backlight_device *backlight) -{ - return 0; -} -#endif size_t tinydrm_spi_max_transfer_size(struct spi_device *spi, size_t max_len); bool tinydrm_spi_bpw_supported(struct spi_device *spi, u8 bpw);
BACKLIGHT_CLASS_DEVICE was selected in the last version of the tinydrm patchset to fix the backlight dependency, but the ifdef CONFIG_BACKLIGHT_CLASS_DEVICE was forgotten. Fix that. Signed-off-by: Noralf Trønnes <noralf@tronnes.org> --- include/drm/tinydrm/tinydrm-helpers.h | 19 ------------------- 1 file changed, 19 deletions(-)