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

Commit 4c7e054f authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Jacek Anaszewski
Browse files

mtd: nand: Remove the "nand-disk" LED trigger 



This commit removes the "nand-disk" LED trigger from the
NAND code.

A trigger with the same name is already available selecting
LEDS_TRIGGER_MTD. Note that "nand-disk" trigger is being
deprecated in favor of the "mtd" trigger.

Signed-off-by: default avatarEzequiel Garcia <ezequiel@vanguardiasur.com.ar>
Acked-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: default avatarJacek Anaszewski <j.anaszewski@samsung.com>
parent 4b721174

drivers/mtd/nand/nand_base.c

+1 −28
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ 
#include <linux/mtd/nand_bch.h>

#include <linux/interrupt.h>

#include <linux/bitops.h>

#include <linux/leds.h>

#include <linux/io.h>

#include <linux/mtd/partitions.h>

#include <linux/of_mtd.h>
@@ -97,12 +96,6 @@ static int nand_get_device(struct mtd_info *mtd, int new_state); 
static int nand_do_write_oob(struct mtd_info *mtd, loff_t to,

			     struct mtd_oob_ops *ops);



/*

 * For devices which display every fart in the system on a separate LED. Is

 * compiled away when LED support is disabled.

 */

DEFINE_LED_TRIGGER(nand_led_trigger);



static int check_offs_len(struct mtd_info *mtd,

					loff_t ofs, uint64_t len)

{
@@ -540,19 +533,16 @@ void nand_wait_ready(struct mtd_info *mtd) 
	if (in_interrupt() || oops_in_progress)

		return panic_nand_wait_ready(mtd, timeo);



	led_trigger_event(nand_led_trigger, LED_FULL);

	/* Wait until command is processed or timeout occurs */

	timeo = jiffies + msecs_to_jiffies(timeo);

	do {

		if (chip->dev_ready(mtd))

			goto out;

			return;

		cond_resched();

	} while (time_before(jiffies, timeo));



	if (!chip->dev_ready(mtd))

		pr_warn_ratelimited("timeout while waiting for chip to become ready\n");

out:

	led_trigger_event(nand_led_trigger, LED_OFF);

}

EXPORT_SYMBOL_GPL(nand_wait_ready);
@@ -885,8 +875,6 @@ static int nand_wait(struct mtd_info *mtd, struct nand_chip *chip) 
	int status;

	unsigned long timeo = 400;



	led_trigger_event(nand_led_trigger, LED_FULL);



	/*

	 * Apply this short delay always to ensure that we do wait tWB in any

	 * case on any machine.
@@ -910,7 +898,6 @@ static int nand_wait(struct mtd_info *mtd, struct nand_chip *chip) 
			cond_resched();

		} while (time_before(jiffies, timeo));

	}

	led_trigger_event(nand_led_trigger, LED_OFF);



	status = (int)chip->read_byte(mtd);

	/* This can happen if in case of timeout or buggy dev_ready */
@@ -4474,20 +4461,6 @@ void nand_release(struct mtd_info *mtd) 
}

EXPORT_SYMBOL_GPL(nand_release);



static int __init nand_base_init(void)

{

	led_trigger_register_simple("nand-disk", &nand_led_trigger);

	return 0;

}



static void __exit nand_base_exit(void)

{

	led_trigger_unregister_simple(nand_led_trigger);

}



module_init(nand_base_init);

module_exit(nand_base_exit);



MODULE_LICENSE("GPL");

MODULE_AUTHOR("Steven J. Hill <sjhill@realitydiluted.com>");

MODULE_AUTHOR("Thomas Gleixner <tglx@linutronix.de>");