| Message ID | 20210517050141.61488-6-shenyang39@huawei.com |
|---|---|
| State | New |
| Headers | show |
| Series | [01/11] net: ath: ath5k: Fix wrong function name in comments | expand |
Yang Shen <shenyang39@huawei.com> wrote: > Fixes the following W=1 kernel build warning(s): > > drivers/net/wireless/intel/ipw2x00/ipw2100.c:5359: warning: This comment starts with '/**', but isn't a kernel-doc comment. Refer Documentation/doc-guide/kernel-doc.rst > drivers/net/wireless/intel/ipw2x00/ipw2100.c:6533: warning: This comment starts with '/**', but isn't a kernel-doc comment. Refer Documentation/doc-guide/kernel-doc.rst > drivers/net/wireless/intel/ipw2x00/ipw2100.c:6565: warning: This comment starts with '/**', but isn't a kernel-doc comment. Refer Documentation/doc-guide/kernel-doc.rst > > Cc: Stanislav Yakovlev <stas.yakovlev@gmail.com> > Signed-off-by: Yang Shen <shenyang39@huawei.com> Failed to apply, please rebase: Recorded preimage for 'drivers/net/wireless/intel/ipw2x00/ipw2100.c' error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Applying: ipw2x00: Fix wrong function name in comments Using index info to reconstruct a base tree... M drivers/net/wireless/intel/ipw2x00/ipw2100.c Falling back to patching base and 3-way merge... Auto-merging drivers/net/wireless/intel/ipw2x00/ipw2100.c CONFLICT (content): Merge conflict in drivers/net/wireless/intel/ipw2x00/ipw2100.c Patch failed at 0001 ipw2x00: Fix wrong function name in comments Patch set to Changes Requested. -- https://patchwork.kernel.org/project/linux-wireless/patch/20210517050141.61488-6-shenyang39@huawei.com/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Got it, I'll rebase on the latest branch. On 2021/6/15 21:12, Kalle Valo wrote: > Yang Shen <shenyang39@huawei.com> wrote: > >> Fixes the following W=1 kernel build warning(s): >> >> drivers/net/wireless/intel/ipw2x00/ipw2100.c:5359: warning: This comment starts with '/**', but isn't a kernel-doc comment. Refer Documentation/doc-guide/kernel-doc.rst >> drivers/net/wireless/intel/ipw2x00/ipw2100.c:6533: warning: This comment starts with '/**', but isn't a kernel-doc comment. Refer Documentation/doc-guide/kernel-doc.rst >> drivers/net/wireless/intel/ipw2x00/ipw2100.c:6565: warning: This comment starts with '/**', but isn't a kernel-doc comment. Refer Documentation/doc-guide/kernel-doc.rst >> >> Cc: Stanislav Yakovlev <stas.yakovlev@gmail.com> >> Signed-off-by: Yang Shen <shenyang39@huawei.com> > > Failed to apply, please rebase: > > Recorded preimage for 'drivers/net/wireless/intel/ipw2x00/ipw2100.c' > error: Failed to merge in the changes. > hint: Use 'git am --show-current-patch' to see the failed patch > Applying: ipw2x00: Fix wrong function name in comments > Using index info to reconstruct a base tree... > M drivers/net/wireless/intel/ipw2x00/ipw2100.c > Falling back to patching base and 3-way merge... > Auto-merging drivers/net/wireless/intel/ipw2x00/ipw2100.c > CONFLICT (content): Merge conflict in drivers/net/wireless/intel/ipw2x00/ipw2100.c > Patch failed at 0001 ipw2x00: Fix wrong function name in comments > > Patch set to Changes Requested. >
diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2100.c b/drivers/net/wireless/intel/ipw2x00/ipw2100.c index 23fbddd0c1f8..a1c7b04930f5 100644 --- a/drivers/net/wireless/intel/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/intel/ipw2x00/ipw2100.c @@ -5356,7 +5356,7 @@ struct ipw2100_wep_key { #define WEP_STR_128(x) x[0],x[1],x[2],x[3],x[4],x[5],x[6],x[7],x[8],x[9],x[10] /** - * Set a the wep key + * ipw2100_set_key - Set a the wep key * * @priv: struct to work on * @idx: index of the key we want to set @@ -6530,7 +6530,7 @@ static struct pci_driver ipw2100_pci_driver = { }; /** - * Initialize the ipw2100 driver/module + * ipw2100_init - Initialize the ipw2100 driver/module * * @returns 0 if ok, < 0 errno node con error. * @@ -6562,7 +6562,7 @@ static int __init ipw2100_init(void) } /** - * Cleanup ipw2100 driver registration + * ipw2100_exit - Cleanup ipw2100 driver registration */ static void __exit ipw2100_exit(void) { @@ -7197,7 +7197,7 @@ static int ipw2100_wx_set_txpow(struct net_device *dev, { struct ipw2100_priv *priv = libipw_priv(dev); int err = 0, value; - + if (ipw_radio_kill_sw(priv, wrqu->txpower.disabled)) return -EINPROGRESS;
Fixes the following W=1 kernel build warning(s): drivers/net/wireless/intel/ipw2x00/ipw2100.c:5359: warning: This comment starts with '/**', but isn't a kernel-doc comment. Refer Documentation/doc-guide/kernel-doc.rst drivers/net/wireless/intel/ipw2x00/ipw2100.c:6533: warning: This comment starts with '/**', but isn't a kernel-doc comment. Refer Documentation/doc-guide/kernel-doc.rst drivers/net/wireless/intel/ipw2x00/ipw2100.c:6565: warning: This comment starts with '/**', but isn't a kernel-doc comment. Refer Documentation/doc-guide/kernel-doc.rst Cc: Stanislav Yakovlev <stas.yakovlev@gmail.com> Signed-off-by: Yang Shen <shenyang39@huawei.com> --- drivers/net/wireless/intel/ipw2x00/ipw2100.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)