ARM: at91: remove unused soc type/subtype getter functions
PATCH 1/1 ARM: at91: remove unused soc type/subtype getter functions
The functions at91_get_soc_type() and at91_get_soc_subtype() were used only within the setup.c file. They provided simple access to string arrays but added an unnecessary layer of abstraction. Since they are not used elsewhere, we can safely remove them and access the string arrays directly.
--- arch/arm/mach-at91/setup.c | 22 ++++++---------------- include/mach/at91/cpu.h | 2 -- 2 files changed, 6 insertions(+), 18 deletions(-)
arch/arm/mach-at91/setup.c +6 -16
@@ -281,12 +281,6 @@ static const char *soc_name[] = { [AT91_SOC_NONE ] ="Unknown" }; -const char *at91_get_soc_type (struct at91_socinfo *c) -{ -return soc_name[c->type]; -} -EXPORT_SYMBOL (at91_get_soc_type); -static const char *soc_subtype_name[] = { [AT91_SOC_RM9200_BGA ] ="at91rm9200 BGA" , [AT91_SOC_RM9200_PQFP ] ="at91rm9200 PQFP" ,
@@ -330,12 +324,6 @@ static const char *soc_subtype_name[] = { [AT91_SOC_SUBTYPE_NONE] = "Unknown" }; -const char *at91_get_soc_subtype (struct at91_socinfo *c) -{ -return soc_subtype_name[c->subtype]; -} -EXPORT_SYMBOL (at91_get_soc_subtype); -static int at91_detect (void ) { at91_soc_initdata.type =AT91_SOC_NONE ;
@@ -353,9 +341,9 @@ static int at91_detect(void)panic ("AT91: Impossible to detect the SOC type" );pr_info ("AT91: Detected soc type: %s\n" , -at91_get_soc_type (&at91_soc_initdata)); + soc_name[at91_soc_initdata.type]);pr_info ("AT91: Detected soc subtype: %s\n" , -at91_get_soc_subtype (&at91_soc_initdata)); + soc_subtype_name[at91_soc_initdata.subtype]);/* Init clock subsystem */ at91_clock_init ();
@@ -372,8 +360,10 @@ static int at91_soc_device(void)struct device *dev; dev =add_generic_device_res ("soc" ,DEVICE_ID_SINGLE ,NULL ,0 ,NULL ); -dev_add_param_fixed (dev,"name" , (char *)at91_get_soc_type (&at91_soc_initdata)); -dev_add_param_fixed (dev,"subname" , (char *)at91_get_soc_subtype (&at91_soc_initdata)); +dev_add_param_fixed (dev,"name" , + (char *)soc_name[at91_soc_initdata.type]); +dev_add_param_fixed (dev,"subname" , + (char *)soc_subtype_name[at91_soc_initdata.subtype]);return 0 ; }
include/mach/at91/cpu.h +0 -2
@@ -158,8 +158,6 @@ struct at91_socinfo { };extern struct at91_socinfo at91_soc_initdata; -const char *at91_get_soc_type (struct at91_socinfo *c); -const char *at91_get_soc_subtype (struct at91_socinfo *c);static inline int at91_soc_is_detected (void ) {
Signature · 1 line
2.39.1
Hi Alexander.
Quoted 55 lines · Alexander Shiyan
The functions
at91_get_soc_type()andat91_get_soc_subtype()were used only within thesetup.cfile. They provided simple access to string arrays but added an unnecessary layer of abstraction. Since they are not used elsewhere, we can safely remove them and access the string arrays directly.Signed-off-by Alexander Shiyan <[email protected]>--- arch/arm/mach-at91/setup.c | 22 ++++++---------------- include/mach/at91/cpu.h | 2 -- 2 files changed, 6 insertions(+), 18 deletions(-)arch/arm/mach-at91/setup.c +2
-14@@ -281,12 +281,6 @@ static const char *soc_name[] = { [AT91_SOC_NONE ] ="Unknown" }; -const char *at91_get_soc_type (struct at91_socinfo *c) -{ -return soc_name[c->type]; -} -EXPORT_SYMBOL (at91_get_soc_type); -static const char *soc_subtype_name[] = { [AT91_SOC_RM9200_BGA ] ="at91rm9200 BGA" , [AT91_SOC_RM9200_PQFP ] ="at91rm9200 PQFP" ,@@ -330,12 +324,6 @@ static const char *soc_subtype_name[] = { [AT91_SOC_SUBTYPE_NONE] = "Unknown" }; -const char *at91_get_soc_subtype (struct at91_socinfo *c) -{ -return soc_subtype_name[c->subtype]; -} -EXPORT_SYMBOL (at91_get_soc_subtype); -static int at91_detect (void ) { at91_soc_initdata.type =AT91_SOC_NONE ;@@ -353,9 +341,9 @@ static int at91_detect(void)panic ("AT91: Impossible to detect the SOC type" );pr_info ("AT91: Detected soc type: %s\n" , -at91_get_soc_type (&at91_soc_initdata)); + soc_name[at91_soc_initdata.type]);pr_info ("AT91: Detected soc subtype: %s\n" , -at91_get_soc_subtype (&at91_soc_initdata)); + soc_subtype_name[at91_soc_initdata.subtype]);/* Init clock subsystem */ at91_clock_init ();
arch/arm/mach-at91/setup.c static int at91_soc_device(void) · line 366
Quoted 9 lines
arch/arm/mach-at91/setup.c +4
-2@@ -372,8 +360,10 @@ static int at91_soc_device(void)struct device *dev; dev =add_generic_device_res ("soc" ,DEVICE_ID_SINGLE ,NULL ,0 ,NULL ); -dev_add_param_fixed (dev,"name" , (char *)at91_get_soc_type (&at91_soc_initdata)); -dev_add_param_fixed (dev,"subname" , (char *)at91_get_soc_subtype (&at91_soc_initdata)); +dev_add_param_fixed (dev,"name" , + (char *)soc_name[at91_soc_initdata.type]); +dev_add_param_fixed (dev,"subname" , + (char *)soc_subtype_name[at91_soc_initdata.subtype]);
The cast can go, as dev_add_param_fixed() take a const already. Otherwise looks good.
It is good to see at91 gets some attention, despite the age.
Sam
Hello.
Indeed, I hope Sasсha can fix this in the commit.
Thanks!
чт, 19 июн. 2025 г. в 20:14, Sam Ravnborg <[email protected]>:
Quoted 73 lines
Hi Alexander.
Quoted 55 lines · Alexander Shiyan
The functions
at91_get_soc_type()andat91_get_soc_subtype()were used only within thesetup.cfile. They provided simple access to string arrays but added an unnecessary layer of abstraction. Since they are not used elsewhere, we can safely remove them and access the string arrays directly.Signed-off-by Alexander Shiyan <[email protected]>--- arch/arm/mach-at91/setup.c | 22 ++++++---------------- include/mach/at91/cpu.h | 2 -- 2 files changed, 6 insertions(+), 18 deletions(-)arch/arm/mach-at91/setup.c +2
-14@@ -281,12 +281,6 @@ static const char *soc_name[] = { [AT91_SOC_NONE ] ="Unknown" }; -const char *at91_get_soc_type (struct at91_socinfo *c) -{ -return soc_name[c->type]; -} -EXPORT_SYMBOL (at91_get_soc_type); -static const char *soc_subtype_name[] = { [AT91_SOC_RM9200_BGA ] ="at91rm9200 BGA" , [AT91_SOC_RM9200_PQFP ] ="at91rm9200 PQFP" ,@@ -330,12 +324,6 @@ static const char *soc_subtype_name[] = { [AT91_SOC_SUBTYPE_NONE] = "Unknown" }; -const char *at91_get_soc_subtype (struct at91_socinfo *c) -{ -return soc_subtype_name[c->subtype]; -} -EXPORT_SYMBOL (at91_get_soc_subtype); -static int at91_detect (void ) { at91_soc_initdata.type =AT91_SOC_NONE ;@@ -353,9 +341,9 @@ static int at91_detect(void)panic ("AT91: Impossible to detect the SOC type" );pr_info ("AT91: Detected soc type: %s\n" , -at91_get_soc_type (&at91_soc_initdata)); + soc_name[at91_soc_initdata.type]);pr_info ("AT91: Detected soc subtype: %s\n" , -at91_get_soc_subtype (&at91_soc_initdata)); + soc_subtype_name[at91_soc_initdata.subtype]);/* Init clock subsystem */ at91_clock_init ();arch/arm/mach-at91/setup.c static int at91_soc_device(void) · line 366
Quoted 9 lines
arch/arm/mach-at91/setup.c +4
-2@@ -372,8 +360,10 @@ static int at91_soc_device(void)struct device *dev; dev =add_generic_device_res ("soc" ,DEVICE_ID_SINGLE ,NULL ,0 ,NULL ); -dev_add_param_fixed (dev,"name" , (char *)at91_get_soc_type (&at91_soc_initdata)); -dev_add_param_fixed (dev,"subname" , (char *)at91_get_soc_subtype (&at91_soc_initdata)); +dev_add_param_fixed (dev,"name" , + (char *)soc_name[at91_soc_initdata.type]); +dev_add_param_fixed (dev,"subname" , + (char *)soc_subtype_name[at91_soc_initdata.subtype]);The cast can go, as
dev_add_param_fixed()take a const already. Otherwise looks good.
It is good to see at91 gets some attention, despite the age.Sam
Quoted 3 lines · Alexander Shiyan
Hello.
Indeed, I hope Sasсha can fix this in the commit.
Did that.
Sascha
Quoted 79 lines
Thanks!
чт, 19 июн. 2025 г. в 20:14, Sam Ravnborg <[email protected]>:
Quoted 73 lines
Hi Alexander.
Quoted 55 lines · Alexander Shiyan
The functions
at91_get_soc_type()andat91_get_soc_subtype()were used only within thesetup.cfile. They provided simple access to string arrays but added an unnecessary layer of abstraction. Since they are not used elsewhere, we can safely remove them and access the string arrays directly.Signed-off-by Alexander Shiyan <[email protected]>--- arch/arm/mach-at91/setup.c | 22 ++++++---------------- include/mach/at91/cpu.h | 2 -- 2 files changed, 6 insertions(+), 18 deletions(-)arch/arm/mach-at91/setup.c +2
-14@@ -281,12 +281,6 @@ static const char *soc_name[] = { [AT91_SOC_NONE ] ="Unknown" }; -const char *at91_get_soc_type (struct at91_socinfo *c) -{ -return soc_name[c->type]; -} -EXPORT_SYMBOL (at91_get_soc_type); -static const char *soc_subtype_name[] = { [AT91_SOC_RM9200_BGA ] ="at91rm9200 BGA" , [AT91_SOC_RM9200_PQFP ] ="at91rm9200 PQFP" ,@@ -330,12 +324,6 @@ static const char *soc_subtype_name[] = { [AT91_SOC_SUBTYPE_NONE] = "Unknown" }; -const char *at91_get_soc_subtype (struct at91_socinfo *c) -{ -return soc_subtype_name[c->subtype]; -} -EXPORT_SYMBOL (at91_get_soc_subtype); -static int at91_detect (void ) { at91_soc_initdata.type =AT91_SOC_NONE ;@@ -353,9 +341,9 @@ static int at91_detect(void)panic ("AT91: Impossible to detect the SOC type" );pr_info ("AT91: Detected soc type: %s\n" , -at91_get_soc_type (&at91_soc_initdata)); + soc_name[at91_soc_initdata.type]);pr_info ("AT91: Detected soc subtype: %s\n" , -at91_get_soc_subtype (&at91_soc_initdata)); + soc_subtype_name[at91_soc_initdata.subtype]);/* Init clock subsystem */ at91_clock_init ();arch/arm/mach-at91/setup.c static int at91_soc_device(void) · line 366
Quoted 9 lines
arch/arm/mach-at91/setup.c +4
-2@@ -372,8 +360,10 @@ static int at91_soc_device(void)struct device *dev; dev =add_generic_device_res ("soc" ,DEVICE_ID_SINGLE ,NULL ,0 ,NULL ); -dev_add_param_fixed (dev,"name" , (char *)at91_get_soc_type (&at91_soc_initdata)); -dev_add_param_fixed (dev,"subname" , (char *)at91_get_soc_subtype (&at91_soc_initdata)); +dev_add_param_fixed (dev,"name" , + (char *)soc_name[at91_soc_initdata.type]); +dev_add_param_fixed (dev,"subname" , + (char *)soc_subtype_name[at91_soc_initdata.subtype]);The cast can go, as
dev_add_param_fixed()take a const already. Otherwise looks good.
It is good to see at91 gets some attention, despite the age.Sam
Signature · 4 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Sascha Hauer
AppliedQuoted 8 lines · Alexander Shiyan
The functions
at91_get_soc_type()andat91_get_soc_subtype()were used only within thesetup.cfile. They provided simple access to string arrays but added an unnecessary layer of abstraction. Since they are not used elsewhere, we can safely remove them and access the string arrays directly.[...]
Applied, thanks!
[1/1] ARM: at91: remove unused soc type/subtype getter functions
https://git.pengutronix.de/cgit/barebox/commit/?id=a2a4de0237bc (link may not be stable)
Best regards,
Signature · 1 line
Sascha Hauer <[email protected]>