Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4386ad0 authored by Németh Márton's avatar Németh Márton Committed by Greg Kroah-Hartman
Browse files

USB host: make Open Firmware device id constant 

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: default avatarNémeth Márton <nm127@freemail.hu>
Cc: Julia Lawall <julia@diku.dk>
Cc: cocci@diku.dk
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1e927d96

drivers/usb/host/ehci-ppc-of.c

+1 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ static int ehci_hcd_ppc_of_shutdown(struct of_device *op) 
}





static struct of_device_id ehci_hcd_ppc_of_match[] = {

static const struct of_device_id ehci_hcd_ppc_of_match[] = {

	{

		.compatible = "usb-ehci",

	},

drivers/usb/host/ehci-xilinx-of.c

+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ static int ehci_hcd_xilinx_of_shutdown(struct of_device *op) 
}





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",},

	{},

};

drivers/usb/host/fhci-hcd.c

+1 −1
Original line number Diff line number Diff line
@@ -805,7 +805,7 @@ static int __devexit of_fhci_remove(struct of_device *ofdev) 
	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", },

	{},

};

drivers/usb/host/isp1760-if.c

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ static int of_isp1760_remove(struct of_device *dev) 
	return 0;

}



static struct of_device_id of_isp1760_match[] = {

static const struct of_device_id of_isp1760_match[] = {

	{

		.compatible = "nxp,usb-isp1760",

	},

drivers/usb/host/ohci-ppc-of.c

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ static int ohci_hcd_ppc_of_shutdown(struct of_device *op) 
}





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",