| Message ID | 1581567368-8055-2-git-send-email-yangtiezhu@loongson.cn (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 1f3c36328a487059beebd1f7be042e3b7abf7d34 |
| Headers | show |
| Series | [1/4] spi: spidev_test: Remove break after exit statement | expand |
Hi Tiezhu, On Thu, Feb 13, 2020 at 5:17 AM Tiezhu Yang <yangtiezhu@loongson.cn> wrote: > It is better to check input_tx and input_file first after parse options. > Otherwise, it will do some useless operations when both -p and --input > are selected. > > Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn> Thanks for your patch! Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- a/tools/spi/spidev_test.c > +++ b/tools/spi/spidev_test.c > @@ -404,6 +404,9 @@ int main(int argc, char *argv[]) > > parse_opts(argc, argv); > > + if (input_tx && input_file) > + pabort("only one of -p and --input may be selected"); > + Alternatively, this check could be moved to the end of parse_opts(). > fd = open(device, O_RDWR); > if (fd < 0) > pabort("can't open device"); Gr{oetje,eeting}s, Geert
diff --git a/tools/spi/spidev_test.c b/tools/spi/spidev_test.c index 113b1e1..5866178 100644 --- a/tools/spi/spidev_test.c +++ b/tools/spi/spidev_test.c @@ -404,6 +404,9 @@ int main(int argc, char *argv[]) parse_opts(argc, argv); + if (input_tx && input_file) + pabort("only one of -p and --input may be selected"); + fd = open(device, O_RDWR); if (fd < 0) pabort("can't open device"); @@ -445,9 +448,6 @@ int main(int argc, char *argv[]) printf("bits per word: %d\n", bits); printf("max speed: %d Hz (%d KHz)\n", speed, speed/1000); - if (input_tx && input_file) - pabort("only one of -p and --input may be selected"); - if (input_tx) transfer_escaped_string(fd, input_tx); else if (input_file)
It is better to check input_tx and input_file first after parse options. Otherwise, it will do some useless operations when both -p and --input are selected. Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn> --- tools/spi/spidev_test.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)