diff options
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/mpc52xx_uart.c | 2 | ||||
-rw-r--r-- | drivers/serial/of_serial.c | 4 | ||||
-rw-r--r-- | drivers/serial/pmac_zilog.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c index f8c1761eb57f..8d24cd521056 100644 --- a/drivers/serial/mpc52xx_uart.c +++ b/drivers/serial/mpc52xx_uart.c | |||
@@ -1069,7 +1069,7 @@ mpc52xx_uart_of_enumerate(void) | |||
1069 | continue; | 1069 | continue; |
1070 | 1070 | ||
1071 | /* Is a particular device number requested? */ | 1071 | /* Is a particular device number requested? */ |
1072 | devno = of_get_property(np, "port-number", NULL); | 1072 | devno = get_property(np, "port-number", NULL); |
1073 | mpc52xx_uart_of_assign(of_node_get(np), devno ? *devno : -1); | 1073 | mpc52xx_uart_of_assign(of_node_get(np), devno ? *devno : -1); |
1074 | } | 1074 | } |
1075 | 1075 | ||
diff --git a/drivers/serial/of_serial.c b/drivers/serial/of_serial.c index e7928fee833a..09b0b736a751 100644 --- a/drivers/serial/of_serial.c +++ b/drivers/serial/of_serial.c | |||
@@ -29,8 +29,8 @@ static int __devinit of_platform_serial_setup(struct of_device *ofdev, | |||
29 | int ret; | 29 | int ret; |
30 | 30 | ||
31 | memset(port, 0, sizeof *port); | 31 | memset(port, 0, sizeof *port); |
32 | spd = of_get_property(np, "current-speed", NULL); | 32 | spd = get_property(np, "current-speed", NULL); |
33 | clk = of_get_property(np, "clock-frequency", NULL); | 33 | clk = get_property(np, "clock-frequency", NULL); |
34 | if (!clk) { | 34 | if (!clk) { |
35 | dev_warn(&ofdev->dev, "no clock-frequency property set\n"); | 35 | dev_warn(&ofdev->dev, "no clock-frequency property set\n"); |
36 | return -ENODEV; | 36 | return -ENODEV; |
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c index cd92a3966b0c..be8d75721a85 100644 --- a/drivers/serial/pmac_zilog.c +++ b/drivers/serial/pmac_zilog.c | |||
@@ -1452,12 +1452,12 @@ no_dma: | |||
1452 | */ | 1452 | */ |
1453 | if (device_is_compatible(np, "cobalt")) | 1453 | if (device_is_compatible(np, "cobalt")) |
1454 | uap->flags |= PMACZILOG_FLAG_IS_INTMODEM; | 1454 | uap->flags |= PMACZILOG_FLAG_IS_INTMODEM; |
1455 | conn = of_get_property(np, "AAPL,connector", &len); | 1455 | conn = get_property(np, "AAPL,connector", &len); |
1456 | if (conn && (strcmp(conn, "infrared") == 0)) | 1456 | if (conn && (strcmp(conn, "infrared") == 0)) |
1457 | uap->flags |= PMACZILOG_FLAG_IS_IRDA; | 1457 | uap->flags |= PMACZILOG_FLAG_IS_IRDA; |
1458 | uap->port_type = PMAC_SCC_ASYNC; | 1458 | uap->port_type = PMAC_SCC_ASYNC; |
1459 | /* 1999 Powerbook G3 has slot-names property instead */ | 1459 | /* 1999 Powerbook G3 has slot-names property instead */ |
1460 | slots = of_get_property(np, "slot-names", &len); | 1460 | slots = get_property(np, "slot-names", &len); |
1461 | if (slots && slots->count > 0) { | 1461 | if (slots && slots->count > 0) { |
1462 | if (strcmp(slots->name, "IrDA") == 0) | 1462 | if (strcmp(slots->name, "IrDA") == 0) |
1463 | uap->flags |= PMACZILOG_FLAG_IS_IRDA; | 1463 | uap->flags |= PMACZILOG_FLAG_IS_IRDA; |
@@ -1471,7 +1471,7 @@ no_dma: | |||
1471 | of_find_node_by_name(NULL, "i2c-modem"); | 1471 | of_find_node_by_name(NULL, "i2c-modem"); |
1472 | if (i2c_modem) { | 1472 | if (i2c_modem) { |
1473 | const char* mid = | 1473 | const char* mid = |
1474 | of_get_property(i2c_modem, "modem-id", NULL); | 1474 | get_property(i2c_modem, "modem-id", NULL); |
1475 | if (mid) switch(*mid) { | 1475 | if (mid) switch(*mid) { |
1476 | case 0x04 : | 1476 | case 0x04 : |
1477 | case 0x05 : | 1477 | case 0x05 : |