aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial/sunzilog.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/tty/serial/sunzilog.c')
-rw-r--r--drivers/tty/serial/sunzilog.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/tty/serial/sunzilog.c b/drivers/tty/serial/sunzilog.c
index 813ef8eb8eff..135a15203532 100644
--- a/drivers/tty/serial/sunzilog.c
+++ b/drivers/tty/serial/sunzilog.c
@@ -1495,7 +1495,7 @@ static int zs_probe(struct platform_device *op)
1495 kbm_inst++; 1495 kbm_inst++;
1496 } 1496 }
1497 1497
1498 dev_set_drvdata(&op->dev, &up[0]); 1498 platform_set_drvdata(op, &up[0]);
1499 1499
1500 return 0; 1500 return 0;
1501} 1501}
@@ -1512,7 +1512,7 @@ static void zs_remove_one(struct uart_sunzilog_port *up)
1512 1512
1513static int zs_remove(struct platform_device *op) 1513static int zs_remove(struct platform_device *op)
1514{ 1514{
1515 struct uart_sunzilog_port *up = dev_get_drvdata(&op->dev); 1515 struct uart_sunzilog_port *up = platform_get_drvdata(op);
1516 struct zilog_layout __iomem *regs; 1516 struct zilog_layout __iomem *regs;
1517 1517
1518 zs_remove_one(&up[0]); 1518 zs_remove_one(&up[0]);
@@ -1521,8 +1521,6 @@ static int zs_remove(struct platform_device *op)
1521 regs = sunzilog_chip_regs[up[0].port.line / 2]; 1521 regs = sunzilog_chip_regs[up[0].port.line / 2];
1522 of_iounmap(&op->resource[0], regs, sizeof(struct zilog_layout)); 1522 of_iounmap(&op->resource[0], regs, sizeof(struct zilog_layout));
1523 1523
1524 dev_set_drvdata(&op->dev, NULL);
1525
1526 return 0; 1524 return 0;
1527} 1525}
1528 1526