Skip to content

Commit 32b2ee5

Browse files
torvaldstorvalds
committed
Merge tag 'kconfig-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kconfig updates from Masahiro Yamada: - remove '---help---' keyword support - fix mouse events for 'menuconfig' symbols in search view of qconf - code cleanups of qconf * tag 'kconfig-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (24 commits) kconfig: qconf: move setOptionMode() to ConfigList from ConfigView kconfig: qconf: do not limit the pop-up menu to the first row kconfig: qconf: refactor icon setups kconfig: qconf: remove unused voidPix, menuInvPix kconfig: qconf: remove ConfigItem::text/setText kconfig: qconf: remove ConfigList::addColumn/removeColumn kconfig: qconf: remove ConfigItem::pixmap/setPixmap kconfig: qconf: drop more localization code kconfig: qconf: remove 'parent' from ConfigList::updateMenuList() kconfig: qconf: remove unused argument from ConfigView::updateList() kconfig: qconf: remove unused argument from ConfigList::updateList() kconfig: qconf: omit parent to QHBoxLayout() kconfig: qconf: remove name from ConfigSearchWindow constructor kconfig: qconf: remove unused ConfigList::listView() kconfig: qconf: overload addToolBar() to create and insert toolbar kconfig: qconf: remove toolBar from ConfigMainWindow members kconfig: qconf: use 'menu' variable for (QMenu *) kconfig: qconf: do not use 'menu' variable for (QMenuBar *) kconfig: qconf: remove ->addSeparator() to menuBar kconfig: add 'static' to some file-local data ...
2 parents a1d2108 + d4bbe8a commit 32b2ee5

8 files changed

Lines changed: 218 additions & 243 deletions

File tree

‎scripts/checkkconfigsymbols.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
REGEX_KCONFIG_DEF = re.compile(DEF)
3535
REGEX_KCONFIG_EXPR = re.compile(EXPR)
3636
REGEX_KCONFIG_STMT = re.compile(STMT)
37-
REGEX_KCONFIG_HELP = re.compile(r"^\s+(help|---help---)\s*$")
37+
REGEX_KCONFIG_HELP = re.compile(r"^\s+help\s*$")
3838
REGEX_FILTER_SYMBOLS = re.compile(r"[A-Za-z0-9]$")
3939
REGEX_NUMERIC = re.compile(r"0[xX][0-9a-fA-F]+|[0-9]+")
4040
REGEX_QUOTES = re.compile("(\"(.*?)\")")

‎scripts/checkpatch.pl‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3045,11 +3045,7 @@ sub process {
30453045

30463046
if ($lines[$ln - 1] =~ /^\+\s*(?:bool|tristate|prompt)\s*["']/) {
30473047
$is_start = 1;
3048-
} elsif ($lines[$ln - 1] =~ /^\+\s*(?:help|---help---)\s*$/) {
3049-
if ($lines[$ln - 1] =~ "---help---") {
3050-
WARN("CONFIG_DESCRIPTION",
3051-
"prefer 'help' over '---help---' for new help texts\n" . $herecurr);
3052-
}
3048+
} elsif ($lines[$ln - 1] =~ /^\+\s*(?:---)?help(?:---)?$/) {
30533049
$length = -1;
30543050
}
30553051

‎scripts/kconfig/images.c‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#include "images.h"
77

8-
const char *xpm_load[] = {
8+
const char * const xpm_load[] = {
99
"22 22 5 1",
1010
". c None",
1111
"# c #000000",
@@ -35,7 +35,7 @@ const char *xpm_load[] = {
3535
"###############.......",
3636
"......................"};
3737

38-
const char *xpm_save[] = {
38+
const char * const xpm_save[] = {
3939
"22 22 5 1",
4040
". c None",
4141
"# c #000000",
@@ -65,7 +65,7 @@ const char *xpm_save[] = {
6565
"..##################..",
6666
"......................"};
6767

68-
const char *xpm_back[] = {
68+
const char * const xpm_back[] = {
6969
"22 22 3 1",
7070
". c None",
7171
"# c #000083",
@@ -93,7 +93,7 @@ const char *xpm_back[] = {
9393
"......................",
9494
"......................"};
9595

96-
const char *xpm_tree_view[] = {
96+
const char * const xpm_tree_view[] = {
9797
"22 22 2 1",
9898
". c None",
9999
"# c #000000",
@@ -120,7 +120,7 @@ const char *xpm_tree_view[] = {
120120
"......................",
121121
"......................"};
122122

123-
const char *xpm_single_view[] = {
123+
const char * const xpm_single_view[] = {
124124
"22 22 2 1",
125125
". c None",
126126
"# c #000000",
@@ -147,7 +147,7 @@ const char *xpm_single_view[] = {
147147
"......................",
148148
"......................"};
149149

150-
const char *xpm_split_view[] = {
150+
const char * const xpm_split_view[] = {
151151
"22 22 2 1",
152152
". c None",
153153
"# c #000000",
@@ -174,7 +174,7 @@ const char *xpm_split_view[] = {
174174
"......................",
175175
"......................"};
176176

177-
const char *xpm_symbol_no[] = {
177+
const char * const xpm_symbol_no[] = {
178178
"12 12 2 1",
179179
" c white",
180180
". c black",
@@ -191,7 +191,7 @@ const char *xpm_symbol_no[] = {
191191
" .......... ",
192192
" "};
193193

194-
const char *xpm_symbol_mod[] = {
194+
const char * const xpm_symbol_mod[] = {
195195
"12 12 2 1",
196196
" c white",
197197
". c black",
@@ -208,7 +208,7 @@ const char *xpm_symbol_mod[] = {
208208
" .......... ",
209209
" "};
210210

211-
const char *xpm_symbol_yes[] = {
211+
const char * const xpm_symbol_yes[] = {
212212
"12 12 2 1",
213213
" c white",
214214
". c black",
@@ -225,7 +225,7 @@ const char *xpm_symbol_yes[] = {
225225
" .......... ",
226226
" "};
227227

228-
const char *xpm_choice_no[] = {
228+
const char * const xpm_choice_no[] = {
229229
"12 12 2 1",
230230
" c white",
231231
". c black",
@@ -242,7 +242,7 @@ const char *xpm_choice_no[] = {
242242
" .... ",
243243
" "};
244244

245-
const char *xpm_choice_yes[] = {
245+
const char * const xpm_choice_yes[] = {
246246
"12 12 2 1",
247247
" c white",
248248
". c black",
@@ -259,7 +259,7 @@ const char *xpm_choice_yes[] = {
259259
" .... ",
260260
" "};
261261

262-
const char *xpm_menu[] = {
262+
const char * const xpm_menu[] = {
263263
"12 12 2 1",
264264
" c white",
265265
". c black",
@@ -276,7 +276,7 @@ const char *xpm_menu[] = {
276276
" .......... ",
277277
" "};
278278

279-
const char *xpm_menu_inv[] = {
279+
const char * const xpm_menu_inv[] = {
280280
"12 12 2 1",
281281
" c white",
282282
". c black",
@@ -293,7 +293,7 @@ const char *xpm_menu_inv[] = {
293293
" .......... ",
294294
" "};
295295

296-
const char *xpm_menuback[] = {
296+
const char * const xpm_menuback[] = {
297297
"12 12 2 1",
298298
" c white",
299299
". c black",
@@ -310,7 +310,7 @@ const char *xpm_menuback[] = {
310310
" .......... ",
311311
" "};
312312

313-
const char *xpm_void[] = {
313+
const char * const xpm_void[] = {
314314
"12 12 2 1",
315315
" c white",
316316
". c black",

‎scripts/kconfig/images.h‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,21 @@
1010
extern "C" {
1111
#endif
1212

13-
extern const char *xpm_load[];
14-
extern const char *xpm_save[];
15-
extern const char *xpm_back[];
16-
extern const char *xpm_tree_view[];
17-
extern const char *xpm_single_view[];
18-
extern const char *xpm_split_view[];
19-
extern const char *xpm_symbol_no[];
20-
extern const char *xpm_symbol_mod[];
21-
extern const char *xpm_symbol_yes[];
22-
extern const char *xpm_choice_no[];
23-
extern const char *xpm_choice_yes[];
24-
extern const char *xpm_menu[];
25-
extern const char *xpm_menu_inv[];
26-
extern const char *xpm_menuback[];
27-
extern const char *xpm_void[];
13+
extern const char * const xpm_load[];
14+
extern const char * const xpm_save[];
15+
extern const char * const xpm_back[];
16+
extern const char * const xpm_tree_view[];
17+
extern const char * const xpm_single_view[];
18+
extern const char * const xpm_split_view[];
19+
extern const char * const xpm_symbol_no[];
20+
extern const char * const xpm_symbol_mod[];
21+
extern const char * const xpm_symbol_yes[];
22+
extern const char * const xpm_choice_no[];
23+
extern const char * const xpm_choice_yes[];
24+
extern const char * const xpm_menu[];
25+
extern const char * const xpm_menu_inv[];
26+
extern const char * const xpm_menuback[];
27+
extern const char * const xpm_void[];
2828

2929
#ifdef __cplusplus
3030
}

‎scripts/kconfig/lexer.l‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ struct buffer {
3636
YY_BUFFER_STATE state;
3737
};
3838

39-
struct buffer *current_buf;
39+
static struct buffer *current_buf;
4040

4141
static int last_ts, first_ts;
4242

@@ -105,7 +105,7 @@ n [A-Za-z0-9_-]
105105
"endchoice" return T_ENDCHOICE;
106106
"endif" return T_ENDIF;
107107
"endmenu" return T_ENDMENU;
108-
"help"|"---help---" return T_HELP;
108+
"help" return T_HELP;
109109
"hex" return T_HEX;
110110
"if" return T_IF;
111111
"imply" return T_IMPLY;

0 commit comments

Comments
 (0)