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

Commit 9cf7867c authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'const_of_device_id' 



Fabian Frederick says:

====================
drivers/net: constify of_device_id array

This small patchset adds const to of_device_id arrays in
drivers/net branch.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 617011e7 2c71ec99

drivers/net/can/cc770/cc770_platform.c

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ static int cc770_platform_remove(struct platform_device *pdev) 
	return 0;

}



static struct of_device_id cc770_platform_table[] = {

static const struct of_device_id cc770_platform_table[] = {

	{.compatible = "bosch,cc770"}, /* CC770 from Bosch */

	{.compatible = "intc,82527"},  /* AN82527 from Intel CP */

	{},

drivers/net/can/grcan.c

+1 −1
Original line number Diff line number Diff line
@@ -1725,7 +1725,7 @@ static int grcan_remove(struct platform_device *ofdev) 
	return 0;

}



static struct of_device_id grcan_match[] = {

static const struct of_device_id grcan_match[] = {

	{.name = "GAISLER_GRCAN"},

	{.name = "01_03d"},

	{.name = "GAISLER_GRHCAN"},

drivers/net/can/mscan/mpc5xxx_can.c

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ struct mpc5xxx_can_data { 
};



#ifdef CONFIG_PPC_MPC52xx

static struct of_device_id mpc52xx_cdm_ids[] = {

static const struct of_device_id mpc52xx_cdm_ids[] = {

	{ .compatible = "fsl,mpc5200-cdm", },

	{}

};

drivers/net/can/sja1000/sja1000_platform.c

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ static int sp_remove(struct platform_device *pdev) 
	return 0;

}



static struct of_device_id sp_of_table[] = {

static const struct of_device_id sp_of_table[] = {

	{.compatible = "nxp,sja1000"},

	{},

};

drivers/net/can/xilinx_can.c

+1 −1
Original line number Diff line number Diff line
@@ -1185,7 +1185,7 @@ static int xcan_remove(struct platform_device *pdev) 
}



/* Match table for OF platform binding */

static struct of_device_id xcan_of_match[] = {

static const struct of_device_id xcan_of_match[] = {

	{ .compatible = "xlnx,zynq-can-1.0", },

	{ .compatible = "xlnx,axi-can-1.00.a", },

	{ /* end of list */ },