tracing: Remove unnecessary "goto out" that simply returns ret is trigger code

+17 -27

1 changed file

expand all

kernel

trace

+17 -27

kernel/trace/trace_events_trigger.c

··· 552 552 lockdep_assert_held(&event_mutex); 553 553 554 554 list_for_each_entry(test, &file->triggers, list) { 555 - if (test->cmd_ops->trigger_type == data->cmd_ops->trigger_type) { 556 - ret = -EEXIST; 557 - goto out; 558 - } 555 + if (test->cmd_ops->trigger_type == data->cmd_ops->trigger_type) 556 + return -EEXIST; 559 557 } 560 558 561 559 if (data->ops->init) { 562 560 ret = data->ops->init(data); 563 561 if (ret < 0) 564 - goto out; 562 + return ret; 565 563 } 566 564 567 565 list_add_rcu(&data->list, &file->triggers); ··· 570 572 list_del_rcu(&data->list); 571 573 update_cond_flag(file); 572 574 } 573 - out: 574 575 return ret; 575 576 } 576 577 ··· 767 770 if (!param_and_filter) { 768 771 if (param_required) 769 772 ret = -EINVAL; 770 - goto out; 773 + return ret; 771 774 } 772 775 773 776 /* ··· 778 781 */ 779 782 if (!param_required && param_and_filter && !isdigit(param_and_filter[0])) { 780 783 *filter = param_and_filter; 781 - goto out; 784 + return ret; 782 785 } 783 786 784 787 /* ··· 796 799 if (!**filter) 797 800 *filter = NULL; 798 801 } 799 - out: 800 802 return ret; 801 803 } 802 804 ··· 987 991 ret = -ENOMEM; 988 992 trigger_data = trigger_data_alloc(cmd_ops, cmd, param, file); 989 993 if (!trigger_data) 990 - goto out; 994 + return ret; 991 995 992 996 if (remove) { 993 997 event_trigger_unregister(cmd_ops, file, glob+1, trigger_data); 994 998 trigger_data_free(trigger_data); 995 - ret = 0; 996 - goto out; 999 + return 0; 997 1000 } 998 1001 999 1002 ret = event_trigger_parse_num(param, trigger_data); ··· 1012 1017 1013 1018 /* Down the counter of trigger_data or free it if not used anymore */ 1014 1019 event_trigger_free(trigger_data); 1015 - out: 1016 1020 return ret; 1017 1021 1018 1022 out_free: 1019 1023 event_trigger_reset_filter(cmd_ops, trigger_data); 1020 1024 trigger_data_free(trigger_data); 1021 - goto out; 1025 + return ret; 1022 1026 } 1023 1027 1024 1028 /** ··· 1051 1057 s = strsep(&filter_str, " \t"); 1052 1058 1053 1059 if (!strlen(s) || strcmp(s, "if") != 0) 1054 - goto out; 1060 + return ret; 1055 1061 1056 1062 if (!filter_str) 1057 - goto out; 1063 + return ret; 1058 1064 1059 1065 /* The filter is for the 'trigger' event, not the triggered event */ 1060 1066 ret = create_event_filter(file->tr, file->event_call, ··· 1098 1104 ret = -ENOMEM; 1099 1105 } 1100 1106 } 1101 - out: 1102 1107 return ret; 1103 1108 } 1104 1109 ··· 1765 1772 ret = -EINVAL; 1766 1773 event_enable_file = find_event_file(tr, system, event); 1767 1774 if (!event_enable_file) 1768 - goto out; 1775 + return ret; 1769 1776 1770 1777 #ifdef CONFIG_HIST_TRIGGERS 1771 1778 hist = ((strcmp(cmd, ENABLE_HIST_STR) == 0) || ··· 1780 1787 1781 1788 enable_data = kzalloc(sizeof(*enable_data), GFP_KERNEL); 1782 1789 if (!enable_data) 1783 - goto out; 1790 + return ret; 1784 1791 1785 1792 enable_data->hist = hist; 1786 1793 enable_data->enable = enable; ··· 1789 1796 trigger_data = trigger_data_alloc(cmd_ops, cmd, param, enable_data); 1790 1797 if (!trigger_data) { 1791 1798 kfree(enable_data); 1792 - goto out; 1799 + return ret; 1793 1800 } 1794 1801 1795 1802 if (remove) { ··· 1797 1804 kfree(trigger_data); 1798 1805 kfree(enable_data); 1799 1806 ret = 0; 1800 - goto out; 1807 + return ret; 1801 1808 } 1802 1809 1803 1810 /* Up the trigger_data count to make sure nothing frees it on failure */ ··· 1827 1834 goto out_disable; 1828 1835 1829 1836 event_trigger_free(trigger_data); 1830 - out: 1831 1837 return ret; 1832 1838 out_disable: 1833 1839 trace_event_enable_disable(event_enable_file, 0, 1); ··· 1837 1845 event_trigger_free(trigger_data); 1838 1846 kfree(enable_data); 1839 1847 1840 - goto out; 1848 + return ret; 1841 1849 } 1842 1850 1843 1851 int event_enable_register_trigger(char *glob, ··· 1857 1865 (test->cmd_ops->trigger_type == 1858 1866 data->cmd_ops->trigger_type) && 1859 1867 (test_enable_data->file == enable_data->file)) { 1860 - ret = -EEXIST; 1861 - goto out; 1868 + return -EEXIST; 1862 1869 } 1863 1870 } 1864 1871 1865 1872 if (data->ops->init) { 1866 1873 ret = data->ops->init(data); 1867 1874 if (ret < 0) 1868 - goto out; 1875 + return ret; 1869 1876 } 1870 1877 1871 1878 list_add_rcu(&data->list, &file->triggers); ··· 1875 1884 list_del_rcu(&data->list); 1876 1885 update_cond_flag(file); 1877 1886 } 1878 - out: 1879 1887 return ret; 1880 1888 } 1881 1889

Configure Feed

Configure Feed