Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70c95b00 authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds
Browse files

scripts/kernel-doc: fix fatal error caused by cfg80211.h 



include/net/cfg80211.h uses __must_check in functions that
have kernel-doc notation.  This was confusing scripts/kernel-doc,
so have scripts/kernel-doc ignore "__must_check".

Error(include/net/cfg80211.h:2702): cannot understand prototype: 'struct cfg80211_bss * __must_check cfg80211_inform_bss(...)

Signed-off-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
Cc:	Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dcd6c922

scripts/kernel-doc

+2 −1
Original line number Original line Diff line number Diff line
@@ -5,7 +5,7 @@ use strict; 
## Copyright (c) 1998 Michael Zucchi, All Rights Reserved        ##

## Copyright (c) 1998 Michael Zucchi, All Rights Reserved        ##

## Copyright (C) 2000, 1  Tim Waugh <twaugh@redhat.com>          ##

## Copyright (C) 2000, 1  Tim Waugh <twaugh@redhat.com>          ##

## Copyright (C) 2001  Simon Huggins                             ##

## Copyright (C) 2001  Simon Huggins                             ##

## Copyright (C) 2005-2010  Randy Dunlap                         ##

## Copyright (C) 2005-2012  Randy Dunlap                         ##

## 								 ##

## 								 ##

## #define enhancements by Armin Kuster <akuster@mvista.com>	 ##

## #define enhancements by Armin Kuster <akuster@mvista.com>	 ##

## Copyright (c) 2000 MontaVista Software, Inc.			 ##

## Copyright (c) 2000 MontaVista Software, Inc.			 ##
@@ -1785,6 +1785,7 @@ sub dump_function($$) { 
    $prototype =~ s/__devinit +//;

    $prototype =~ s/__devinit +//;

    $prototype =~ s/__init +//;

    $prototype =~ s/__init +//;

    $prototype =~ s/__init_or_module +//;

    $prototype =~ s/__init_or_module +//;

    $prototype =~ s/__must_check +//;

    $prototype =~ s/^#\s*define\s+//; #ak added

    $prototype =~ s/^#\s*define\s+//; #ak added

    $prototype =~ s/__attribute__\s*\(\([a-z,]*\)\)//;

    $prototype =~ s/__attribute__\s*\(\([a-z,]*\)\)//;