AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[PATCH] IB: Minor cleanup during MAD startup and shutdown

Browse Source 
Minor cleanup during startup and shutdown

Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Hal Rosenstock 2005-07-27 11:45:27 -07:00 committed by Linus Torvalds
parent 6a0c435ef9
commit f68bcc2df8
1 changed files with 9 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/infiniband/core/mad.c
View File

@ -2487,14 +2487,6 @@ static int ib_mad_port_open(struct ib_device *device,
unsigned long flags; unsigned long flags;
char name[sizeof "ib_mad123"]; char name[sizeof "ib_mad123"];
/* First, check if port already open at MAD layer */
port_priv = ib_get_mad_port(device, port_num);
if (port_priv) {
printk(KERN_DEBUG PFX "%s port %d already open\n",
device->name, port_num);
return 0;
}
/* Create new device info */ /* Create new device info */
port_priv = kmalloc(sizeof *port_priv, GFP_KERNEL); port_priv = kmalloc(sizeof *port_priv, GFP_KERNEL);
if (!port_priv) { if (!port_priv) {
@ -2619,7 +2611,7 @@ static int ib_mad_port_close(struct ib_device *device, int port_num)
static void ib_mad_init_device(struct ib_device *device) static void ib_mad_init_device(struct ib_device *device)
{ {
int ret, num_ports, cur_port, i, ret2; int num_ports, cur_port, i;
if (device->node_type == IB_NODE_SWITCH) { if (device->node_type == IB_NODE_SWITCH) {
num_ports = 1; num_ports = 1;
@ -2629,47 +2621,37 @@ static void ib_mad_init_device(struct ib_device *device)
cur_port = 1; cur_port = 1;
} }
for (i = 0; i < num_ports; i++, cur_port++) { for (i = 0; i < num_ports; i++, cur_port++) {
ret = ib_mad_port_open(device, cur_port); if (ib_mad_port_open(device, cur_port)) {
if (ret) {
printk(KERN_ERR PFX "Couldn't open %s port %d\n", printk(KERN_ERR PFX "Couldn't open %s port %d\n",
device->name, cur_port); device->name, cur_port);
goto error_device_open; goto error_device_open;
} }
ret = ib_agent_port_open(device, cur_port); if (ib_agent_port_open(device, cur_port)) {
if (ret) {
printk(KERN_ERR PFX "Couldn't open %s port %d " printk(KERN_ERR PFX "Couldn't open %s port %d "
"for agents\n", "for agents\n",
device->name, cur_port); device->name, cur_port);
goto error_device_open; goto error_device_open;
} }
} }
return;
goto error_device_query;
error_device_open: error_device_open:
while (i > 0) { while (i > 0) {
cur_port--; cur_port--;
ret2 = ib_agent_port_close(device, cur_port); if (ib_agent_port_close(device, cur_port))
if (ret2) {
printk(KERN_ERR PFX "Couldn't close %s port %d " printk(KERN_ERR PFX "Couldn't close %s port %d "
"for agents\n", "for agents\n",
device->name, cur_port); device->name, cur_port);
} if (ib_mad_port_close(device, cur_port))
ret2 = ib_mad_port_close(device, cur_port);
if (ret2) {
printk(KERN_ERR PFX "Couldn't close %s port %d\n", printk(KERN_ERR PFX "Couldn't close %s port %d\n",
device->name, cur_port); device->name, cur_port);
}
i--; i--;
} }
error_device_query:
return;
} }
static void ib_mad_remove_device(struct ib_device *device) static void ib_mad_remove_device(struct ib_device *device)
{ {
int ret = 0, i, num_ports, cur_port, ret2; int i, num_ports, cur_port;
if (device->node_type == IB_NODE_SWITCH) { if (device->node_type == IB_NODE_SWITCH) {
num_ports = 1; num_ports = 1;
@ -2679,21 +2661,13 @@ static void ib_mad_remove_device(struct ib_device *device)
cur_port = 1; cur_port = 1;
} }
for (i = 0; i < num_ports; i++, cur_port++) { for (i = 0; i < num_ports; i++, cur_port++) {
ret2 = ib_agent_port_close(device, cur_port); if (ib_agent_port_close(device, cur_port))
if (ret2) {
printk(KERN_ERR PFX "Couldn't close %s port %d " printk(KERN_ERR PFX "Couldn't close %s port %d "
"for agents\n", "for agents\n",
device->name, cur_port); device->name, cur_port);
if (!ret) if (ib_mad_port_close(device, cur_port))
ret = ret2;
}
ret2 = ib_mad_port_close(device, cur_port);
if (ret2) {
printk(KERN_ERR PFX "Couldn't close %s port %d\n", printk(KERN_ERR PFX "Couldn't close %s port %d\n",
device->name, cur_port); device->name, cur_port);
if (!ret)
ret = ret2;
}
} }
} }