diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-10-27 18:56:18 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-10-27 18:56:18 -0400 |
commit | 40578fca24e7f777f3da7a693b030ae28ef7e486 (patch) | |
tree | ed0541f857882f647bfc97e03d83371b8f4698a6 /drivers | |
parent | 4f917ba3d5ee9c98d60fa357e799942df8412de3 (diff) | |
parent | 4bdf0bb7d64cf672199519b3d808e2a82f5b59e9 (diff) |
Merge commit 'gcl/merge' into merge
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/of/of_mdio.c | 13 | ||||
-rw-r--r-- | drivers/serial/mpc52xx_uart.c | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c index bacaa536fd51..4b22ba568b19 100644 --- a/drivers/of/of_mdio.c +++ b/drivers/of/of_mdio.c | |||
@@ -97,6 +97,12 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np) | |||
97 | } | 97 | } |
98 | EXPORT_SYMBOL(of_mdiobus_register); | 98 | EXPORT_SYMBOL(of_mdiobus_register); |
99 | 99 | ||
100 | /* Helper function for of_phy_find_device */ | ||
101 | static int of_phy_match(struct device *dev, void *phy_np) | ||
102 | { | ||
103 | return dev_archdata_get_node(&dev->archdata) == phy_np; | ||
104 | } | ||
105 | |||
100 | /** | 106 | /** |
101 | * of_phy_find_device - Give a PHY node, find the phy_device | 107 | * of_phy_find_device - Give a PHY node, find the phy_device |
102 | * @phy_np: Pointer to the phy's device tree node | 108 | * @phy_np: Pointer to the phy's device tree node |
@@ -106,15 +112,10 @@ EXPORT_SYMBOL(of_mdiobus_register); | |||
106 | struct phy_device *of_phy_find_device(struct device_node *phy_np) | 112 | struct phy_device *of_phy_find_device(struct device_node *phy_np) |
107 | { | 113 | { |
108 | struct device *d; | 114 | struct device *d; |
109 | int match(struct device *dev, void *phy_np) | ||
110 | { | ||
111 | return dev_archdata_get_node(&dev->archdata) == phy_np; | ||
112 | } | ||
113 | |||
114 | if (!phy_np) | 115 | if (!phy_np) |
115 | return NULL; | 116 | return NULL; |
116 | 117 | ||
117 | d = bus_find_device(&mdio_bus_type, NULL, phy_np, match); | 118 | d = bus_find_device(&mdio_bus_type, NULL, phy_np, of_phy_match); |
118 | return d ? to_phy_device(d) : NULL; | 119 | return d ? to_phy_device(d) : NULL; |
119 | } | 120 | } |
120 | EXPORT_SYMBOL(of_phy_find_device); | 121 | EXPORT_SYMBOL(of_phy_find_device); |
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c index d7bcd074d383..7ce9e9f567a3 100644 --- a/drivers/serial/mpc52xx_uart.c +++ b/drivers/serial/mpc52xx_uart.c | |||
@@ -705,7 +705,7 @@ mpc52xx_uart_verify_port(struct uart_port *port, struct serial_struct *ser) | |||
705 | return -EINVAL; | 705 | return -EINVAL; |
706 | 706 | ||
707 | if ((ser->irq != port->irq) || | 707 | if ((ser->irq != port->irq) || |
708 | (ser->io_type != SERIAL_IO_MEM) || | 708 | (ser->io_type != UPIO_MEM) || |
709 | (ser->baud_base != port->uartclk) || | 709 | (ser->baud_base != port->uartclk) || |
710 | (ser->iomem_base != (void *)port->mapbase) || | 710 | (ser->iomem_base != (void *)port->mapbase) || |
711 | (ser->hub6 != 0)) | 711 | (ser->hub6 != 0)) |