mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Mike Frysinger <vapier@gentoo.org>
To: linux-kernel@vger.kernel.org
Cc: uclinux-dist-devel@blackfin.uclinux.org,
	Timofei Bondarenko <tim@ipi.ac.ru>,
	Sonic Zhang <sonic.zhang@analog.com>,
	Greg Ungerer <gerg@uclinux.org>,
	uclinux-dev@uclinux.org, linux-mtd@lists.infradead.org
Subject: [PATCH 1/2] mtd/maps: uclinux: fix building when partition support is disabled
Date: Tue, 26 May 2009 05:46:30 -0400	[thread overview]
Message-ID: <1243331191-11445-1-git-send-email-vapier@gentoo.org> (raw)

From: Timofei Bondarenko <tim@ipi.ac.ru>

The uClinux map driver doesn't even use partitions, so we shouldn't require
it in order to work properly.

Signed-off-by: Timofei Bondarenko <tim@ipi.ac.ru>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
CC: Greg Ungerer <gerg@uclinux.org>
CC: uclinux-dev@uclinux.org
CC: linux-mtd@lists.infradead.org
---
 drivers/mtd/maps/uclinux.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/drivers/mtd/maps/uclinux.c b/drivers/mtd/maps/uclinux.c
index 81756e3..57699c2 100644
--- a/drivers/mtd/maps/uclinux.c
+++ b/drivers/mtd/maps/uclinux.c
@@ -87,7 +87,11 @@ static int __init uclinux_mtd_init(void)
 	mtd->priv = mapp;
 
 	uclinux_ram_mtdinfo = mtd;
+#ifdef CONFIG_MTD_PARTITIONS
 	add_mtd_partitions(mtd, uclinux_romfs, NUM_PARTITIONS);
+#else
+	add_mtd_device(mtd);
+#endif
 
 	return(0);
 }
@@ -97,7 +101,11 @@ static int __init uclinux_mtd_init(void)
 static void __exit uclinux_mtd_cleanup(void)
 {
 	if (uclinux_ram_mtdinfo) {
+#ifdef CONFIG_MTD_PARTITIONS
 		del_mtd_partitions(uclinux_ram_mtdinfo);
+#else
+		del_mtd_device(uclinux_ram_mtdinfo);
+#endif
 		map_destroy(uclinux_ram_mtdinfo);
 		uclinux_ram_mtdinfo = NULL;
 	}
-- 
1.6.3.1


             reply	other threads:[~2009-05-26  9:46 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-05-26  9:46 Mike Frysinger [this message]
2009-05-26  9:46 ` [PATCH 2/2] mtd/maps: uclinux: support Blackfin systems Mike Frysinger
2009-05-26 11:31   ` Paul Mundt
2009-05-26 16:42     ` Mike Frysinger
2009-05-26 16:47       ` Paul Mundt
2009-05-26 16:50         ` Mike Frysinger
2009-05-26 17:06           ` Paul Mundt
2009-05-26 17:24             ` Mike Frysinger
2009-05-26 23:19               ` Paul Mundt
2009-05-26 23:22                 ` Mike Frysinger
2009-05-26 23:27                 ` [uClinux-dev] " David McCullough
2009-05-26 23:33                 ` [PATCH 1/3] mtd/maps: uclinux: allow systems to override map addr/size Mike Frysinger
2009-05-26 23:40                   ` Paul Mundt
2009-05-26 23:46                   ` Paul Mundt
2009-05-27  0:46                     ` Mike Frysinger
2009-05-27  1:03                       ` Paul Mundt
2009-05-28 15:26                   ` Artem Bityutskiy
2009-05-26 23:33                 ` [PATCH 2/3] mtd/maps: uclinux: mark local stuff static Mike Frysinger
2009-06-10  1:47                   ` Greg Ungerer
2009-05-26 23:33                 ` [PATCH 3/3] mtd/maps: uclinux: do not allow to be built as a module Mike Frysinger
2009-06-10  2:34                   ` [uClinux-dev] " Greg Ungerer
2009-06-10  1:46 ` [uClinux-dev] [PATCH 1/2] mtd/maps: uclinux: fix building when partition support is disabled Greg Ungerer

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=1243331191-11445-1-git-send-email-vapier@gentoo.org \
    --to=vapier@gentoo.org \
    --cc=gerg@uclinux.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mtd@lists.infradead.org \
    --cc=sonic.zhang@analog.com \
    --cc=tim@ipi.ac.ru \
    --cc=uclinux-dev@uclinux.org \
    --cc=uclinux-dist-devel@blackfin.uclinux.org \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®