Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c7385db authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull PNP updates from Rafael Wysocki:
 "These make pnpbios_thread_init() use PTR_ERR_OR_ZERO() and remove an
  unnecessary kallsyms include from drivers/pnp/quirks.c (Vasyl
  Gomonovych, Sergey Senozhatsky)"

* tag 'pnp-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PNP: pnpbios: Use PTR_ERR_OR_ZERO()
  PNP: remove unneeded kallsyms include
parents 1a9a126b 846583ce

drivers/pnp/pnpbios/core.c

+1 −4
Original line number Diff line number Diff line
@@ -581,10 +581,7 @@ static int __init pnpbios_thread_init(void) 


	init_completion(&unload_sem);

	task = kthread_run(pnp_dock_thread, NULL, "kpnpbiosd");

	if (IS_ERR(task))

		return PTR_ERR(task);



	return 0;

	return PTR_ERR_OR_ZERO(task);

}



/* Start the kernel thread later: */

drivers/pnp/quirks.c

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <linux/slab.h>

#include <linux/pnp.h>

#include <linux/io.h>

#include <linux/kallsyms.h>

#include "base.h"



static void quirk_awe32_add_ports(struct pnp_dev *dev,