PNP updates for 5.12-rc1

- Add printf annotation to a logging function (Tom Rix).
 
  - Use DEFINE_SPINLOCK() for defining a spinlock so as to initialize
    it statically (Zheng Yongjun).
 -----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEE4fcc61cGeeHD/fCwgsRv/nhiVHEFAmAqu9ISHHJqd0Byand5
 c29ja2kubmV0AAoJEILEb/54YlRxMZQP/Rr4P4nDZz3TZTqZtMGr8tny9jKvtozf
 O0ZTZuEG+e49Y5czuWoufQE6y03HSAFkIFdrTIrYNn+YBzkWEOh4WewFVu+f/2lZ
 kbi2V0ic8p9BWwhphrLdFvIuK+7ZpBN3VQsTBx46h1PYIlmb2YIHrNtYHjlrmNuA
 rkb8qsinAAqnKZymZPbzAn+rHRiLFBrkzhLK22bkUDy53ThAoWkVRKnCw0gg59Qm
 k0KMAeKkcoqEPaUvTCfJzdaYG39Pr3a2oxq+QcLf1g4U10b0dqVunX+Yktk1oj0z
 D0RJ/gzPoI01nEn5uPePu1r02KNyB9aY2AcUGg/tQdMFSeGLnW9k1d338BeCW6u2
 9WdahQL4cE75Rfi+ui5AIz5auRerSB5b275WyCv1Q7j7iCFnoNnzFiusz8wb9WMc
 KN9idzc2cVLjwXIbZqj1fqTL1CIU7cFtLM9+Afl1JnygO+WOfPb7VxCsdHhQkMf5
 VP2gmUaf4NgInsEHfQVlJp8RSaxFa/tG0AQDk4nz1VW/1v8qgDVIcHgXBqTDzcI7
 3uJWKeonVUO9vd4ssRTbAKpu+6SjR2dPYECxuxe60OkzD6T5ZBp292KYgWAPAAYP
 h5B5oDBG7mSB7cIy3Wgy7WT+qiiFuWSAqgjD+yGITzCCjRhM4Qn8PHdRl7ECDPT0
 fSrydszQH5Ec
 =8eF7
 -----END PGP SIGNATURE-----

Merge tag 'pnp-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull PNP updates from Rafael Wysocki:
 "These make two janitorial changes of the code.

  Specifics:

   - Add printf annotation to a logging function (Tom Rix)

   - Use DEFINE_SPINLOCK() for defining a spinlock so as to initialize
     it statically (Zheng Yongjun)"

* tag 'pnp-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PNP: pnpbios: Use DEFINE_SPINLOCK() for spinlock
  PNP: add printf attribute to log function
This commit is contained in:
Linus Torvalds 2021-02-20 21:56:49 -08:00
commit 55f62bc873
2 changed files with 2 additions and 2 deletions

View File

@ -33,6 +33,7 @@ struct pnp_info_buffer {
typedef struct pnp_info_buffer pnp_info_buffer_t;
__printf(2, 3)
static int pnp_printf(pnp_info_buffer_t * buffer, char *fmt, ...)
{
va_list args;

View File

@ -72,7 +72,7 @@ __visible u32 pnp_bios_fault_esp;
__visible u32 pnp_bios_fault_eip;
__visible u32 pnp_bios_is_utter_crap = 0;
static spinlock_t pnp_bios_lock;
static DEFINE_SPINLOCK(pnp_bios_lock);
/*
* Support Functions
@ -473,7 +473,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
{
int i;
spin_lock_init(&pnp_bios_lock);
pnp_bios_callpoint.offset = header->fields.pm16offset;
pnp_bios_callpoint.segment = PNP_CS16;