Skip to content
Permalink
Browse files
swap led_brightness from enum to typedef
This commit changes how led_brightness, declared in header file
include/linux/leds.h, works throughout the kernel, and updates other
files in accordance.

The TODO located at drivers/leds/TODO requests:

* Get rid of led_brightness

It is really an integer, as maximum is configurable. Get rid of it, or
make it into typedef or something.

This patch changes the declaration of led_brightness from an enum to a
typedef. In order to hold the currently existing enum values, macro
definitions are provided. Files which use led_brightness are updated to
conform to the new types.

Signed-off-by: Amy Parker <apark0006@student.cerritos.edu>
  • Loading branch information
amyipdev authored and intel-lab-lkp committed Jul 15, 2021
1 parent dd9c7df commit b14a971f1045205d49d9d001f33d33afdd8208f9
Show file tree
Hide file tree
Showing 207 changed files with 437 additions and 438 deletions.
@@ -52,7 +52,7 @@ V4L2 subsystem. The function takes six arguments:
strobe start with exposure start,
* intensity_to_led_brightness and led_brightness_to_intensity
perform
enum led_brightness <-> V4L2 intensity conversion in a device
led_brightness <-> V4L2 intensity conversion in a device
specific manner - they can be used for devices with non-linear
LED current scale.
- config:
@@ -637,7 +637,7 @@ static const struct {
{ "dm365evm::ds9", "heartbeat", },
};

static void cpld_led_set(struct led_classdev *cdev, enum led_brightness b)
static void cpld_led_set(struct led_classdev *cdev, led_brightness b)
{
struct cpld_led *led = container_of(cdev, struct cpld_led, cdev);
u8 reg = __raw_readb(cpld + CPLD_LEDS);
@@ -649,7 +649,7 @@ static void cpld_led_set(struct led_classdev *cdev, enum led_brightness b)
__raw_writeb(reg, cpld + CPLD_LEDS);
}

static enum led_brightness cpld_led_get(struct led_classdev *cdev)
static led_brightness cpld_led_get(struct led_classdev *cdev)
{
struct cpld_led *led = container_of(cdev, struct cpld_led, cdev);
u8 reg = __raw_readb(cpld + CPLD_LEDS);
@@ -46,7 +46,7 @@ static unsigned char hw_led_state;
static void __iomem *xbus;

static void ebsa285_led_set(struct led_classdev *cdev,
enum led_brightness b)
led_brightness b)
{
struct ebsa285_led *led = container_of(cdev,
struct ebsa285_led, cdev);
@@ -58,7 +58,7 @@ static void ebsa285_led_set(struct led_classdev *cdev,
writeb(hw_led_state, xbus);
}

static enum led_brightness ebsa285_led_get(struct led_classdev *cdev)
static led_brightness ebsa285_led_get(struct led_classdev *cdev)
{
struct ebsa285_led *led = container_of(cdev,
struct ebsa285_led, cdev);
@@ -686,7 +686,7 @@ static const struct {
* - clearing bit means turn on LED
*/
static void netwinder_led_set(struct led_classdev *cdev,
enum led_brightness b)
led_brightness b)
{
struct netwinder_led *led = container_of(cdev,
struct netwinder_led, cdev);
@@ -703,7 +703,7 @@ static void netwinder_led_set(struct led_classdev *cdev,
raw_spin_unlock_irqrestore(&nw_gpio_lock, flags);
}

static enum led_brightness netwinder_led_get(struct led_classdev *cdev)
static led_brightness netwinder_led_get(struct led_classdev *cdev)
{
struct netwinder_led *led = container_of(cdev,
struct netwinder_led, cdev);
@@ -213,7 +213,7 @@ static const struct {
};

static void idp_led_set(struct led_classdev *cdev,
enum led_brightness b)
led_brightness b)
{
struct idp_led *led = container_of(cdev,
struct idp_led, cdev);
@@ -227,7 +227,7 @@ static void idp_led_set(struct led_classdev *cdev,
IDP_CPLD_LED_CONTROL = reg;
}

static enum led_brightness idp_led_get(struct led_classdev *cdev)
static led_brightness idp_led_get(struct led_classdev *cdev)
{
struct idp_led *led = container_of(cdev,
struct idp_led, cdev);
@@ -564,7 +564,7 @@ static const struct {
};

static void lubbock_led_set(struct led_classdev *cdev,
enum led_brightness b)
led_brightness b)
{
struct lubbock_led *led = container_of(cdev,
struct lubbock_led, cdev);
@@ -578,7 +578,7 @@ static void lubbock_led_set(struct led_classdev *cdev,
LUB_DISC_BLNK_LED = reg;
}

static enum led_brightness lubbock_led_get(struct led_classdev *cdev)
static led_brightness lubbock_led_get(struct led_classdev *cdev)
{
struct lubbock_led *led = container_of(cdev,
struct lubbock_led, cdev);
@@ -655,7 +655,7 @@ static const struct {
};

static void mainstone_led_set(struct led_classdev *cdev,
enum led_brightness b)
led_brightness b)
{
struct mainstone_led *led = container_of(cdev,
struct mainstone_led, cdev);
@@ -669,7 +669,7 @@ static void mainstone_led_set(struct led_classdev *cdev,
MST_LEDCTRL = reg;
}

static enum led_brightness mainstone_led_get(struct led_classdev *cdev)
static led_brightness mainstone_led_get(struct led_classdev *cdev)
{
struct mainstone_led *led = container_of(cdev,
struct mainstone_led, cdev);
@@ -77,7 +77,7 @@ static const struct {
* LED triggers are compiled in.
*/
static void dbg_led_set(struct led_classdev *cdev,
enum led_brightness b)
led_brightness b)
{
struct dbg_led *led = container_of(cdev, struct dbg_led, cdev);
u16 reg;
@@ -90,7 +90,7 @@ static void dbg_led_set(struct led_classdev *cdev,
writew_relaxed(reg, &fpga->leds);
}

static enum led_brightness dbg_led_get(struct led_classdev *cdev)
static led_brightness dbg_led_get(struct led_classdev *cdev)
{
struct dbg_led *led = container_of(cdev, struct dbg_led, cdev);
u16 reg;
@@ -239,7 +239,7 @@ static void db1100_mmc_set_power(void *mmc_host, int state)
bcsr_mod(BCSR_BOARD, bit, 0);
}

static void db1100_mmcled_set(struct led_classdev *led, enum led_brightness b)
static void db1100_mmcled_set(struct led_classdev *led, led_brightness b)
{
if (b != LED_OFF)
bcsr_mod(BCSR_LEDS, BCSR_LEDS_LED0, 0);
@@ -277,7 +277,7 @@ static void db1100_mmc1_set_power(void *mmc_host, int state)
bcsr_mod(BCSR_BOARD, bit, 0);
}

static void db1100_mmc1led_set(struct led_classdev *led, enum led_brightness b)
static void db1100_mmc1led_set(struct led_classdev *led, led_brightness b)
{
if (b != LED_OFF)
bcsr_mod(BCSR_LEDS, BCSR_LEDS_LED1, 0);
@@ -409,7 +409,7 @@ static int db1200_mmc_card_inserted(void *mmc_host)
}

static void db1200_mmcled_set(struct led_classdev *led,
enum led_brightness brightness)
led_brightness brightness)
{
if (brightness != LED_OFF)
bcsr_mod(BCSR_LEDS, BCSR_LEDS_LED0, 0);
@@ -481,7 +481,7 @@ static int pb1200_mmc1_cd_setup(void *mmc_host, int en)
}

static void pb1200_mmc1led_set(struct led_classdev *led,
enum led_brightness brightness)
led_brightness brightness)
{
if (brightness != LED_OFF)
bcsr_mod(BCSR_LEDS, BCSR_LEDS_LED1, 0);
@@ -520,7 +520,7 @@ static int db1300_mmc_cd_setup(void *mmc_host, int en)
}

static void db1300_mmcled_set(struct led_classdev *led,
enum led_brightness brightness)
led_brightness brightness)
{
if (brightness != LED_OFF)
bcsr_mod(BCSR_LEDS, BCSR_LEDS_LED0, 0);
@@ -587,7 +587,7 @@ static int db1300_movinand_readonly(void *mmc_host)
}

static void db1300_movinand_led_set(struct led_classdev *led,
enum led_brightness brightness)
led_brightness brightness)
{
if (brightness != LED_OFF)
bcsr_mod(BCSR_LEDS, BCSR_LEDS_LED1, 0);
@@ -196,7 +196,7 @@ struct rbtx4939_led_data {

/* Use "dot" in 7seg LEDs */
static void rbtx4939_led_brightness_set(struct led_classdev *led_cdev,
enum led_brightness value)
led_brightness value)
{
struct rbtx4939_led_data *led_dat =
container_of(led_cdev, struct rbtx4939_led_data, cdev);
@@ -229,12 +229,12 @@ static struct platform_device ts5500_dio2_pdev = {
};

static void ts5500_led_set(struct led_classdev *led_cdev,
enum led_brightness brightness)
led_brightness brightness)
{
outb(!!brightness, TS5500_LED_JP_ADDR);
}

static enum led_brightness ts5500_led_get(struct led_classdev *led_cdev)
static led_brightness ts5500_led_get(struct led_classdev *led_cdev)
{
return (inb(TS5500_LED_JP_ADDR) & TS5500_LED) ? LED_FULL : LED_OFF;
}
@@ -33,7 +33,7 @@
#include "nouveau_led.h"
#include <nvkm/subdev/gpio.h>

static enum led_brightness
static led_brightness
nouveau_led_get_brightness(struct led_classdev *led)
{
struct drm_device *drm_dev = container_of(led, struct nouveau_led, led)->dev;
@@ -51,7 +51,7 @@ nouveau_led_get_brightness(struct led_classdev *led)
}

static void
nouveau_led_set_brightness(struct led_classdev *led, enum led_brightness value)
nouveau_led_set_brightness(struct led_classdev *led, led_brightness value)
{
struct drm_device *drm_dev = container_of(led, struct nouveau_led, led)->dev;
struct nouveau_drm *drm = nouveau_drm(drm_dev);
@@ -481,7 +481,7 @@ static int rog_nkey_led_init(struct hid_device *hdev)
}

static void asus_kbd_backlight_set(struct led_classdev *led_cdev,
enum led_brightness brightness)
led_brightness brightness)
{
struct asus_kbd_leds *led = container_of(led_cdev, struct asus_kbd_leds,
cdev);
@@ -492,7 +492,7 @@ static void asus_kbd_backlight_set(struct led_classdev *led_cdev,
schedule_work(&led->work);
}

static enum led_brightness asus_kbd_backlight_get(struct led_classdev *led_cdev)
static led_brightness asus_kbd_backlight_get(struct led_classdev *led_cdev)
{
struct asus_kbd_leds *led = container_of(led_cdev, struct asus_kbd_leds,
cdev);
@@ -252,7 +252,7 @@ static int hid_bigben_play_effect(struct input_dev *dev, void *data,
}

static void bigben_set_led(struct led_classdev *led,
enum led_brightness value)
led_brightness value)
{
struct device *dev = led->dev->parent;
struct hid_device *hid = to_hid_device(dev);
@@ -284,7 +284,7 @@ static void bigben_set_led(struct led_classdev *led,
}
}

static enum led_brightness bigben_get_led(struct led_classdev *led)
static led_brightness bigben_get_led(struct led_classdev *led)
{
struct device *dev = led->dev->parent;
struct hid_device *hid = to_hid_device(dev);
@@ -142,7 +142,7 @@ MODULE_PARM_DESC(profilekey_codes, "Key codes for the profile buttons");
#define K90_BACKLIGHT_LED_SUFFIX "::backlight"
#define K90_RECORD_LED_SUFFIX "::record"

static enum led_brightness k90_backlight_get(struct led_classdev *led_cdev)
static led_brightness k90_backlight_get(struct led_classdev *led_cdev)
{
int ret;
struct k90_led *led = container_of(led_cdev, struct k90_led, cdev);
@@ -182,15 +182,15 @@ static enum led_brightness k90_backlight_get(struct led_classdev *led_cdev)
return ret;
}

static enum led_brightness k90_record_led_get(struct led_classdev *led_cdev)
static led_brightness k90_record_led_get(struct led_classdev *led_cdev)
{
struct k90_led *led = container_of(led_cdev, struct k90_led, cdev);

return led->brightness;
}

static void k90_brightness_set(struct led_classdev *led_cdev,
enum led_brightness brightness)
led_brightness brightness)
{
struct k90_led *led = container_of(led_cdev, struct k90_led, cdev);

@@ -411,7 +411,7 @@ static int elan_start_multitouch(struct hid_device *hdev)
}

static int elan_mute_led_set_brigtness(struct led_classdev *led_cdev,
enum led_brightness value)
led_brightness value)
{
int ret;
u8 led_state;
@@ -301,7 +301,7 @@ struct hammer_kbd_leds {
};

static int hammer_kbd_brightness_set_blocking(struct led_classdev *cdev,
enum led_brightness br)
led_brightness br)
{
struct hammer_kbd_leds *led = container_of(cdev,
struct hammer_kbd_leds,
@@ -46,7 +46,7 @@ struct gt683r_led {
struct led_classdev led_devs[GT683R_LED_COUNT];
struct mutex lock;
struct work_struct work;
enum led_brightness brightnesses[GT683R_LED_COUNT];
led_brightness brightnesses[GT683R_LED_COUNT];
enum gt683r_led_mode mode;
};

@@ -57,7 +57,7 @@ static const struct hid_device_id gt683r_led_id[] = {
MODULE_DEVICE_TABLE(hid, gt683r_led_id);

static void gt683r_brightness_set(struct led_classdev *led_cdev,
enum led_brightness brightness)
led_brightness brightness)
{
int i;
struct device *dev = led_cdev->dev->parent;

0 comments on commit b14a971

Please sign in to comment.