drivers/net/can/pch_can.c ae64438be192 ("can: dev: fix skb drop check") 1dd1b521be85 ("can: remove obsolete PCH CAN driver") https://lore.kernel.org/all/20221110102509.1f7d63cc@canb.auug.org.au/
Showing the changes to scripts (2 of 385 files). Show all
Unified · Split
| @@ -122,7 +122,7 @@ quiet_cmd_modpost = MODPOST $@ · 121 unmodified lines | |||
| 122 | sed 's/ko$$/o/' $(or $(modorder-if-needed), /dev/null) | $(MODPOST) $(modpost-args) -T - $(vmlinux.o-if-present) | 122 | sed 's/ko$$/o/' $(or $(modorder-if-needed), /dev/null) | $(MODPOST) $(modpost-args) -T - $(vmlinux.o-if-present) |
| 123 | 123 | ||
| 124 | targets += $(output-symdump) | 124 | targets += $(output-symdump) |
| 125 | $(output-symdump): $(modorder-if-needed) $(vmlinux.o-if-present) $(moudle.symvers-if-present) $(MODPOST) FORCE | 125 | $(output-symdump): $(modorder-if-needed) $(vmlinux.o-if-present) $(module.symvers-if-present) $(MODPOST) FORCE |
| 126 | $(call if_changed,modpost) | 126 | $(call if_changed,modpost) |
| 127 | 127 | ||
| 128 | __modpost: $(output-symdump) | 128 | __modpost: $(output-symdump) |
| @@ -722,8 +722,8 @@ static void get_prompt_str(struct gstr *r, struct property *prop, · 721 unmodified lines | |||
| 722 | if (!expr_eq(prop->menu->dep, prop->visible.expr)) | 722 | if (!expr_eq(prop->menu->dep, prop->visible.expr)) |
| 723 | get_dep_str(r, prop->visible.expr, " Visible if: "); | 723 | get_dep_str(r, prop->visible.expr, " Visible if: "); |
| 724 | 724 | ||
| 725 | menu = prop->menu->parent; | 725 | menu = prop->menu; |
| 726 | for (i = 0; menu && i < 8; menu = menu->parent) { | 726 | for (i = 0; menu != &rootmenu && i < 8; menu = menu->parent) { |
| 727 | bool accessible = menu_is_visible(menu); | 727 | bool accessible = menu_is_visible(menu); |
| 728 | 728 | ||
| 729 | submenu[i++] = menu; | 729 | submenu[i++] = menu; |
| @@ -733,16 +733,7 @@ static void get_prompt_str(struct gstr *r, struct property *prop, · 3 unmodified lines | |||
| 733 | if (head && location) { | 733 | if (head && location) { |
| 734 | jump = xmalloc(sizeof(struct jump_key)); | 734 | jump = xmalloc(sizeof(struct jump_key)); |
| 735 | 735 | ||
| 736 | if (menu_is_visible(prop->menu)) { | 736 | jump->target = location; |
| 737 | /* | ||
| 738 | * There is not enough room to put the hint at the | ||
| 739 | * beginning of the "Prompt" line. Put the hint on the | ||
| 740 | * last "Location" line even when it would belong on | ||
| 741 | * the former. | ||
| 742 | */ | ||
| 743 | jump->target = prop->menu; | ||
| 744 | } else | ||
| 745 | jump->target = location; | ||
| 746 | 737 | ||
| 747 | if (list_empty(head)) | 738 | if (list_empty(head)) |
| 748 | jump->index = 0; | 739 | jump->index = 0; |
| @@ -758,13 +749,7 @@ static void get_prompt_str(struct gstr *r, struct property *prop, · 9 unmodified lines | |||
| 758 | menu = submenu[i]; | 749 | menu = submenu[i]; |
| 759 | if (jump && menu == location) | 750 | if (jump && menu == location) |
| 760 | jump->offset = strlen(r->s); | 751 | jump->offset = strlen(r->s); |
| 761 | 752 | str_printf(r, "%*c-> %s", j, ' ', menu_get_prompt(menu)); | |
| 762 | if (menu == &rootmenu) | ||
| 763 | /* The real rootmenu prompt is ugly */ | ||
| 764 | str_printf(r, "%*cMain menu", j, ' '); | ||
| 765 | else | ||
| 766 | str_printf(r, "%*c-> %s", j, ' ', menu_get_prompt(menu)); | ||
| 767 | |||
| 768 | if (menu->sym) { | 753 | if (menu->sym) { |
| 769 | str_printf(r, " (%s [=%s])", menu->sym->name ? | 754 | str_printf(r, " (%s [=%s])", menu->sym->name ? |
| 770 | menu->sym->name : "<choice>", | 755 | menu->sym->name : "<choice>", |