iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent 3c8f504b3a 9622822393
commit 55f62bc873
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/pnp/interface.c
View File

@ -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;

3
drivers/pnp/pnpbios/bioscalls.c
View File

@ -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)
{ {
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;