Message ID | 20240626111446.1445111-2-prabhakar.pujeri@gmail.com |
---|---|
State | Accepted |
Commit | 86932cd8ccd4add4ddb3e894a0c4471aab8233c2 |
Headers | show |
Series | ACPI: Replace Ternary Operations with min()/max() Macros | expand |
On Wed, Jun 26, 2024 at 1:15 PM Prabhakar Pujeri <prabhakar.pujeri@gmail.com> wrote: > > Signed-off-by: Prabhakar Pujeri <prabhakar.pujeri@gmail.com> > --- > drivers/acpi/cppc_acpi.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/acpi/cppc_acpi.c b/drivers/acpi/cppc_acpi.c > index 1d857978f5f4..a2591e1677f5 100644 > --- a/drivers/acpi/cppc_acpi.c > +++ b/drivers/acpi/cppc_acpi.c > @@ -1837,7 +1837,7 @@ static void cppc_find_dmi_mhz(const struct dmi_header *dm, void *private) > dm->length >= DMI_ENTRY_PROCESSOR_MIN_LENGTH) { > u16 val = (u16)get_unaligned((const u16 *) > (dmi_data + DMI_PROCESSOR_MAX_SPEED)); > - *mhz = val > *mhz ? val : *mhz; > + *mhz = max(val, *mhz); > } > } > > -- Applied as 6.11 material with some edits in the subject and changelog, thanks!
diff --git a/drivers/acpi/cppc_acpi.c b/drivers/acpi/cppc_acpi.c index 1d857978f5f4..a2591e1677f5 100644 --- a/drivers/acpi/cppc_acpi.c +++ b/drivers/acpi/cppc_acpi.c @@ -1837,7 +1837,7 @@ static void cppc_find_dmi_mhz(const struct dmi_header *dm, void *private) dm->length >= DMI_ENTRY_PROCESSOR_MIN_LENGTH) { u16 val = (u16)get_unaligned((const u16 *) (dmi_data + DMI_PROCESSOR_MAX_SPEED)); - *mhz = val > *mhz ? val : *mhz; + *mhz = max(val, *mhz); } }
Signed-off-by: Prabhakar Pujeri <prabhakar.pujeri@gmail.com> --- drivers/acpi/cppc_acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)