aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-01-29 10:47:31 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2018-01-29 10:47:31 -0800
commit1c7385dbf8c55d0866172fdf70320c8f11b1ac15 (patch)
tree0581f09281e33a58577824440a1df8b6ed21c44c
parent1a9a126b5098160ca934a352617e9e65dbfa679d (diff)
parent846583ce151644b8538ca6cdf3f0857a80787649 (diff)
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
-rw-r--r--drivers/pnp/pnpbios/core.c5
-rw-r--r--drivers/pnp/quirks.c1
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
index e681140b85d8..077f334fdbae 100644
--- a/drivers/pnp/pnpbios/core.c
+++ b/drivers/pnp/pnpbios/core.c
@@ -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: */
diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c
index f054cdddfef8..803666ae3635 100644
--- a/drivers/pnp/quirks.c
+++ b/drivers/pnp/quirks.c
@@ -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,

Privacy Policy