x86/rtc: Simplify PNP ids check
PATCH 1/1 x86/rtc: Simplify PNP ids check
compare_pnp_id() already iterates over the single linked pnp_ids list starting with the id past to it.
So there is no need for add_rtc_cmos() to call compare_pnp_id() for each id on the list.
Signed-off-by Hans de Goede <[email protected]>
--- arch/x86/kernel/rtc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
arch/x86/kernel/rtc.c +3 -6
@@ -138,15 +138,12 @@ static __init int add_rtc_cmos(void)static const char *const ids[]__initconst = {"PNP0b00" ,"PNP0b01" ,"PNP0b02" , };struct pnp_dev *dev; -struct pnp_id *id;int i;pnp_for_each_dev (dev) { -for (id = dev->id; id; id = id->next) { -for (i =0 ; i <ARRAY_SIZE (ids); i++) { -if (compare_pnp_id (id, ids[i]) !=0 ) -return 0 ; - } +for (i =0 ; i <ARRAY_SIZE (ids); i++) { +if (compare_pnp_id (dev->id, ids[i]) !=0 ) +return 0 ; } }#endif
Signature · 1 line
2.38.1
Quoted 8 lines · Hans de Goede
compare_pnp_id()already iterates over the single linkedpnp_idslist starting with the id past to it.So there is no need for
add_rtc_cmos()to callcompare_pnp_id()for each id on the list.Signed-off-by Hans de Goede <[email protected]>
Quoted 30 lines
--- arch/x86/kernel/rtc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)arch/x86/kernel/rtc.c +3
-7@@ -138,15 +138,12 @@ static __init int add_rtc_cmos(void)static const char *const ids[]__initconst = {"PNP0b00" ,"PNP0b01" ,"PNP0b02" , };struct pnp_dev *dev; -struct pnp_id *id;int i;pnp_for_each_dev (dev) { -for (id = dev->id; id; id = id->next) { -for (i =0 ; i <ARRAY_SIZE (ids); i++) { -if (compare_pnp_id (id, ids[i]) !=0 ) -return 0 ; - } +for (i =0 ; i <ARRAY_SIZE (ids); i++) { +if (compare_pnp_id (dev->id, ids[i]) !=0 ) +return 0 ; } }#endif --2.38.1