Przeglądaj źródła

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>
Romain Izard 9 lat temu
rodzic
commit
8ce06d379a
1 zmienionych plików z 1 dodań i 3 usunięć
  1. 1 3
      drivers/mtd/nand/atmel_nand.c

+ 1 - 3
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);
 		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,
 static int atmel_of_init_port(struct atmel_nand_host *host,
 			      struct device_node *np)
 			      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;
 	enum of_gpio_flags flags = 0;
 
 
 	host->caps = (struct atmel_nand_caps *)
 	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 (of_property_read_u32(np, "atmel,nand-addr-offset", &val) == 0) {
 		if (val >= 32) {
 		if (val >= 32) {