summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-10-30 13:00:10 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-10-30 13:00:10 -0700
commitd2c4d6e8acc6548a3ddae0f2e8d8120ead09ad80 (patch)
tree881c5376098affc93a9a21d69389deb38dcc013e
parenta5a16050d78dd4a8a5a2a6614e64f76d59ef8a2e (diff)
parente510785f8aca4a7346497edd4d5aceefe5370960 (diff)
downloadlinux-d2c4d6e8acc6548a3ddae0f2e8d8120ead09ad80.tar.bz2
Merge tag 'pnp-5.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull PNP fix from Rafael Wysocki: "Make function names in kerneldoc comments match the actual names of the functions that they correspond to (Mauro Carvalho Chehab)" * tag 'pnp-5.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: PNP: fix kernel-doc markups
-rw-r--r--drivers/pnp/core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pnp/core.c b/drivers/pnp/core.c
index 3bf18d718975..a50ab002e9e4 100644
--- a/drivers/pnp/core.c
+++ b/drivers/pnp/core.c
@@ -51,7 +51,7 @@ static void pnp_remove_protocol(struct pnp_protocol *protocol)
}
/**
- * pnp_protocol_register - adds a pnp protocol to the pnp layer
+ * pnp_register_protocol - adds a pnp protocol to the pnp layer
* @protocol: pointer to the corresponding pnp_protocol structure
*
* Ex protocols: ISAPNP, PNPBIOS, etc
@@ -91,7 +91,7 @@ int pnp_register_protocol(struct pnp_protocol *protocol)
}
/**
- * pnp_protocol_unregister - removes a pnp protocol from the pnp layer
+ * pnp_unregister_protocol - removes a pnp protocol from the pnp layer
* @protocol: pointer to the corresponding pnp_protocol structure
*/
void pnp_unregister_protocol(struct pnp_protocol *protocol)