Explorar o código

of/mtd/nand: mpc5121_nfc.c: Fix build failures

Fixes build errors caused by the:
 - OF device_node pointer being moved into struct device
 - removal of the match_table field from struct of_platform_driver

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Anatolij Gustschin %!s(int64=15) %!d(string=hai) anos
pai
achega
14acbbf8ba
Modificáronse 1 ficheiros con 4 adicións e 4 borrados
  1. 4 4
      drivers/mtd/nand/mpc5121_nfc.c

+ 4 - 4
drivers/mtd/nand/mpc5121_nfc.c

@@ -650,7 +650,7 @@ static void mpc5121_nfc_free(struct device *dev, struct mtd_info *mtd)
 static int __devinit mpc5121_nfc_probe(struct of_device *op,
 static int __devinit mpc5121_nfc_probe(struct of_device *op,
 					const struct of_device_id *match)
 					const struct of_device_id *match)
 {
 {
-	struct device_node *rootnode, *dn = op->node;
+	struct device_node *rootnode, *dn = op->dev.of_node;
 	struct device *dev = &op->dev;
 	struct device *dev = &op->dev;
 	struct mpc5121_nfc_prv *prv;
 	struct mpc5121_nfc_prv *prv;
 	struct resource res;
 	struct resource res;
@@ -889,12 +889,12 @@ static struct of_device_id mpc5121_nfc_match[] __devinitdata = {
 };
 };
 
 
 static struct of_platform_driver mpc5121_nfc_driver = {
 static struct of_platform_driver mpc5121_nfc_driver = {
-	.match_table	= mpc5121_nfc_match,
 	.probe		= mpc5121_nfc_probe,
 	.probe		= mpc5121_nfc_probe,
 	.remove		= __devexit_p(mpc5121_nfc_remove),
 	.remove		= __devexit_p(mpc5121_nfc_remove),
 	.driver		= {
 	.driver		= {
-		.name	= DRV_NAME,
-		.owner	= THIS_MODULE,
+		.name = DRV_NAME,
+		.owner = THIS_MODULE,
+		.of_match_table = mpc5121_nfc_match,
 	},
 	},
 };
 };