lkml.org 
[lkml]   [2018]   [May]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 02/21] mfd: omap-usb-host: use match_string() helper
    Date
    match_string() returns the index of an array for a matching string,
    which can be used instead of open coded variant.

    Acked-by: Tony Lindgren <tony@atomide.com>
    Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
    Cc: Tony Lindgren <tony@atomide.com>
    Cc: Lee Jones <lee.jones@linaro.org>
    Cc: linux-omap@vger.kernel.org
    Signed-off-by: Yisheng Xie <xieyisheng1@huawei.com>
    ---
    v2:
    - add Acked-by and Reviewed-by tag.

    drivers/mfd/omap-usb-host.c | 24 ++----------------------
    1 file changed, 2 insertions(+), 22 deletions(-)

    diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
    index 7aab376..e11ab12 100644
    --- a/drivers/mfd/omap-usb-host.c
    +++ b/drivers/mfd/omap-usb-host.c
    @@ -153,27 +153,6 @@ static inline u32 usbhs_read(void __iomem *base, u32 reg)
    [OMAP_OHCI_PORT_MODE_TLL_2PIN_DPDM] = "ohci-tll-2pin-dpdm",
    };

    -/**
    - * omap_usbhs_get_dt_port_mode - Get the 'enum usbhs_omap_port_mode'
    - * from the port mode string.
    - * @mode: The port mode string, usually obtained from device tree.
    - *
    - * The function returns the 'enum usbhs_omap_port_mode' that matches the
    - * provided port mode string as per the port_modes table.
    - * If no match is found it returns -ENODEV
    - */
    -static int omap_usbhs_get_dt_port_mode(const char *mode)
    -{
    - int i;
    -
    - for (i = 0; i < ARRAY_SIZE(port_modes); i++) {
    - if (!strcmp(mode, port_modes[i]))
    - return i;
    - }
    -
    - return -ENODEV;
    -}
    -
    static struct platform_device *omap_usbhs_alloc_child(const char *name,
    struct resource *res, int num_resources, void *pdata,
    size_t pdata_size, struct device *dev)
    @@ -529,7 +508,8 @@ static int usbhs_omap_get_dt_pdata(struct device *dev,
    if (ret < 0)
    continue;

    - ret = omap_usbhs_get_dt_port_mode(mode);
    + /* get 'enum usbhs_omap_port_mode' from port mode string */
    + ret = match_string(port_modes, ARRAY_SIZE(port_modes), mode);
    if (ret < 0) {
    dev_warn(dev, "Invalid port%d-mode \"%s\" in device tree\n",
    i, mode);
    --
    1.7.12.4
    \
     
     \ /
      Last update: 2018-05-31 13:27    [W:4.086 / U:0.852 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site