|
@@ -35,6 +35,7 @@
|
|
|
#include <linux/clk.h>
|
|
|
#include <linux/platform_device.h>
|
|
|
#include <linux/of.h>
|
|
|
+#include <linux/err.h>
|
|
|
|
|
|
/*
|
|
|
* UART Register offsets
|
|
@@ -585,9 +586,9 @@ static int vt8500_serial_probe(struct platform_device *pdev)
|
|
|
if (!vt8500_port)
|
|
|
return -ENOMEM;
|
|
|
|
|
|
- vt8500_port->uart.membase = devm_request_and_ioremap(&pdev->dev, mmres);
|
|
|
- if (!vt8500_port->uart.membase)
|
|
|
- return -EADDRNOTAVAIL;
|
|
|
+ vt8500_port->uart.membase = devm_ioremap_resource(&pdev->dev, mmres);
|
|
|
+ if (IS_ERR(vt8500_port->uart.membase))
|
|
|
+ return PTR_ERR(vt8500_port->uart.membase);
|
|
|
|
|
|
vt8500_port->clk = of_clk_get(pdev->dev.of_node, 0);
|
|
|
if (IS_ERR(vt8500_port->clk)) {
|