Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5382519 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Jiri Kosina
Browse files

HID: sony: Rename buzz_* functions to sony_led_* 



More controllers managed by the hid-sony module have 4 LEDs. These can share
most of the functionality provided by the buzz functions.

Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent f1c458ca

drivers/hid/hid-sony.c

+8 −8
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ static void buzz_set_leds(struct hid_device *hdev, int leds) 
	hid_hw_request(hdev, report, HID_REQ_SET_REPORT);

}



static void buzz_led_set_brightness(struct led_classdev *led,

static void sony_led_set_brightness(struct led_classdev *led,

				    enum led_brightness value)

{

	struct device *dev = led->dev->parent;
@@ -498,7 +498,7 @@ static void buzz_led_set_brightness(struct led_classdev *led, 
	}

}



static enum led_brightness buzz_led_get_brightness(struct led_classdev *led)

static enum led_brightness sony_led_get_brightness(struct led_classdev *led)

{

	struct device *dev = led->dev->parent;

	struct hid_device *hdev = container_of(dev, struct hid_device, dev);
@@ -525,7 +525,7 @@ static enum led_brightness buzz_led_get_brightness(struct led_classdev *led) 
	return on ? LED_FULL : LED_OFF;

}



static int buzz_init(struct hid_device *hdev)

static int sony_leds_init(struct hid_device *hdev)

{

	struct sony_sc *drv_data;

	struct buzz_extra *buzz;
@@ -567,8 +567,8 @@ static int buzz_init(struct hid_device *hdev) 
		led->name = name;

		led->brightness = 0;

		led->max_brightness = 1;

		led->brightness_get = buzz_led_get_brightness;

		led->brightness_set = buzz_led_set_brightness;

		led->brightness_get = sony_led_get_brightness;

		led->brightness_set = sony_led_set_brightness;



		if (led_classdev_register(&hdev->dev, led)) {

			hid_err(hdev, "Failed to register LED %d\n", n);
@@ -596,7 +596,7 @@ error_leds: 
	return ret;

}



static void buzz_remove(struct hid_device *hdev)

static void sony_leds_remove(struct hid_device *hdev)

{

	struct sony_sc *drv_data;

	struct buzz_extra *buzz;
@@ -733,7 +733,7 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id) 
	else if (sc->quirks & SIXAXIS_CONTROLLER_BT)

		ret = sixaxis_set_operational_bt(hdev);

	else if (sc->quirks & BUZZ_CONTROLLER)

		ret = buzz_init(hdev);

		ret = sony_leds_init(hdev);

	else

		ret = 0;
@@ -755,7 +755,7 @@ static void sony_remove(struct hid_device *hdev) 
	struct sony_sc *sc = hid_get_drvdata(hdev);



	if (sc->quirks & BUZZ_CONTROLLER)

		buzz_remove(hdev);

		sony_leds_remove(hdev);



	sony_destroy_ff(hdev);