ACPI fixes for 5.11-rc3

- Drop two local variables that are never read and the code updating
    their values from the x86 suspend-to-idle code (Rafael Wysocki).
 
  - Add empty stub of an ACPI helper function to avoid build issues
    when CONFIG_ACPI is not set (Shawn Guo).
 
  - Remove confusing text regarding modules from Kconfig entries that
    correspond to non-modular code (Peter Robinson).
 -----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEE4fcc61cGeeHD/fCwgsRv/nhiVHEFAl/4mWQSHHJqd0Byand5
 c29ja2kubmV0AAoJEILEb/54YlRxBSIQALV2cZnFoNaL95feCHNcqh5OYUtiC1JL
 BFFhG3ebyb0DsCY5U3n2Nd2SW7fa9sAaeSbxVLA+A4vegffpog0pGRVM+Z2wPhJ9
 DTG8yhN1fLdvrMcj8o/IoWdZEFiPqgTZzolHPwiabak6UNIWg0iWd+MSVEaF4zy4
 kdz8BYYtowTBBiUBA4UsYwKEhsBG0zqo9F1oFljLwE2Qlj7P/5E6h2JEgqFAflGT
 P3NrxYzLNcVsmb9y7PCX7CQIhx48dhCg/NsMMle+hlJSN1LuRfBHBeOW4/ADLXNp
 8Qs7Hk267WnsDVObAasQL9lGREsiXbSok/74lWW4epEJnT1w++t57EB0kUSKT9oS
 VEUKeWzCWpnRohmt/M1QSTgvtcz3HDFIVUVPsC2W0wbYid39rBKuD+whF9d6KBqh
 UwRp5dZiqdMhT/GPqKep2hS/f6F4phuZSUS2SlCStYaeBLzQ9Mzz1WHFa33MmkVC
 1VaZ4YrLaeij91/4Da1psekSDPnuX7JZAiTksSaDUmWS1Xk4Mz2E9F3g4+sC/iUL
 MOq3Yr5i8rWoSQMmrGCPg1synq8c6ytTl4KDbcOmRFUPDzESzffFR2QbVlJqVP4x
 wWKYTZVx5hCxYNFUtgXT0JYRLBip3iFEleokg0FdfucKOvUKMu2lwCz9c0ZnbsmZ
 5Iz4cPOAG0rC
 =9ssW
 -----END PGP SIGNATURE-----

Merge tag 'acpi-5.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull ACPI fixes from Rafael Wysocki:
 "These address two build issues and drop confusing text from a couple
  of Kconfig entries.

  Specifics:

   - Drop two local variables that are never read and the code updating
     their values from the x86 suspend-to-idle code (Rafael Wysocki)

   - Add empty stub of an ACPI helper function to avoid build issues
     when CONFIG_ACPI is not set (Shawn Guo)

   - Remove confusing text regarding modules from Kconfig entries that
     correspond to non-modular code (Peter Robinson)"

* tag 'acpi-5.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: Update Kconfig help text for items that are no longer modular
  ACPI: scan: add stub acpi_create_platform_device() for !CONFIG_ACPI
  ACPI: PM: s2idle: Drop unused local variables and related code
This commit is contained in:
Linus Torvalds 2021-01-08 15:42:56 -08:00
commit fb9ca0be63
3 changed files with 8 additions and 19 deletions

View file

@ -885,6 +885,13 @@ static inline int acpi_device_modalias(struct device *dev,
return -ENODEV;
}
static inline struct platform_device *
acpi_create_platform_device(struct acpi_device *adev,
struct property_entry *properties)
{
return NULL;
}
static inline bool acpi_dma_supported(struct acpi_device *adev)
{
return false;