On Sun, May 17, 2020 at 09:01:32PM +0200, Sam Ravnborg wrote:
> The driver required initialization using struct generic_bl_info.
> As there are no more references to this struct there is no users left.
> So it is safe to delete the driver.
>
> Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
> Cc: Lee Jones <lee.jones@xxxxxxxxxx>
> Cc: Daniel Thompson <daniel.thompson@xxxxxxxxxx>
> Cc: Jingoo Han <jingoohan1@xxxxxxxxx>
Reviewed-by: Daniel Thompson <daniel.thompson@xxxxxxxxxx>
> ---
> drivers/video/backlight/Kconfig | 8 --
> drivers/video/backlight/Makefile | 1 -
> drivers/video/backlight/generic_bl.c | 110 ---------------------------
> include/linux/backlight.h | 9 ---
> 4 files changed, 128 deletions(-)
> delete mode 100644 drivers/video/backlight/generic_bl.c
>
> diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
> index 7d22d7377606..14abfeee8868 100644
> --- a/drivers/video/backlight/Kconfig
> +++ b/drivers/video/backlight/Kconfig
> @@ -173,14 +173,6 @@ config BACKLIGHT_EP93XX
> To compile this driver as a module, choose M here: the module will
> be called ep93xx_bl.
>
> -config BACKLIGHT_GENERIC
> - tristate "Generic (aka Sharp Corgi) Backlight Driver"
> - default y
> - help
> - Say y to enable the generic platform backlight driver previously
> - known as the Corgi backlight driver. If you have a Sharp Zaurus
> - SL-C7xx, SL-Cxx00 or SL-6000x say y.
> -
> config BACKLIGHT_IPAQ_MICRO
> tristate "iPAQ microcontroller backlight driver"
> depends on MFD_IPAQ_MICRO
> diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile
> index 0c1a1524627a..9b998cfdc56d 100644
> --- a/drivers/video/backlight/Makefile
> +++ b/drivers/video/backlight/Makefile
> @@ -31,7 +31,6 @@ obj-$(CONFIG_BACKLIGHT_CLASS_DEVICE) += backlight.o
> obj-$(CONFIG_BACKLIGHT_DA903X) += da903x_bl.o
> obj-$(CONFIG_BACKLIGHT_DA9052) += da9052_bl.o
> obj-$(CONFIG_BACKLIGHT_EP93XX) += ep93xx_bl.o
> -obj-$(CONFIG_BACKLIGHT_GENERIC) += generic_bl.o
> obj-$(CONFIG_BACKLIGHT_GPIO) += gpio_backlight.o
> obj-$(CONFIG_BACKLIGHT_HP680) += hp680_bl.o
> obj-$(CONFIG_BACKLIGHT_HP700) += jornada720_bl.o
> diff --git a/drivers/video/backlight/generic_bl.c b/drivers/video/backlight/generic_bl.c
> deleted file mode 100644
> index 8fe63dbc8590..000000000000
> --- a/drivers/video/backlight/generic_bl.c
> +++ /dev/null
> @@ -1,110 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0-only
> -/*
> - * Generic Backlight Driver
> - *
> - * Copyright (c) 2004-2008 Richard Purdie
> - */
> -
> -#include <linux/module.h>
> -#include <linux/kernel.h>
> -#include <linux/init.h>
> -#include <linux/platform_device.h>
> -#include <linux/mutex.h>
> -#include <linux/fb.h>
> -#include <linux/backlight.h>
> -
> -static int genericbl_intensity;
> -static struct backlight_device *generic_backlight_device;
> -static struct generic_bl_info *bl_machinfo;
> -
> -static int genericbl_send_intensity(struct backlight_device *bd)
> -{
> - int intensity = bd->props.brightness;
> -
> - if (bd->props.power != FB_BLANK_UNBLANK)
> - intensity = 0;
> - if (bd->props.state & BL_CORE_FBBLANK)
> - intensity = 0;
> - if (bd->props.state & BL_CORE_SUSPENDED)
> - intensity = 0;
> -
> - bl_machinfo->set_bl_intensity(intensity);
> -
> - genericbl_intensity = intensity;
> -
> - if (bl_machinfo->kick_battery)
> - bl_machinfo->kick_battery();
> -
> - return 0;
> -}
> -
> -static int genericbl_get_intensity(struct backlight_device *bd)
> -{
> - return genericbl_intensity;
> -}
> -
> -static const struct backlight_ops genericbl_ops = {
> - .options = BL_CORE_SUSPENDRESUME,
> - .get_brightness = genericbl_get_intensity,
> - .update_status = genericbl_send_intensity,
> -};
> -
> -static int genericbl_probe(struct platform_device *pdev)
> -{
> - struct backlight_properties props;
> - struct generic_bl_info *machinfo = dev_get_platdata(&pdev->dev);
> - const char *name = "generic-bl";
> - struct backlight_device *bd;
> -
> - bl_machinfo = machinfo;
> - if (!machinfo->limit_mask)
> - machinfo->limit_mask = -1;
> -
> - if (machinfo->name)
> - name = machinfo->name;
> -
> - memset(&props, 0, sizeof(struct backlight_properties));
> - props.type = BACKLIGHT_RAW;
> - props.max_brightness = machinfo->max_intensity;
> - bd = devm_backlight_device_register(&pdev->dev, name, &pdev->dev,
> - NULL, &genericbl_ops, &props);
> - if (IS_ERR(bd))
> - return PTR_ERR(bd);
> -
> - platform_set_drvdata(pdev, bd);
> -
> - bd->props.power = FB_BLANK_UNBLANK;
> - bd->props.brightness = machinfo->default_intensity;
> - backlight_update_status(bd);
> -
> - generic_backlight_device = bd;
> -
> - dev_info(&pdev->dev, "Generic Backlight Driver Initialized.\n");
> - return 0;
> -}
> -
> -static int genericbl_remove(struct platform_device *pdev)
> -{
> - struct backlight_device *bd = platform_get_drvdata(pdev);
> -
> - bd->props.power = 0;
> - bd->props.brightness = 0;
> - backlight_update_status(bd);
> -
> - dev_info(&pdev->dev, "Generic Backlight Driver Unloaded\n");
> - return 0;
> -}
> -
> -static struct platform_driver genericbl_driver = {
> - .probe = genericbl_probe,
> - .remove = genericbl_remove,
> - .driver = {
> - .name = "generic-bl",
> - },
> -};
> -
> -module_platform_driver(genericbl_driver);
> -
> -MODULE_AUTHOR("Richard Purdie <rpurdie@xxxxxxxxx>");
> -MODULE_DESCRIPTION("Generic Backlight Driver");
> -MODULE_LICENSE("GPL");
> diff --git a/include/linux/backlight.h b/include/linux/backlight.h
> index b779c29142fd..eae7a5e66248 100644
> --- a/include/linux/backlight.h
> +++ b/include/linux/backlight.h
> @@ -480,15 +480,6 @@ static inline void * bl_get_data(struct backlight_device *bl_dev)
> return dev_get_drvdata(&bl_dev->dev);
> }
>
> -struct generic_bl_info {
> - const char *name;
> - int max_intensity;
> - int default_intensity;
> - int limit_mask;
> - void (*set_bl_intensity)(int intensity);
> - void (*kick_battery)(void);
> -};
> -
> #ifdef CONFIG_OF
> struct backlight_device *of_find_backlight_by_node(struct device_node *node);
> #else
> --
> 2.25.1
>
