tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

scsi: target: Use kstrtobool() instead of strtobool()

strtobool() is the same as kstrtobool(). However, the latter is more used
within the kernel.

In order to remove strtobool() and slightly simplify kstrtox.h, switch to
the other function name.

While at it, include the corresponding header file (<linux/kstrtox.h>)

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/fcddc0a53b4fc6e3c2e93592d3f61c5c63121855.1667336095.git.christophe.jaillet@wanadoo.fr
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

authored by

Christophe JAILLET and committed by
Martin K. Petersen e56ca6bc bc811318

+17 -15
+15 -14
drivers/target/target_core_configfs.c
··· 12 12 * 13 13 ****************************************************************************/ 14 14 15 + #include <linux/kstrtox.h> 15 16 #include <linux/module.h> 16 17 #include <linux/moduleparam.h> 17 18 #include <generated/utsrelease.h> ··· 579 578 bool flag; \ 580 579 int ret; \ 581 580 \ 582 - ret = strtobool(page, &flag); \ 581 + ret = kstrtobool(page, &flag); \ 583 582 if (ret < 0) \ 584 583 return ret; \ 585 584 da->_name = flag; \ ··· 639 638 return -EINVAL; 640 639 } 641 640 642 - ret = strtobool(page, &flag); 641 + ret = kstrtobool(page, &flag); 643 642 if (ret < 0) 644 643 return ret; 645 644 ··· 661 660 bool flag; 662 661 int ret; 663 662 664 - ret = strtobool(page, &flag); 663 + ret = kstrtobool(page, &flag); 665 664 if (ret < 0) 666 665 return ret; 667 666 ··· 713 712 bool flag; 714 713 int ret; 715 714 716 - ret = strtobool(page, &flag); 715 + ret = kstrtobool(page, &flag); 717 716 if (ret < 0) 718 717 return ret; 719 718 ··· 738 737 bool flag; 739 738 int ret; 740 739 741 - ret = strtobool(page, &flag); 740 + ret = kstrtobool(page, &flag); 742 741 if (ret < 0) 743 742 return ret; 744 743 ··· 768 767 bool flag; 769 768 int ret; 770 769 771 - ret = strtobool(page, &flag); 770 + ret = kstrtobool(page, &flag); 772 771 if (ret < 0) 773 772 return ret; 774 773 ··· 867 866 bool flag; 868 867 int ret; 869 868 870 - ret = strtobool(page, &flag); 869 + ret = kstrtobool(page, &flag); 871 870 if (ret < 0) 872 871 return ret; 873 872 ··· 904 903 bool flag; 905 904 int ret; 906 905 907 - ret = strtobool(page, &flag); 906 + ret = kstrtobool(page, &flag); 908 907 if (ret < 0) 909 908 return ret; 910 909 ··· 933 932 bool flag; 934 933 int ret; 935 934 936 - ret = strtobool(page, &flag); 935 + ret = kstrtobool(page, &flag); 937 936 if (ret < 0) 938 937 return ret; 939 938 if (da->da_dev->export_count) { ··· 955 954 bool flag; 956 955 int ret; 957 956 958 - ret = strtobool(page, &flag); 957 + ret = kstrtobool(page, &flag); 959 958 if (ret < 0) 960 959 return ret; 961 960 ··· 978 977 bool flag; 979 978 int ret; 980 979 981 - ret = strtobool(page, &flag); 980 + ret = kstrtobool(page, &flag); 982 981 if (ret < 0) 983 982 return ret; 984 983 ··· 1127 1126 bool flag, oldflag; 1128 1127 int ret; 1129 1128 1130 - ret = strtobool(page, &flag); 1129 + ret = kstrtobool(page, &flag); 1131 1130 if (ret < 0) 1132 1131 return ret; 1133 1132 ··· 1166 1165 bool flag, oldflag; 1167 1166 int ret; 1168 1167 1169 - ret = strtobool(page, &flag); 1168 + ret = kstrtobool(page, &flag); 1170 1169 if (ret < 0) 1171 1170 return ret; 1172 1171 ··· 1195 1194 bool flag; 1196 1195 int ret; 1197 1196 1198 - ret = strtobool(page, &flag); 1197 + ret = kstrtobool(page, &flag); 1199 1198 if (ret < 0) 1200 1199 return ret; 1201 1200
+2 -1
drivers/target/target_core_fabric_configfs.c
··· 11 11 * 12 12 ****************************************************************************/ 13 13 14 + #include <linux/kstrtox.h> 14 15 #include <linux/module.h> 15 16 #include <linux/moduleparam.h> 16 17 #include <linux/utsname.h> ··· 830 829 int ret; 831 830 bool op; 832 831 833 - ret = strtobool(page, &op); 832 + ret = kstrtobool(page, &op); 834 833 if (ret) 835 834 return ret; 836 835