An ad-hoc cleanup followed by preparation for SPI code cleaning.
The latter will be done in the next kernel cycle to avoid conflicts.
This patch series should go before
https://lore.kernel.org/linux-acpi/[email protected]/
In v2:
- added Fixes tag to the first patch (Rafael)
- reordered to get Fixes first in the series
- v1: [email protected]
Andy Shevchenko (2):
ACPI: LPSS: Advertise number of chip selects via property
ACPI: LPSS: Remove nested ifdeffery for CONFIG_PM
drivers/acpi/acpi_lpss.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--
2.43.0.rc1.1.gbec44491f096
On Thu, Apr 04, 2024 at 03:06:57PM +0300, Andy Shevchenko wrote:
> An ad-hoc cleanup followed by preparation for SPI code cleaning.
> The latter will be done in the next kernel cycle to avoid conflicts.
>
> This patch series should go before
> https://lore.kernel.org/linux-acpi/[email protected]/
Indeliberately forgot
Reviewed-by: Kuppuswamy Sathyanarayanan <[email protected]>
(Code hasn't been changed, commit messages also stays the same, hence I added
it from v1)
> In v2:
> - added Fixes tag to the first patch (Rafael)
> - reordered to get Fixes first in the series
> - v1: [email protected]
--
With Best Regards,
Andy Shevchenko
There is no need to have the ifdef CONFIG_PM to be nested.
The second and so on will obviously become a no-op.
Remove redundant nested ifdeffery.
Signed-off-by: Andy Shevchenko <[email protected]>
---
drivers/acpi/acpi_lpss.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
index 8e01792228d1..a3d2d94be5c0 100644
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/acpi_lpss.c
@@ -887,10 +887,8 @@ static int acpi_lpss_activate(struct device *dev)
if (pdata->dev_desc->flags & (LPSS_SAVE_CTX | LPSS_SAVE_CTX_ONCE))
lpss_deassert_reset(pdata);
-#ifdef CONFIG_PM
if (pdata->dev_desc->flags & LPSS_SAVE_CTX_ONCE)
acpi_lpss_save_ctx(dev, pdata);
-#endif
return 0;
}
--
2.43.0.rc1.1.gbec44491f096
On Thu, Apr 4, 2024 at 2:11 PM Andy Shevchenko
<[email protected]> wrote:
>
> On Thu, Apr 04, 2024 at 03:06:57PM +0300, Andy Shevchenko wrote:
> > An ad-hoc cleanup followed by preparation for SPI code cleaning.
> > The latter will be done in the next kernel cycle to avoid conflicts.
> >
> > This patch series should go before
> > https://lore.kernel.org/linux-acpi/[email protected]/
>
> Indeliberately forgot
> Reviewed-by: Kuppuswamy Sathyanarayanan <[email protected]>
>
> (Code hasn't been changed, commit messages also stays the same, hence I added
> it from v1)
>
> > In v2:
> > - added Fixes tag to the first patch (Rafael)
> > - reordered to get Fixes first in the series
> > - v1: [email protected]
>
> --
Both patches applied as 6.10 material, thanks!