Commit 6997faa9 authored by Jakub Kicinski's avatar Jakub Kicinski

Merge branch 'fix-several-bad-kernel-doc-markups'

Mauro Carvalho Chehab says:

====================
Fix several bad kernel-doc markups

Kernel-doc has always be limited to a probably bad documented
rule:

The kernel-doc markups should appear *imediatelly before* the
function or data structure that it documents.

On other words, if a C file would contain something like this:

	/**
	 * foo - function foo
	 * @args: foo args
	 */
	static inline void bar(int args);

	/**
	 * bar - function bar
	 * @args: foo args
	 */
	static inline void foo(void *args);

The output (in ReST format) will be:

	.. c:function:: void bar (int args)

	   function foo

	**Parameters**

	``int args``
	  foo args

	.. c:function:: void foo (void *args)

	   function bar

	**Parameters**

	``void *args``
	  foo args

Which is clearly a wrong result.  Before this changeset,
not even a warning is produced on such cases.

As placing such markups just before the documented
data is a common practice, on most cases this is fine.

However, as patches touch things, identifiers may be
renamed, and people may forget to update the kernel-doc
markups to follow such changes.

This has been happening for quite a while, as there are
lots of files with kernel-doc problems.

This series address those issues and add a file at the
end that will enforce that the identifier will match the
kernel-doc markup, avoiding this problem from
keep happening as time goes by.
====================

Link: https://lore.kernel.org/r/cover.1605521731.git.mchehab+huawei@kernel.orgSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 5cfa9a61 270f3385
...@@ -472,7 +472,7 @@ static inline void of_mdiobus_link_mdiodev(struct mii_bus *mdio, ...@@ -472,7 +472,7 @@ static inline void of_mdiobus_link_mdiodev(struct mii_bus *mdio,
#endif #endif
/** /**
* mdiobus_create_device_from_board_info - create a full MDIO device given * mdiobus_create_device - create a full MDIO device given
* a mdio_board_info structure * a mdio_board_info structure
* @bus: MDIO bus to create the devices on * @bus: MDIO bus to create the devices on
* @bi: mdio_board_info structure describing the devices * @bi: mdio_board_info structure describing the devices
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include <linux/phy.h> #include <linux/phy.h>
/** /**
* genphy_c45_setup_forced - configures a forced speed * genphy_c45_pma_setup_forced - configures a forced speed
* @phydev: target phy_device struct * @phydev: target phy_device struct
*/ */
int genphy_c45_pma_setup_forced(struct phy_device *phydev) int genphy_c45_pma_setup_forced(struct phy_device *phydev)
......
...@@ -489,7 +489,7 @@ void phy_queue_state_machine(struct phy_device *phydev, unsigned long jiffies) ...@@ -489,7 +489,7 @@ void phy_queue_state_machine(struct phy_device *phydev, unsigned long jiffies)
EXPORT_SYMBOL(phy_queue_state_machine); EXPORT_SYMBOL(phy_queue_state_machine);
/** /**
* phy_queue_state_machine - Trigger the state machine to run now * phy_trigger_machine - Trigger the state machine to run now
* *
* @phydev: the phy_device struct * @phydev: the phy_device struct
*/ */
......
...@@ -2746,7 +2746,7 @@ static int phy_get_int_delay_property(struct device *dev, const char *name) ...@@ -2746,7 +2746,7 @@ static int phy_get_int_delay_property(struct device *dev, const char *name)
#endif #endif
/** /**
* phy_get_delay_index - returns the index of the internal delay * phy_get_internal_delay - returns the index of the internal delay
* @phydev: phy_device struct * @phydev: phy_device struct
* @dev: pointer to the devices device struct * @dev: pointer to the devices device struct
* @delay_values: array of delays the PHY supports * @delay_values: array of delays the PHY supports
......
...@@ -1649,7 +1649,7 @@ int phylink_ethtool_set_pauseparam(struct phylink *pl, ...@@ -1649,7 +1649,7 @@ int phylink_ethtool_set_pauseparam(struct phylink *pl,
EXPORT_SYMBOL_GPL(phylink_ethtool_set_pauseparam); EXPORT_SYMBOL_GPL(phylink_ethtool_set_pauseparam);
/** /**
* phylink_ethtool_get_eee_err() - read the energy efficient ethernet error * phylink_get_eee_err() - read the energy efficient ethernet error
* counter * counter
* @pl: a pointer to a &struct phylink returned from phylink_create(). * @pl: a pointer to a &struct phylink returned from phylink_create().
* *
......
...@@ -1490,7 +1490,7 @@ struct net_device_ops { ...@@ -1490,7 +1490,7 @@ struct net_device_ops {
}; };
/** /**
* enum net_device_priv_flags - &struct net_device priv_flags * enum netdev_priv_flags - &struct net_device priv_flags
* *
* These are the &struct net_device, they are only set internally * These are the &struct net_device, they are only set internally
* by drivers and used in the kernel. These flags are invisible to * by drivers and used in the kernel. These flags are invisible to
...@@ -3602,7 +3602,7 @@ static inline void netif_stop_subqueue(struct net_device *dev, u16 queue_index) ...@@ -3602,7 +3602,7 @@ static inline void netif_stop_subqueue(struct net_device *dev, u16 queue_index)
} }
/** /**
* netif_subqueue_stopped - test status of subqueue * __netif_subqueue_stopped - test status of subqueue
* @dev: network device * @dev: network device
* @queue_index: sub queue index * @queue_index: sub queue index
* *
...@@ -3616,6 +3616,13 @@ static inline bool __netif_subqueue_stopped(const struct net_device *dev, ...@@ -3616,6 +3616,13 @@ static inline bool __netif_subqueue_stopped(const struct net_device *dev,
return netif_tx_queue_stopped(txq); return netif_tx_queue_stopped(txq);
} }
/**
* netif_subqueue_stopped - test status of subqueue
* @dev: network device
* @skb: sub queue buffer pointer
*
* Check individual transmit queue of a device with multiple transmit queues.
*/
static inline bool netif_subqueue_stopped(const struct net_device *dev, static inline bool netif_subqueue_stopped(const struct net_device *dev,
struct sk_buff *skb) struct sk_buff *skb)
{ {
......
...@@ -709,7 +709,7 @@ int zerocopy_sg_from_iter(struct sk_buff *skb, struct iov_iter *from) ...@@ -709,7 +709,7 @@ int zerocopy_sg_from_iter(struct sk_buff *skb, struct iov_iter *from)
EXPORT_SYMBOL(zerocopy_sg_from_iter); EXPORT_SYMBOL(zerocopy_sg_from_iter);
/** /**
* skb_copy_and_csum_datagram_iter - Copy datagram to an iovec iterator * skb_copy_and_csum_datagram - Copy datagram to an iovec iterator
* and update a checksum. * and update a checksum.
* @skb: buffer to copy * @skb: buffer to copy
* @offset: offset in the buffer to start copying from * @offset: offset in the buffer to start copying from
......
...@@ -6919,7 +6919,7 @@ bool netdev_has_upper_dev(struct net_device *dev, ...@@ -6919,7 +6919,7 @@ bool netdev_has_upper_dev(struct net_device *dev,
EXPORT_SYMBOL(netdev_has_upper_dev); EXPORT_SYMBOL(netdev_has_upper_dev);
/** /**
* netdev_has_upper_dev_all - Check if device is linked to an upper device * netdev_has_upper_dev_all_rcu - Check if device is linked to an upper device
* @dev: device * @dev: device
* @upper_dev: upper device to check * @upper_dev: upper device to check
* *
...@@ -8157,7 +8157,7 @@ EXPORT_SYMBOL(netdev_lower_dev_get_private); ...@@ -8157,7 +8157,7 @@ EXPORT_SYMBOL(netdev_lower_dev_get_private);
/** /**
* netdev_lower_change - Dispatch event about lower device state change * netdev_lower_state_changed - Dispatch event about lower device state change
* @lower_dev: device * @lower_dev: device
* @lower_state_info: state to dispatch * @lower_state_info: state to dispatch
* *
......
...@@ -842,7 +842,7 @@ EXPORT_SYMBOL(consume_skb); ...@@ -842,7 +842,7 @@ EXPORT_SYMBOL(consume_skb);
#endif #endif
/** /**
* consume_stateless_skb - free an skbuff, assuming it is stateless * __consume_stateless_skb - free an skbuff, assuming it is stateless
* @skb: buffer to free * @skb: buffer to free
* *
* Alike consume_skb(), but this variant assumes that this is the last * Alike consume_skb(), but this variant assumes that this is the last
......
...@@ -272,7 +272,7 @@ void eth_header_cache_update(struct hh_cache *hh, ...@@ -272,7 +272,7 @@ void eth_header_cache_update(struct hh_cache *hh,
EXPORT_SYMBOL(eth_header_cache_update); EXPORT_SYMBOL(eth_header_cache_update);
/** /**
* eth_header_parser_protocol - extract protocol from L2 header * eth_header_parse_protocol - extract protocol from L2 header
* @skb: packet to extract protocol from * @skb: packet to extract protocol from
*/ */
__be16 eth_header_parse_protocol(const struct sk_buff *skb) __be16 eth_header_parse_protocol(const struct sk_buff *skb)
...@@ -523,8 +523,8 @@ int eth_platform_get_mac_address(struct device *dev, u8 *mac_addr) ...@@ -523,8 +523,8 @@ int eth_platform_get_mac_address(struct device *dev, u8 *mac_addr)
EXPORT_SYMBOL(eth_platform_get_mac_address); EXPORT_SYMBOL(eth_platform_get_mac_address);
/** /**
* Obtain the MAC address from an nvmem cell named 'mac-address' associated * nvmem_get_mac_address - Obtain the MAC address from an nvmem cell named
* with given device. * 'mac-address' associated with given device.
* *
* @dev: Device with which the mac-address cell is associated. * @dev: Device with which the mac-address cell is associated.
* @addrbuf: Buffer to which the MAC address will be copied on success. * @addrbuf: Buffer to which the MAC address will be copied on success.
......
...@@ -781,7 +781,8 @@ static int rpc_rmdir_depopulate(struct dentry *dentry, ...@@ -781,7 +781,8 @@ static int rpc_rmdir_depopulate(struct dentry *dentry,
} }
/** /**
* rpc_mkpipe - make an rpc_pipefs file for kernel<->userspace communication * rpc_mkpipe_dentry - make an rpc_pipefs file for kernel<->userspace
* communication
* @parent: dentry of directory to create new "pipe" in * @parent: dentry of directory to create new "pipe" in
* @name: name of pipe * @name: name of pipe
* @private: private data to associate with the pipe, for the caller's use * @private: private data to associate with the pipe, for the caller's use
......
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