diff options
| author | Romain Izard | 2016-01-15 11:34:57 +0100 |
|---|---|---|
| committer | Brian Norris | 2016-01-24 00:03:48 +0100 |
| commit | 8ce06d379a06b4d5c9f944bb60e80b084d16bfc0 (patch) | |
| tree | dcfc52573f264971320aef3a83aed97e780fa367 | |
| parent | mtd: atmel_nand: Simplify error messages (diff) | |
| download | kernel-qcow2-linux-8ce06d379a06b4d5c9f944bb60e80b084d16bfc0.tar.gz kernel-qcow2-linux-8ce06d379a06b4d5c9f944bb60e80b084d16bfc0.tar.xz kernel-qcow2-linux-8ce06d379a06b4d5c9f944bb60e80b084d16bfc0.zip | |
mtd: atmel_nand: Use of_device_get_match_data
Remove the need for forward declaration and the risk for a null pointer
when accessing the private part of the compatible match table, by using
the newly introduced of_device_get_match_data function.
Signed-off-by: Romain Izard <romain.izard.pro@gmail.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
| -rw-r--r-- | drivers/mtd/nand/atmel_nand.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c index ad9f4b062049..affe7a7e9ad7 100644 --- a/drivers/mtd/nand/atmel_nand.c +++ b/drivers/mtd/nand/atmel_nand.c @@ -1486,8 +1486,6 @@ static void atmel_nand_hwctl(struct mtd_info *mtd, int mode) ecc_writel(host->ecc, CR, ATMEL_ECC_RST); } -static const struct of_device_id atmel_nand_dt_ids[]; - static int atmel_of_init_port(struct atmel_nand_host *host, struct device_node *np) { @@ -1498,7 +1496,7 @@ static int atmel_of_init_port(struct atmel_nand_host *host, enum of_gpio_flags flags = 0; host->caps = (struct atmel_nand_caps *) - of_match_device(atmel_nand_dt_ids, host->dev)->data; + of_device_get_match_data(host->dev); if (of_property_read_u32(np, "atmel,nand-addr-offset", &val) == 0) { if (val >= 32) { |