| Message ID | 20211020015838.45399-2-samuel@sholland.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add support for Allwinner D1 CLINT | expand |
Reviewed-by: Guo Ren <guoren@kernel.org> On Wed, Oct 20, 2021 at 9:58 AM Samuel Holland <samuel@sholland.org> wrote: > > Match data stores hardware attributes which do not change at runtime, so > it does not need to be mutable. Make it const. > > Signed-off-by: Samuel Holland <samuel@sholland.org> > --- > include/sbi_utils/fdt/fdt_helper.h | 2 +- > lib/utils/ipi/fdt_ipi_mswi.c | 2 +- > lib/utils/reset/fdt_reset_gpio.c | 4 ++-- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/include/sbi_utils/fdt/fdt_helper.h b/include/sbi_utils/fdt/fdt_helper.h > index 5cb7340..d51c3d3 100644 > --- a/include/sbi_utils/fdt/fdt_helper.h > +++ b/include/sbi_utils/fdt/fdt_helper.h > @@ -14,7 +14,7 @@ > > struct fdt_match { > const char *compatible; > - void *data; > + const void *data; > }; > > #define FDT_MAX_PHANDLE_ARGS 16 > diff --git a/lib/utils/ipi/fdt_ipi_mswi.c b/lib/utils/ipi/fdt_ipi_mswi.c > index 1f0fda7..0176941 100644 > --- a/lib/utils/ipi/fdt_ipi_mswi.c > +++ b/lib/utils/ipi/fdt_ipi_mswi.c > @@ -51,7 +51,7 @@ static int ipi_mswi_cold_init(void *fdt, int nodeoff, > return 0; > } > > -static unsigned long clint_offset = CLINT_MSWI_OFFSET; > +static const unsigned long clint_offset = CLINT_MSWI_OFFSET; > > static const struct fdt_match ipi_mswi_match[] = { > { .compatible = "riscv,clint0", .data = &clint_offset }, > diff --git a/lib/utils/reset/fdt_reset_gpio.c b/lib/utils/reset/fdt_reset_gpio.c > index 4da1450..b683d88 100644 > --- a/lib/utils/reset/fdt_reset_gpio.c > +++ b/lib/utils/reset/fdt_reset_gpio.c > @@ -121,7 +121,7 @@ static int gpio_reset_init(void *fdt, int nodeoff, > } > > static const struct fdt_match gpio_poweroff_match[] = { > - { .compatible = "gpio-poweroff", .data = (void *)FALSE }, > + { .compatible = "gpio-poweroff", .data = (const void *)FALSE }, > { }, > }; > > @@ -131,7 +131,7 @@ struct fdt_reset fdt_poweroff_gpio = { > }; > > static const struct fdt_match gpio_reset_match[] = { > - { .compatible = "gpio-restart", .data = (void *)TRUE }, > + { .compatible = "gpio-restart", .data = (const void *)TRUE }, > { }, > }; > > -- > 2.32.0 >
在 2021-10-19星期二的 20:58 -0500，Samuel Holland写道： > Match data stores hardware attributes which do not change at runtime, > so > it does not need to be mutable. Make it const. > > Signed-off-by: Samuel Holland <samuel@sholland.org> Reviewed-by: Xiang W <wxjstz@126.com> > --- > include/sbi_utils/fdt/fdt_helper.h | 2 +- > lib/utils/ipi/fdt_ipi_mswi.c | 2 +- > lib/utils/reset/fdt_reset_gpio.c | 4 ++-- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/include/sbi_utils/fdt/fdt_helper.h > b/include/sbi_utils/fdt/fdt_helper.h > index 5cb7340..d51c3d3 100644 > --- a/include/sbi_utils/fdt/fdt_helper.h > +++ b/include/sbi_utils/fdt/fdt_helper.h > @@ -14,7 +14,7 @@ > > struct fdt_match { > const char *compatible; > - void *data; > + const void *data; > }; > > #define FDT_MAX_PHANDLE_ARGS 16 > diff --git a/lib/utils/ipi/fdt_ipi_mswi.c > b/lib/utils/ipi/fdt_ipi_mswi.c > index 1f0fda7..0176941 100644 > --- a/lib/utils/ipi/fdt_ipi_mswi.c > +++ b/lib/utils/ipi/fdt_ipi_mswi.c > @@ -51,7 +51,7 @@ static int ipi_mswi_cold_init(void *fdt, int > nodeoff, > return 0; > } > > -static unsigned long clint_offset = CLINT_MSWI_OFFSET; > +static const unsigned long clint_offset = CLINT_MSWI_OFFSET; > > static const struct fdt_match ipi_mswi_match[] = { > { .compatible = "riscv,clint0", .data = &clint_offset }, > diff --git a/lib/utils/reset/fdt_reset_gpio.c > b/lib/utils/reset/fdt_reset_gpio.c > index 4da1450..b683d88 100644 > --- a/lib/utils/reset/fdt_reset_gpio.c > +++ b/lib/utils/reset/fdt_reset_gpio.c > @@ -121,7 +121,7 @@ static int gpio_reset_init(void *fdt, int > nodeoff, > } > > static const struct fdt_match gpio_poweroff_match[] = { > - { .compatible = "gpio-poweroff", .data = (void *)FALSE }, > + { .compatible = "gpio-poweroff", .data = (const void *)FALSE > }, > { }, > }; > > @@ -131,7 +131,7 @@ struct fdt_reset fdt_poweroff_gpio = { > }; > > static const struct fdt_match gpio_reset_match[] = { > - { .compatible = "gpio-restart", .data = (void *)TRUE }, > + { .compatible = "gpio-restart", .data = (const void *)TRUE }, > { }, > }; > > -- > 2.32.0 > >
diff --git a/include/sbi_utils/fdt/fdt_helper.h b/include/sbi_utils/fdt/fdt_helper.h index 5cb7340..d51c3d3 100644 --- a/include/sbi_utils/fdt/fdt_helper.h +++ b/include/sbi_utils/fdt/fdt_helper.h @@ -14,7 +14,7 @@ struct fdt_match { const char *compatible; - void *data; + const void *data; }; #define FDT_MAX_PHANDLE_ARGS 16 diff --git a/lib/utils/ipi/fdt_ipi_mswi.c b/lib/utils/ipi/fdt_ipi_mswi.c index 1f0fda7..0176941 100644 --- a/lib/utils/ipi/fdt_ipi_mswi.c +++ b/lib/utils/ipi/fdt_ipi_mswi.c @@ -51,7 +51,7 @@ static int ipi_mswi_cold_init(void *fdt, int nodeoff, return 0; } -static unsigned long clint_offset = CLINT_MSWI_OFFSET; +static const unsigned long clint_offset = CLINT_MSWI_OFFSET; static const struct fdt_match ipi_mswi_match[] = { { .compatible = "riscv,clint0", .data = &clint_offset }, diff --git a/lib/utils/reset/fdt_reset_gpio.c b/lib/utils/reset/fdt_reset_gpio.c index 4da1450..b683d88 100644 --- a/lib/utils/reset/fdt_reset_gpio.c +++ b/lib/utils/reset/fdt_reset_gpio.c @@ -121,7 +121,7 @@ static int gpio_reset_init(void *fdt, int nodeoff, } static const struct fdt_match gpio_poweroff_match[] = { - { .compatible = "gpio-poweroff", .data = (void *)FALSE }, + { .compatible = "gpio-poweroff", .data = (const void *)FALSE }, { }, }; @@ -131,7 +131,7 @@ struct fdt_reset fdt_poweroff_gpio = { }; static const struct fdt_match gpio_reset_match[] = { - { .compatible = "gpio-restart", .data = (void *)TRUE }, + { .compatible = "gpio-restart", .data = (const void *)TRUE }, { }, };
Match data stores hardware attributes which do not change at runtime, so it does not need to be mutable. Make it const. Signed-off-by: Samuel Holland <samuel@sholland.org> --- include/sbi_utils/fdt/fdt_helper.h | 2 +- lib/utils/ipi/fdt_ipi_mswi.c | 2 +- lib/utils/reset/fdt_reset_gpio.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)