LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Woodhouse <dwmw2@infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Vladimir Barinov <vova.barinov@gmail.com>,
	Lothar Wassmann <LW@KARO-electronics.de>,
	Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Subject: linux-next: manual merge of the mtd tree with Linus' tree
Date: Mon, 1 Jun 2009 14:00:44 +1000	[thread overview]
Message-ID: <20090601140044.4786a99f.sfr@canb.auug.org.au> (raw)

Hi David,

Today's linux-next merge of the mtd tree got a conflict in
drivers/mtd/nand/mxc_nand.c between commit
8541c1180a355c4da283fc6b03a92c0233823c1b ("mtd: MXC NAND driver fixes
(v5)") from Linus' tree and commit
ccd93854d44710adaa02cecf0ef5f24ab383dd20 ("[MTD] Remove mtd->
{suspend,resume} calls from board drivers") from the mtd tree.

I fixed it up (see below) and can carry the fix for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/mtd/nand/mxc_nand.c
index 40c2608,65040de..0000000
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@@ -1021,11 -1015,9 +1021,10 @@@ static int mxcnd_suspend(struct platfor
  	int ret = 0;
  
  	DEBUG(MTD_DEBUG_LEVEL0, "MXC_ND : NAND suspend\n");
 -
 -	/* Disable the NFC clock */
 -	clk_disable(nfc_clk);	/* FIXME */
 +	if (mtd) {
- 		ret = mtd->suspend(mtd);
 +		/* Disable the NFC clock */
 +		clk_disable(host->clk);
 +	}
  
  	return ret;
  }
@@@ -1038,12 -1028,8 +1037,11 @@@ static int mxcnd_resume(struct platform
  	int ret = 0;
  
  	DEBUG(MTD_DEBUG_LEVEL0, "MXC_ND : NAND resume\n");
 -	/* Enable the NFC clock */
 -	clk_enable(nfc_clk);	/* FIXME */
 +
 +	if (mtd) {
 +		/* Enable the NFC clock */
 +		clk_enable(host->clk);
- 		mtd->resume(mtd);
 +	}
  
  	return ret;
  }

             reply	other threads:[~2009-06-01  4:01 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-06-01  4:00 Stephen Rothwell [this message]
2010-04-29  2:58 Stephen Rothwell
2010-08-07  3:37 Stephen Rothwell
2010-10-26  0:32 Stephen Rothwell
2011-05-27  4:00 Stephen Rothwell
2011-05-27  7:43 ` Artem Bityutskiy
2011-05-27  4:00 Stephen Rothwell
2011-05-27  7:47 ` Artem Bityutskiy
2019-01-29  0:17 Stephen Rothwell
2019-01-29 14:12 ` Boris Brezillon
2021-08-17  4:49 Stephen Rothwell
2021-08-17  8:15 ` Sean Young
2021-08-17  8:41   ` Miquel Raynal

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090601140044.4786a99f.sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=Artem.Bityutskiy@nokia.com \
    --cc=LW@KARO-electronics.de \
    --cc=dwmw2@infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=vova.barinov@gmail.com \
    --subject='Re: linux-next: manual merge of the mtd tree with Linus'\'' tree' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).