[POWERPC] Partially revert a7edd0e676d51145ae634a2acf7a447e319200fa (5bcec54f) · Commits · 戴 / test

drivers/net/ehea/ehea_main.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -2320,7 +2320,7 @@ static int ehea_setup_single_port(struct ehea_port *port,
		struct net_device *dev = port->netdev;
		struct ehea_adapter *adapter = port->adapter;
		struct hcp_ehea_port_cb4 *cb4;
		const u32 *dn_log_port_id;
		u32 *dn_log_port_id;
		int jumbo = 0;

		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;

		/* 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) {
		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)
		{
		struct ehea_adapter *adapter;
		const u64 *adapter_handle;
		u64 *adapter_handle;
		int ret;

		adapter = kzalloc(sizeof(*adapter), GFP_KERNEL);
		@@ -2502,7 +2502,7 @@ static int __devinit ehea_probe(struct ibmebus_dev *dev,
		goto out;
		}

		adapter_handle = get_property(dev->ofdev.node, "ibm,hea-handle",
		adapter_handle = (u64*)get_property(dev->ofdev.node, "ibm,hea-handle",
		NULL);
		if (adapter_handle)
		adapter->handle = *adapter_handle;