| Message ID | 1514899688-27844-10-git-send-email-Julia.Lawall@lip6.fr |
|---|---|
| State | Accepted |
| Delegated to: | Cyrille Pitchen |
| Headers | show |
| Series | account for const type of of_device_id.data | expand |
Le 02/01/2018 à 14:28, Julia Lawall a écrit : > This driver creates a number of const structures that it stores in the > data field of an of_device_id array. > > The data field of an of_device_id structure has type const void *, so > there is no need for a const-discarding cast when putting const values > into such a structure. > > Done using Coccinelle. > > Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> > Applied to the spi-nor/next branch of linux-mtd Thanks! > --- > drivers/mtd/spi-nor/fsl-quadspi.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff -u -p a/drivers/mtd/spi-nor/fsl-quadspi.c b/drivers/mtd/spi-nor/fsl-quadspi.c > --- a/drivers/mtd/spi-nor/fsl-quadspi.c > +++ b/drivers/mtd/spi-nor/fsl-quadspi.c > @@ -801,10 +801,10 @@ static int fsl_qspi_nor_setup_last(struc > } > > static const struct of_device_id fsl_qspi_dt_ids[] = { > - { .compatible = "fsl,vf610-qspi", .data = (void *)&vybrid_data, }, > - { .compatible = "fsl,imx6sx-qspi", .data = (void *)&imx6sx_data, }, > - { .compatible = "fsl,imx7d-qspi", .data = (void *)&imx7d_data, }, > - { .compatible = "fsl,imx6ul-qspi", .data = (void *)&imx6ul_data, }, > + { .compatible = "fsl,vf610-qspi", .data = &vybrid_data, }, > + { .compatible = "fsl,imx6sx-qspi", .data = &imx6sx_data, }, > + { .compatible = "fsl,imx7d-qspi", .data = &imx7d_data, }, > + { .compatible = "fsl,imx6ul-qspi", .data = &imx6ul_data, }, > { .compatible = "fsl,ls1021a-qspi", .data = (void *)&ls1021a_data, }, > { /* sentinel */ } > }; > >
diff -u -p a/drivers/mtd/spi-nor/fsl-quadspi.c b/drivers/mtd/spi-nor/fsl-quadspi.c --- a/drivers/mtd/spi-nor/fsl-quadspi.c +++ b/drivers/mtd/spi-nor/fsl-quadspi.c @@ -801,10 +801,10 @@ static int fsl_qspi_nor_setup_last(struc } static const struct of_device_id fsl_qspi_dt_ids[] = { - { .compatible = "fsl,vf610-qspi", .data = (void *)&vybrid_data, }, - { .compatible = "fsl,imx6sx-qspi", .data = (void *)&imx6sx_data, }, - { .compatible = "fsl,imx7d-qspi", .data = (void *)&imx7d_data, }, - { .compatible = "fsl,imx6ul-qspi", .data = (void *)&imx6ul_data, }, + { .compatible = "fsl,vf610-qspi", .data = &vybrid_data, }, + { .compatible = "fsl,imx6sx-qspi", .data = &imx6sx_data, }, + { .compatible = "fsl,imx7d-qspi", .data = &imx7d_data, }, + { .compatible = "fsl,imx6ul-qspi", .data = &imx6ul_data, }, { .compatible = "fsl,ls1021a-qspi", .data = (void *)&ls1021a_data, }, { /* sentinel */ } };
This driver creates a number of const structures that it stores in the data field of an of_device_id array. The data field of an of_device_id structure has type const void *, so there is no need for a const-discarding cast when putting const values into such a structure. Done using Coccinelle. Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> --- drivers/mtd/spi-nor/fsl-quadspi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)