From: "Németh Márton" <nm127@freemail.hu>
To: Greg Kroah-Hartman <gregkh@suse.de>
Cc: linux-usb@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
Julia Lawall <julia@diku.dk>,
cocci@diku.dk
Subject: [PATCH 7/9] USB host: make Open Firmware device id constant
Date: Sun, 10 Jan 2010 15:35:03 +0100 [thread overview]
Message-ID: <4B49E597.9070307@freemail.hu> (raw)
From: Márton Németh <nm127@freemail.hu>
The match_table field of the struct of_device_id is constant in <linux/of_platform.h>
so it is worth to make the initialization data also constant.
The semantic match that finds this kind of pattern is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@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[] = ...;
// </smpl>
Signed-off-by: Márton Németh <nm127@freemail.hu>
Cc: Julia Lawall <julia@diku.dk>
Cc: cocci@diku.dk
---
diff -u -p a/drivers/usb/host/ehci-ppc-of.c b/drivers/usb/host/ehci-ppc-of.c
--- a/drivers/usb/host/ehci-ppc-of.c 2009-12-03 04:51:21.000000000 +0100
+++ b/drivers/usb/host/ehci-ppc-of.c 2010-01-08 17:24:21.000000000 +0100
@@ -264,7 +264,7 @@ static int ehci_hcd_ppc_of_shutdown(stru
}
-static struct of_device_id ehci_hcd_ppc_of_match[] = {
+static const struct of_device_id ehci_hcd_ppc_of_match[] = {
{
.compatible = "usb-ehci",
},
diff -u -p a/drivers/usb/host/fhci-hcd.c b/drivers/usb/host/fhci-hcd.c
--- a/drivers/usb/host/fhci-hcd.c 2009-12-03 04:51:21.000000000 +0100
+++ b/drivers/usb/host/fhci-hcd.c 2010-01-08 17:25:53.000000000 +0100
@@ -804,7 +804,7 @@ static int __devexit of_fhci_remove(stru
return fhci_remove(&ofdev->dev);
}
-static struct of_device_id of_fhci_match[] = {
+static const struct of_device_id of_fhci_match[] = {
{ .compatible = "fsl,mpc8323-qe-usb", },
{},
};
diff -u -p a/drivers/usb/host/ohci-ppc-of.c b/drivers/usb/host/ohci-ppc-of.c
--- a/drivers/usb/host/ohci-ppc-of.c 2009-12-03 04:51:21.000000000 +0100
+++ b/drivers/usb/host/ohci-ppc-of.c 2010-01-08 17:28:21.000000000 +0100
@@ -212,7 +212,7 @@ static int ohci_hcd_ppc_of_shutdown(stru
}
-static struct of_device_id ohci_hcd_ppc_of_match[] = {
+static const struct of_device_id ohci_hcd_ppc_of_match[] = {
#ifdef CONFIG_USB_OHCI_HCD_PPC_OF_BE
{
.name = "usb",
diff -u -p a/drivers/usb/host/ehci-xilinx-of.c b/drivers/usb/host/ehci-xilinx-of.c
--- a/drivers/usb/host/ehci-xilinx-of.c 2010-01-07 19:08:47.000000000 +0100
+++ b/drivers/usb/host/ehci-xilinx-of.c 2010-01-08 17:28:35.000000000 +0100
@@ -281,7 +281,7 @@ static int ehci_hcd_xilinx_of_shutdown(s
}
-static struct of_device_id ehci_hcd_xilinx_of_match[] = {
+static const struct of_device_id ehci_hcd_xilinx_of_match[] = {
{.compatible = "xlnx,xps-usb-host-1.00.a",},
{},
};
diff -u -p a/drivers/usb/host/isp1760-if.c b/drivers/usb/host/isp1760-if.c
--- a/drivers/usb/host/isp1760-if.c 2009-12-03 04:51:21.000000000 +0100
+++ b/drivers/usb/host/isp1760-if.c 2010-01-08 17:29:21.000000000 +0100
@@ -109,7 +109,7 @@ static int of_isp1760_remove(struct of_d
return 0;
}
-static struct of_device_id of_isp1760_match[] = {
+static const struct of_device_id of_isp1760_match[] = {
{
.compatible = "nxp,usb-isp1760",
},
reply other threads:[~2010-01-10 14:35 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=4B49E597.9070307@freemail.hu \
--to=nm127@freemail.hu \
--cc=cocci@diku.dk \
--cc=gregkh@suse.de \
--cc=julia@diku.dk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.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