diff options
author | Tobias Klauser <tklauser@distanz.ch> | 2010-12-09 09:51:32 -0500 |
---|---|---|
committer | David Brown <davidb@codeaurora.org> | 2010-12-09 16:38:45 -0500 |
commit | dc6bbc991b0c408daad5df43e5851f1d369e50f7 (patch) | |
tree | d1fa1bbd64be91510bb34a99de4f252283e9ab7c /drivers/serial/msm_serial.c | |
parent | 33069739d1c2f03734d5b5b003593e9552d412c1 (diff) |
msm_serial: Remove redundant unlikely()
IS_ERR() already implies unlikely(), so it can be omitted here.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: David Brown <davidb@codeaurora.org>
Diffstat (limited to 'drivers/serial/msm_serial.c')
-rw-r--r-- | 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 f8c816e7725d..8e43a7b69e64 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) | |||
686 | msm_port = UART_TO_MSM(port); | 686 | msm_port = UART_TO_MSM(port); |
687 | 687 | ||
688 | msm_port->clk = clk_get(&pdev->dev, "uart_clk"); | 688 | msm_port->clk = clk_get(&pdev->dev, "uart_clk"); |
689 | if (unlikely(IS_ERR(msm_port->clk))) | 689 | if (IS_ERR(msm_port->clk)) |
690 | return PTR_ERR(msm_port->clk); | 690 | return PTR_ERR(msm_port->clk); |
691 | port->uartclk = clk_get_rate(msm_port->clk); | 691 | port->uartclk = clk_get_rate(msm_port->clk); |
692 | printk(KERN_INFO "uartclk = %d\n", port->uartclk); | 692 | printk(KERN_INFO "uartclk = %d\n", port->uartclk); |