target/linux/mpc83xx/patches-2.6.35/040-rbppc_nand-2.6.35.patch

   1 --- a/drivers/mtd/nand/rbppc_nand.c
   2 +++ b/drivers/mtd/nand/rbppc_nand.c
   3 @@ -130,10 +130,10 @@ static int rbppc_nand_probe(struct of_de
   4
   5         info = kmalloc(sizeof(*info), GFP_KERNEL);
   6
   7 -       rdy = of_get_property(pdev->node, "rdy", NULL);
   8 -       nce = of_get_property(pdev->node, "nce", NULL);
   9 -       cle = of_get_property(pdev->node, "cle", NULL);
  10 -       ale = of_get_property(pdev->node, "ale", NULL);
  11 +       rdy = of_get_property(pdev->dev.of_node, "rdy", NULL);
  12 +       nce = of_get_property(pdev->dev.of_node, "nce", NULL);
  13 +       cle = of_get_property(pdev->dev.of_node, "cle", NULL);
  14 +       ale = of_get_property(pdev->dev.of_node, "ale", NULL);
  15
  16         if (!rdy || !nce || !cle || !ale) {
  17                 printk(KERN_ERR "rbppc_nand_probe: GPIO properties are missing\n");
  18 @@ -180,7 +180,7 @@ static int rbppc_nand_probe(struct of_de
  19         of_node_put(nnand);
  20         info->localbus = ioremap_nocache(res.start, res.end - res.start + 1);
  21
  22 -       if (of_address_to_resource(pdev->node, 0, &res)) {
  23 +       if (of_address_to_resource(pdev->dev.of_node, 0, &res)) {
  24             printk("rbppc_nand_probe: No reg property found\n");
  25             goto err;
  26         }
  27 @@ -222,12 +222,11 @@ static struct of_device_id rbppc_nand_id
  28  };
  29
  30  static struct of_platform_driver rbppc_nand_driver = {
  31 -       .name   = "nand",
  32         .probe  = rbppc_nand_probe,
  33 -       .match_table = rbppc_nand_ids,
  34         .driver = {
  35                 .name = "rbppc-nand",
  36                 .owner = THIS_MODULE,
  37 +               .of_match_table = rbppc_nand_ids,
  38         },
  39  };
  40