Patchwork mtd: nand: mpc5121_nfc.c: Fix build failures

login
register
mail settings
Submitter Anatolij Gustschin
Date May 31, 2010, 4:37 p.m.
Message ID <1275323836-15711-1-git-send-email-agust@denx.de>
Download mbox | patch
Permalink /patch/54116/
State Accepted
Commit 14acbbf8bada18f19930d38ce33c3947b2c718e0
Headers show

Comments

Anatolij Gustschin - May 31, 2010, 4:37 p.m.
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>
Cc: Grant Likely <grant.likely@secretlab.ca>
---
 drivers/mtd/nand/mpc5121_nfc.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
David Woodhouse - June 6, 2010, 10:15 a.m.
On Mon, 2010-05-31 at 18:37 +0200, Anatolij Gustschin wrote:
> 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>
> Cc: Grant Likely <grant.likely@secretlab.ca>

Um, this isn't applicable to 2.6.35, is it?
Anatolij Gustschin - June 7, 2010, 7:09 a.m.
On Sun, 06 Jun 2010 11:15:08 +0100
David Woodhouse <dwmw2@infradead.org> wrote:

> On Mon, 2010-05-31 at 18:37 +0200, Anatolij Gustschin wrote:
> > 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>
> > Cc: Grant Likely <grant.likely@secretlab.ca>
> 
> Um, this isn't applicable to 2.6.35, is it?

Do you mean it isn't applicable to 2.6.34? This patch is needed and
applicable to 2.6.35-rc1. It has already been collected by Grant
and the breakage is fixed in 2.6.35-rc2.

Patch

diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c
index 3d0867d..0a130dc 100644
--- a/drivers/mtd/nand/mpc5121_nfc.c
+++ b/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,
 					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 mpc5121_nfc_prv *prv;
 	struct resource res;
@@ -889,12 +889,12 @@  static struct of_device_id mpc5121_nfc_match[] __devinitdata = {
 };
 
 static struct of_platform_driver mpc5121_nfc_driver = {
-	.match_table	= mpc5121_nfc_match,
 	.probe		= mpc5121_nfc_probe,
 	.remove		= __devexit_p(mpc5121_nfc_remove),
 	.driver		= {
-		.name	= DRV_NAME,
-		.owner	= THIS_MODULE,
+		.name = DRV_NAME,
+		.owner = THIS_MODULE,
+		.of_match_table = mpc5121_nfc_match,
 	},
 };