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

Commit b8cd742a authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Linus Torvalds
Browse files

drivers/leds: correct __devexit annotations 



__devexit functions are discarded without CONFIG_HOTPLUG, so they need
to be referenced carefully.  A __devexit function may also not be called
from a __devinit function.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Cc: Bryan Wu <bryan.wu@canonical.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8c757763

drivers/leds/leds-netxbig.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -112,7 +112,7 @@ err_free_addr: 
	return err;

	return err;

}

}





static void __devexit gpio_ext_free(struct netxbig_gpio_ext *gpio_ext)

static void gpio_ext_free(struct netxbig_gpio_ext *gpio_ext)

{

{

	int i;

	int i;
@@ -294,7 +294,7 @@ static ssize_t netxbig_led_sata_show(struct device *dev, 




static DEVICE_ATTR(sata, 0644, netxbig_led_sata_show, netxbig_led_sata_store);

static DEVICE_ATTR(sata, 0644, netxbig_led_sata_show, netxbig_led_sata_store);





static void __devexit delete_netxbig_led(struct netxbig_led_data *led_dat)

static void delete_netxbig_led(struct netxbig_led_data *led_dat)

{

{

	if (led_dat->mode_val[NETXBIG_LED_SATA] != NETXBIG_LED_INVALID_MODE)

	if (led_dat->mode_val[NETXBIG_LED_SATA] != NETXBIG_LED_INVALID_MODE)

		device_remove_file(led_dat->cdev.dev, &dev_attr_sata);

		device_remove_file(led_dat->cdev.dev, &dev_attr_sata);

drivers/leds/leds-ns2.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -255,7 +255,7 @@ err_free_cmd: 
	return ret;

	return ret;

}

}





static void __devexit delete_ns2_led(struct ns2_led_data *led_dat)

static void delete_ns2_led(struct ns2_led_data *led_dat)

{

{

	device_remove_file(led_dat->cdev.dev, &dev_attr_sata);

	device_remove_file(led_dat->cdev.dev, &dev_attr_sata);

	led_classdev_unregister(&led_dat->cdev);

	led_classdev_unregister(&led_dat->cdev);