From: Francis Laniel <laniel_francis@xxxxxxxxxxxxxxxxxxx> The two functions indicates if a string begins with a given prefix. The only difference is that strstarts() returns a bool while str_has_prefix() returns the length of the prefix if the string begins with it or 0 otherwise. Signed-off-by: Francis Laniel <laniel_francis@xxxxxxxxxxxxxxxxxxx> --- drivers/usb/musb/musb_cppi41.c | 4 ++-- drivers/usb/musb/musb_debugfs.c | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/usb/musb/musb_cppi41.c b/drivers/usb/musb/musb_cppi41.c index 7fbb8a307145..a6d22c0957c5 100644 --- a/drivers/usb/musb/musb_cppi41.c +++ b/drivers/usb/musb/musb_cppi41.c @@ -686,9 +686,9 @@ static int cppi41_dma_controller_start(struct cppi41_dma_controller *controller) ret = of_property_read_string_index(np, "dma-names", i, &str); if (ret) goto err; - if (strstarts(str, "tx")) + if (str_has_prefix(str, "tx")) is_tx = 1; - else if (strstarts(str, "rx")) + else if (str_has_prefix(str, "rx")) is_tx = 0; else { dev_err(dev, "Wrong dmatype %s\n", str); diff --git a/drivers/usb/musb/musb_debugfs.c b/drivers/usb/musb/musb_debugfs.c index 30a89aa8a3e7..47fc32bc6507 100644 --- a/drivers/usb/musb/musb_debugfs.c +++ b/drivers/usb/musb/musb_debugfs.c @@ -181,36 +181,36 @@ static ssize_t musb_test_mode_write(struct file *file, goto ret; } - if (strstarts(buf, "force host full-speed")) + if (str_has_prefix(buf, "force host full-speed")) test = MUSB_TEST_FORCE_HOST | MUSB_TEST_FORCE_FS; - else if (strstarts(buf, "force host high-speed")) + else if (str_has_prefix(buf, "force host high-speed")) test = MUSB_TEST_FORCE_HOST | MUSB_TEST_FORCE_HS; - else if (strstarts(buf, "force host")) + else if (str_has_prefix(buf, "force host")) test = MUSB_TEST_FORCE_HOST; - else if (strstarts(buf, "fifo access")) + else if (str_has_prefix(buf, "fifo access")) test = MUSB_TEST_FIFO_ACCESS; - else if (strstarts(buf, "force full-speed")) + else if (str_has_prefix(buf, "force full-speed")) test = MUSB_TEST_FORCE_FS; - else if (strstarts(buf, "force high-speed")) + else if (str_has_prefix(buf, "force high-speed")) test = MUSB_TEST_FORCE_HS; - else if (strstarts(buf, "test packet")) { + else if (str_has_prefix(buf, "test packet")) { test = MUSB_TEST_PACKET; musb_load_testpacket(musb); } - else if (strstarts(buf, "test K")) + else if (str_has_prefix(buf, "test K")) test = MUSB_TEST_K; - else if (strstarts(buf, "test J")) + else if (str_has_prefix(buf, "test J")) test = MUSB_TEST_J; - else if (strstarts(buf, "test SE0 NAK")) + else if (str_has_prefix(buf, "test SE0 NAK")) test = MUSB_TEST_SE0_NAK; musb_writeb(musb->mregs, MUSB_TESTMODE, test); -- 2.20.1