| Message ID | 20221214212447.4058-1-hdegoede@redhat.com |
|---|---|
| State | Accepted |
| Commit | bd4edba2653aeef0119b7a945f07e58711343bf9 |
| Headers | show |
| Series | x86/rtc: Simplify PNP ids check | expand |
On Wed, Dec 14, 2022 at 10:25 PM Hans de Goede <hdegoede@redhat.com> wrote: > > 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 <hdegoede@redhat.com> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > --- > arch/x86/kernel/rtc.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c > index 349046434513..1309b9b05338 100644 > --- a/arch/x86/kernel/rtc.c > +++ b/arch/x86/kernel/rtc.c > @@ -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 >
diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c index 349046434513..1309b9b05338 100644 --- a/arch/x86/kernel/rtc.c +++ b/arch/x86/kernel/rtc.c @@ -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
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 <hdegoede@redhat.com> --- arch/x86/kernel/rtc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)