From patchwork Sat Jan 9 14:10:46 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TsOpbWV0aCBNw6FydG9u?= X-Patchwork-Id: 42562 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 B419AB7C40 for ; Sun, 10 Jan 2010 01:15:56 +1100 (EST) Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1NTc2F-0000rE-C9; Sat, 09 Jan 2010 14:11:23 +0000 Received: from mail02d.mail.t-online.hu ([84.2.42.7]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1NTc29-00009q-Py for linux-mtd@lists.infradead.org; Sat, 09 Jan 2010 14:11:21 +0000 X-Authuid: nmarci Received: from [192.168.1.64] (dsl5402C42F.pool.t-online.hu [84.2.196.47]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail02d.mail.t-online.hu (Postfix) with ESMTPSA id 3AF34758C4C; Sat, 9 Jan 2010 15:09:14 +0100 (CET) Message-ID: <4B488E66.6080107@freemail.hu> Date: Sat, 09 Jan 2010 15:10:46 +0100 From: =?UTF-8?B?TsOpbWV0aCBNw6FydG9u?= User-Agent: Mozilla/5.0 (X11; U; Linux i686; hu-HU; rv:1.8.1.21) Gecko/20090402 SeaMonkey/1.1.16 MIME-Version: 1.0 To: David Woodhouse , Joern Engel Subject: [PATCH 3/3] nand: make Open Firmware device id constant X-DCC-mail.t-online.hu-Metrics: mail02d.mail.t-online.hu 32721; Body=6 Fuz1=6 Fuz2=6 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20100109_091118_034107_272CBFCC X-CRM114-Status: UNSURE ( 9.57 ) 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_ Cc: Julia Lawall , linux-mtd@lists.infradead.org, LKML , cocci@diku.dk 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: Márton Németh The match_table field of the struct of_device_id is constant in so it is worth to make xps2_of_match also constant. The semantic match that finds this kind of pattern is as follows: (http://coccinelle.lip6.fr/) // @r@ disable decl_init,const_decl_init; identifier I1, I2, x; @@ struct I1 { ... const struct I2 *x; ... }; @s@ identifier r.I1, y; identifier r.x, E; @@ struct I1 y = { .x = E, }; @c@ identifier r.I2; identifier s.E; @@ const struct I2 E[] = ... ; @depends on !c@ identifier r.I2; identifier s.E; @@ + const struct I2 E[] = ...; // Signed-off-by: Márton Németh Cc: Julia Lawall Cc: cocci@diku.dk diff -u -p a/drivers/mtd/nand/pasemi_nand.c b/drivers/mtd/nand/pasemi_nand.c --- a/drivers/mtd/nand/pasemi_nand.c 2009-12-03 04:51:21.000000000 +0100 +++ b/drivers/mtd/nand/pasemi_nand.c 2010-01-08 04:26:40.000000000 +0100 @@ -209,7 +209,7 @@ static int __devexit pasemi_nand_remove( return 0; } -static struct of_device_id pasemi_nand_match[] = +static const struct of_device_id pasemi_nand_match[] = { { .compatible = "pasemi,localbus-nand", diff -u -p a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c --- a/drivers/mtd/nand/fsl_upm.c 2010-01-07 19:08:42.000000000 +0100 +++ b/drivers/mtd/nand/fsl_upm.c 2010-01-08 04:28:52.000000000 +0100 @@ -349,7 +349,7 @@ static int __devexit fun_remove(struct o return 0; } -static struct of_device_id of_fun_match[] = { +static const struct of_device_id of_fun_match[] = { { .compatible = "fsl,upm-nand" }, {}, }; diff -u -p a/drivers/mtd/nand/socrates_nand.c b/drivers/mtd/nand/socrates_nand.c --- a/drivers/mtd/nand/socrates_nand.c 2009-12-03 04:51:21.000000000 +0100 +++ b/drivers/mtd/nand/socrates_nand.c 2010-01-08 04:29:01.000000000 +0100 @@ -290,7 +290,7 @@ static int __devexit socrates_nand_remov return 0; } -static struct of_device_id socrates_nand_match[] = +static const struct of_device_id socrates_nand_match[] = { { .compatible = "abb,socrates-nand",