On Thu, Dec 09, 2010 at 03:51:32PM +0100, Tobias Klauser wrote: > IS_ERR() already implies unlikely(), so it can be omitted here. > > Signed-off-by: Tobias Klauser <tklauser@xxxxxxxxxx> Acked-by: David Brown <davidb@xxxxxxxxxxxxxx> > drivers/serial/msm_serial.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/serial/msm_serial.c b/drivers/serial/msm_serial.c > index f8c816e..8e43a7b 100644 > --- a/drivers/serial/msm_serial.c > +++ b/drivers/serial/msm_serial.c > @@ -686,7 +686,7 @@ static int __init msm_serial_probe(struct platform_device *pdev) > msm_port = UART_TO_MSM(port); > > msm_port->clk = clk_get(&pdev->dev, "uart_clk"); > - if (unlikely(IS_ERR(msm_port->clk))) > + if (IS_ERR(msm_port->clk)) > return PTR_ERR(msm_port->clk); > port->uartclk = clk_get_rate(msm_port->clk); > printk(KERN_INFO "uartclk = %d\n", port->uartclk); > -- > 1.7.0.4 > -- Sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum. -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
