projects/linux·commit 55f62bc8

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

55f62bc8 · Linus Torvalds <[email protected]> · 2021-02-20 21:56:49 -08:00

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
Commit
55f62bc873477dae2c45bbbc30b86cf3e0982f3b
Parents
3c8f504b · 96228223

Merge commit. Changes below are compared with the first parent: 3c8f504b.

Changes

2 files changed · +2 −2

FileStatusAddDelContent
drivers/pnp/interface.cmodified+1−0View file
drivers/pnp/pnpbios/bioscalls.cmodified+1−2View file

drivers/pnp/interface.c

View file
diff --git a/drivers/pnp/interface.c b/drivers/pnp/interface.c
index 187e4a1..602c468 100644
--- a/drivers/pnp/interface.c
+++ b/drivers/pnp/interface.c
@@ -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;

drivers/pnp/pnpbios/bioscalls.c

View file
diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
index ba5cfc3..ddc6f21 100644
--- a/drivers/pnp/pnpbios/bioscalls.c
+++ b/drivers/pnp/pnpbios/bioscalls.c
@@ -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;