Commit 55f62bc8 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 3c8f504b 96228223
...@@ -33,6 +33,7 @@ struct pnp_info_buffer { ...@@ -33,6 +33,7 @@ struct pnp_info_buffer {
typedef struct pnp_info_buffer pnp_info_buffer_t; typedef struct pnp_info_buffer pnp_info_buffer_t;
__printf(2, 3)
static int pnp_printf(pnp_info_buffer_t * buffer, char *fmt, ...) static int pnp_printf(pnp_info_buffer_t * buffer, char *fmt, ...)
{ {
va_list args; va_list args;
......
...@@ -72,7 +72,7 @@ __visible u32 pnp_bios_fault_esp; ...@@ -72,7 +72,7 @@ __visible u32 pnp_bios_fault_esp;
__visible u32 pnp_bios_fault_eip; __visible u32 pnp_bios_fault_eip;
__visible u32 pnp_bios_is_utter_crap = 0; __visible u32 pnp_bios_is_utter_crap = 0;
static spinlock_t pnp_bios_lock; static DEFINE_SPINLOCK(pnp_bios_lock);
/* /*
* Support Functions * Support Functions
...@@ -473,7 +473,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header) ...@@ -473,7 +473,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
{ {
int i; int i;
spin_lock_init(&pnp_bios_lock);
pnp_bios_callpoint.offset = header->fields.pm16offset; pnp_bios_callpoint.offset = header->fields.pm16offset;
pnp_bios_callpoint.segment = PNP_CS16; pnp_bios_callpoint.segment = PNP_CS16;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment