diff options
Diffstat (limited to 'drivers/tty/serial/imx.c')
-rw-r--r-- | drivers/tty/serial/imx.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index 90655b875bab..a5f32c7c6c66 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c | |||
@@ -1222,7 +1222,7 @@ static int imx_startup(struct uart_port *port) | |||
1222 | 1222 | ||
1223 | if (USE_IRDA(sport)) { | 1223 | if (USE_IRDA(sport)) { |
1224 | struct imxuart_platform_data *pdata; | 1224 | struct imxuart_platform_data *pdata; |
1225 | pdata = sport->port.dev->platform_data; | 1225 | pdata = dev_get_platdata(sport->port.dev); |
1226 | sport->irda_inv_rx = pdata->irda_inv_rx; | 1226 | sport->irda_inv_rx = pdata->irda_inv_rx; |
1227 | sport->irda_inv_tx = pdata->irda_inv_tx; | 1227 | sport->irda_inv_tx = pdata->irda_inv_tx; |
1228 | sport->trcv_delay = pdata->transceiver_delay; | 1228 | sport->trcv_delay = pdata->transceiver_delay; |
@@ -1265,7 +1265,7 @@ static void imx_shutdown(struct uart_port *port) | |||
1265 | 1265 | ||
1266 | if (USE_IRDA(sport)) { | 1266 | if (USE_IRDA(sport)) { |
1267 | struct imxuart_platform_data *pdata; | 1267 | struct imxuart_platform_data *pdata; |
1268 | pdata = sport->port.dev->platform_data; | 1268 | pdata = dev_get_platdata(sport->port.dev); |
1269 | if (pdata->irda_enable) | 1269 | if (pdata->irda_enable) |
1270 | pdata->irda_enable(0); | 1270 | pdata->irda_enable(0); |
1271 | } | 1271 | } |
@@ -1925,7 +1925,7 @@ static inline int serial_imx_probe_dt(struct imx_port *sport, | |||
1925 | static void serial_imx_probe_pdata(struct imx_port *sport, | 1925 | static void serial_imx_probe_pdata(struct imx_port *sport, |
1926 | struct platform_device *pdev) | 1926 | struct platform_device *pdev) |
1927 | { | 1927 | { |
1928 | struct imxuart_platform_data *pdata = pdev->dev.platform_data; | 1928 | struct imxuart_platform_data *pdata = dev_get_platdata(&pdev->dev); |
1929 | 1929 | ||
1930 | sport->port.line = pdev->id; | 1930 | sport->port.line = pdev->id; |
1931 | sport->devdata = (struct imx_uart_data *) pdev->id_entry->driver_data; | 1931 | sport->devdata = (struct imx_uart_data *) pdev->id_entry->driver_data; |
@@ -2000,7 +2000,7 @@ static int serial_imx_probe(struct platform_device *pdev) | |||
2000 | 2000 | ||
2001 | imx_ports[sport->port.line] = sport; | 2001 | imx_ports[sport->port.line] = sport; |
2002 | 2002 | ||
2003 | pdata = pdev->dev.platform_data; | 2003 | pdata = dev_get_platdata(&pdev->dev); |
2004 | if (pdata && pdata->init) { | 2004 | if (pdata && pdata->init) { |
2005 | ret = pdata->init(pdev); | 2005 | ret = pdata->init(pdev); |
2006 | if (ret) | 2006 | if (ret) |
@@ -2024,7 +2024,7 @@ static int serial_imx_remove(struct platform_device *pdev) | |||
2024 | struct imxuart_platform_data *pdata; | 2024 | struct imxuart_platform_data *pdata; |
2025 | struct imx_port *sport = platform_get_drvdata(pdev); | 2025 | struct imx_port *sport = platform_get_drvdata(pdev); |
2026 | 2026 | ||
2027 | pdata = pdev->dev.platform_data; | 2027 | pdata = dev_get_platdata(&pdev->dev); |
2028 | 2028 | ||
2029 | uart_remove_one_port(&imx_reg, &sport->port); | 2029 | uart_remove_one_port(&imx_reg, &sport->port); |
2030 | 2030 | ||