Commit d2c4d6e8 authored by Linus Torvalds's avatar Linus Torvalds

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
parents a5a16050 e510785f
...@@ -51,7 +51,7 @@ static void pnp_remove_protocol(struct pnp_protocol *protocol) ...@@ -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 * @protocol: pointer to the corresponding pnp_protocol structure
* *
* Ex protocols: ISAPNP, PNPBIOS, etc * Ex protocols: ISAPNP, PNPBIOS, etc
...@@ -91,7 +91,7 @@ int pnp_register_protocol(struct pnp_protocol *protocol) ...@@ -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 * @protocol: pointer to the corresponding pnp_protocol structure
*/ */
void pnp_unregister_protocol(struct pnp_protocol *protocol) void pnp_unregister_protocol(struct pnp_protocol *protocol)
......
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