microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[POWERPC] Partially revert a7edd0e676 

Due to conflicts with the network drivers tree.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Stephen Rothwell 2007-04-27 14:32:37 +10:00 коммит произвёл Paul Mackerras
Родитель 01b2726dd1
Коммит 5bcec54f02
1 изменённых файлов: 4 добавлений и 4 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
drivers/net/ehea/ehea_main.c
Просмотреть файл

@ -2320,7 +2320,7 @@ static int ehea_setup_single_port(struct ehea_port *port,
struct net_device *dev = port->netdev; struct net_device *dev = port->netdev;
struct ehea_adapter *adapter = port->adapter; struct ehea_adapter *adapter = port->adapter;
struct hcp_ehea_port_cb4 *cb4; struct hcp_ehea_port_cb4 *cb4;
const u32 *dn_log_port_id; u32 *dn_log_port_id;
int jumbo = 0; int jumbo = 0;
sema_init(&port->port_lock, 1); sema_init(&port->port_lock, 1);
@ -2336,7 +2336,7 @@ static int ehea_setup_single_port(struct ehea_port *port,
port->of_dev_node = dn; port->of_dev_node = dn;
/* Determine logical port id */ /* Determine logical port id */
dn_log_port_id = get_property(dn, "ibm,hea-port-no", NULL); dn_log_port_id = (u32*)get_property(dn, "ibm,hea-port-no", NULL);
if (!dn_log_port_id) { if (!dn_log_port_id) {
ehea_error("bad device node: dn_log_port_id=%p", ehea_error("bad device node: dn_log_port_id=%p",
@ -2492,7 +2492,7 @@ static int __devinit ehea_probe(struct ibmebus_dev *dev,
const struct of_device_id *id) const struct of_device_id *id)
{ {
struct ehea_adapter *adapter; struct ehea_adapter *adapter;
const u64 *adapter_handle; u64 *adapter_handle;
int ret; int ret;
adapter = kzalloc(sizeof(*adapter), GFP_KERNEL); adapter = kzalloc(sizeof(*adapter), GFP_KERNEL);
@ -2502,7 +2502,7 @@ static int __devinit ehea_probe(struct ibmebus_dev *dev,
goto out; goto out;
} }
adapter_handle = get_property(dev->ofdev.node, "ibm,hea-handle", adapter_handle = (u64*)get_property(dev->ofdev.node, "ibm,hea-handle",
NULL); NULL);
if (adapter_handle) if (adapter_handle)
adapter->handle = *adapter_handle; adapter->handle = *adapter_handle;