From patchwork Fri Oct 30 06:21:15 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: vimal singh X-Patchwork-Id: 37252 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [18.85.46.34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0618CB7C3F for ; Fri, 30 Oct 2009 17:23:19 +1100 (EST) Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1N3krm-0007BV-5W; Fri, 30 Oct 2009 06:21:42 +0000 Received: from mail-bw0-f212.google.com ([209.85.218.212]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1N3krf-000763-OD for linux-mtd@lists.infradead.org; Fri, 30 Oct 2009 06:21:40 +0000 Received: by mail-bw0-f212.google.com with SMTP id 4so3543519bwz.2 for ; Thu, 29 Oct 2009 23:21:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:from:date:message-id :subject:to:content-type; bh=E4e2k9np2YwUkGrXvztomGi7mO8+JiBO4DH4cvzGC6s=; b=qAW9tNpCfGsJVzfEgpTEDVD3mJqMyAM9mvtiaaSZxax6+KAb1pMuSEeAdCqXnmZCiU QgaNBhgqS25k6S7SpGQ+PSu2IuB5HApwkPbTYRfpWgyPJppymFcPG0gfOoBVjovveyhn kY5XWylTcpZs6Cj7JpQDmogHSV/wFEbajCXYU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:content-type; b=R6PvaTCCjfz9ZBHC+FZXlQGlbrQ6d917qpvflscsBZdXZLsuw604ZphgP4iesLtdLm rb0wxTEy6rP8UfHxba6Cwe8gi5hcyM5sdxFdWGIzj3TJTxq6amOIL3rvglyYrtqslfes nRhNOjXbpl9h1dApWQlr7EWw0tjnMSSwF+E78= MIME-Version: 1.0 Received: by 10.204.34.5 with SMTP id j5mr800475bkd.5.1256883695233; Thu, 29 Oct 2009 23:21:35 -0700 (PDT) From: Vimal Singh Date: Fri, 30 Oct 2009 11:51:15 +0530 Message-ID: Subject: [PATCH 2/3]NAND: OMAP: Fixing omap nand driver, compiled as module To: Linux MTD X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20091030_022135_901590_7DCF5B68 X-CRM114-Status: UNSURE ( 8.10 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.2.5 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- _SUMMARY_ X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Vimal Singh Date: Fri, 30 Oct 2009 11:32:17 +0530 Subject: [PATCH] NAND: OMAP: Fixing omap nand driver, compiled as module Removing OMAP NAND driver, when loaded as a module, gives error and does not get success. This fixes this and makes driver loadable and removable run time. Signed-off-by: Vimal Singh --- drivers/mtd/nand/omap2.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c index 92573d5..ecc4d32 100644 --- a/drivers/mtd/nand/omap2.c +++ b/drivers/mtd/nand/omap2.c @@ -1056,7 +1056,8 @@ out_free_info: static int omap_nand_remove(struct platform_device *pdev) { struct mtd_info *mtd = platform_get_drvdata(pdev); - struct omap_nand_info *info = mtd->priv; + struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, + mtd); platform_set_drvdata(pdev, NULL); if (use_dma) @@ -1064,7 +1065,9 @@ static int omap_nand_remove(struct platform_device *pdev) /* Release NAND device, its internal structures and partitions */ nand_release(&info->mtd); + release_mem_region(info->phys_base, NAND_IO_SIZE); iounmap(info->nand_pref_fifo_add); + gpmc_cs_free(info->gpmc_cs); kfree(&info->mtd); return 0; }