Message ID | 20230301170938.9278-1-Jonathan.Cameron@huawei.com |
---|---|
State | New |
Headers | show |
Series | acpi/arm64: Drop extra (struct resource) | expand |
On 2023/3/2 1:09, Jonathan Cameron wrote: > DEFINE_RES_IRQ() is a wrapper around the DEFINE_RES_NAMED() > macro which already has the (struct resource) for the compound > literal. > > Fixes warnings: > CC drivers/acpi/arm64/gtdt.o > CHECK drivers/acpi/arm64/gtdt.c > drivers/acpi/arm64/gtdt.c:355:19: warning: cast to non-scalar > drivers/acpi/arm64/gtdt.c:355:19: warning: cast from non-scalar > > Fixes: 52c4d11f1dce ("resource: Convert DEFINE_RES_NAMED() to be compound literal") > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > --- > drivers/acpi/arm64/gtdt.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/acpi/arm64/gtdt.c b/drivers/acpi/arm64/gtdt.c > index c0e77c1c8e09..24bd479de91f 100644 > --- a/drivers/acpi/arm64/gtdt.c > +++ b/drivers/acpi/arm64/gtdt.c > @@ -352,7 +352,7 @@ static int __init gtdt_import_sbsa_gwdt(struct acpi_gtdt_watchdog *wd, > } > > irq = map_gt_gsi(wd->timer_interrupt, wd->timer_flags); > - res[2] = (struct resource)DEFINE_RES_IRQ(irq); > + res[2] = DEFINE_RES_IRQ(irq); > if (irq <= 0) { > pr_warn("failed to map the Watchdog interrupt.\n"); > nr_res--; > Looks good to me, Reviewed-by: Hanjun Guo <guohanjun@huawei.com>
+Cc Catalin, and Lorenzo's kernel.org email. On 2023/3/2 9:54, Hanjun Guo wrote: > On 2023/3/2 1:09, Jonathan Cameron wrote: >> DEFINE_RES_IRQ() is a wrapper around the DEFINE_RES_NAMED() >> macro which already has the (struct resource) for the compound >> literal. >> >> Fixes warnings: >> CC drivers/acpi/arm64/gtdt.o >> CHECK drivers/acpi/arm64/gtdt.c >> drivers/acpi/arm64/gtdt.c:355:19: warning: cast to non-scalar >> drivers/acpi/arm64/gtdt.c:355:19: warning: cast from non-scalar >> >> Fixes: 52c4d11f1dce ("resource: Convert DEFINE_RES_NAMED() to be >> compound literal") >> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> >> --- >> drivers/acpi/arm64/gtdt.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/acpi/arm64/gtdt.c b/drivers/acpi/arm64/gtdt.c >> index c0e77c1c8e09..24bd479de91f 100644 >> --- a/drivers/acpi/arm64/gtdt.c >> +++ b/drivers/acpi/arm64/gtdt.c >> @@ -352,7 +352,7 @@ static int __init gtdt_import_sbsa_gwdt(struct >> acpi_gtdt_watchdog *wd, >> } >> irq = map_gt_gsi(wd->timer_interrupt, wd->timer_flags); >> - res[2] = (struct resource)DEFINE_RES_IRQ(irq); >> + res[2] = DEFINE_RES_IRQ(irq); >> if (irq <= 0) { >> pr_warn("failed to map the Watchdog interrupt.\n"); >> nr_res--; >> > > Looks good to me, > > Reviewed-by: Hanjun Guo <guohanjun@huawei.com> Catalin, would you mind picking this up for 6.3-rc? Andy also reviewed this patch [1]. [1]: https://www.spinics.net/lists/arm-kernel/msg1051744.html Thanks Hanjun
diff --git a/drivers/acpi/arm64/gtdt.c b/drivers/acpi/arm64/gtdt.c index c0e77c1c8e09..24bd479de91f 100644 --- a/drivers/acpi/arm64/gtdt.c +++ b/drivers/acpi/arm64/gtdt.c @@ -352,7 +352,7 @@ static int __init gtdt_import_sbsa_gwdt(struct acpi_gtdt_watchdog *wd, } irq = map_gt_gsi(wd->timer_interrupt, wd->timer_flags); - res[2] = (struct resource)DEFINE_RES_IRQ(irq); + res[2] = DEFINE_RES_IRQ(irq); if (irq <= 0) { pr_warn("failed to map the Watchdog interrupt.\n"); nr_res--;
DEFINE_RES_IRQ() is a wrapper around the DEFINE_RES_NAMED() macro which already has the (struct resource) for the compound literal. Fixes warnings: CC drivers/acpi/arm64/gtdt.o CHECK drivers/acpi/arm64/gtdt.c drivers/acpi/arm64/gtdt.c:355:19: warning: cast to non-scalar drivers/acpi/arm64/gtdt.c:355:19: warning: cast from non-scalar Fixes: 52c4d11f1dce ("resource: Convert DEFINE_RES_NAMED() to be compound literal") Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> --- drivers/acpi/arm64/gtdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)