aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/scsi/zfcp_fsf.c
diff options
context:
space:
mode:
authorChristof Schmitt <christof.schmitt@de.ibm.com>2010-02-17 05:18:56 -0500
committerJames Bottomley <James.Bottomley@suse.de>2010-02-17 18:46:30 -0500
commit615f59e0daaf56e43dcaaf3ea228967d9bc21584 (patch)
tree846366936a5077153b8f07b3125e868d7f6bce4e /drivers/s390/scsi/zfcp_fsf.c
parent5bdecd2248d4af6f3b311b4d8ca7f3f5f83a7191 (diff)
[SCSI] zfcp: Rename sysfs_device attribute to dev in zfcp_unit and zfcp_port
Kernel code uses dev as short name for the struct device. Rename the sysfs_device in zfcp_unit and zfcp_port to match this convention. Reviewed-by: Swen Schillig <swen@vnet.ibm.com> Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/s390/scsi/zfcp_fsf.c')
-rw-r--r--drivers/s390/scsi/zfcp_fsf.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c
index 69393b8c50d7..bd4d71cdcace 100644
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -3,7 +3,7 @@
3 * 3 *
4 * Implementation of FSF commands. 4 * Implementation of FSF commands.
5 * 5 *
6 * Copyright IBM Corporation 2002, 2009 6 * Copyright IBM Corporation 2002, 2010
7 */ 7 */
8 8
9#define KMSG_COMPONENT "zfcp" 9#define KMSG_COMPONENT "zfcp"
@@ -1471,7 +1471,7 @@ static void zfcp_fsf_open_port_handler(struct zfcp_fsf_req *req)
1471 } 1471 }
1472 1472
1473out: 1473out:
1474 put_device(&port->sysfs_device); 1474 put_device(&port->dev);
1475} 1475}
1476 1476
1477/** 1477/**
@@ -1509,14 +1509,14 @@ int zfcp_fsf_open_port(struct zfcp_erp_action *erp_action)
1509 req->data = port; 1509 req->data = port;
1510 req->erp_action = erp_action; 1510 req->erp_action = erp_action;
1511 erp_action->fsf_req_id = req->req_id; 1511 erp_action->fsf_req_id = req->req_id;
1512 get_device(&port->sysfs_device); 1512 get_device(&port->dev);
1513 1513
1514 zfcp_fsf_start_erp_timer(req); 1514 zfcp_fsf_start_erp_timer(req);
1515 retval = zfcp_fsf_req_send(req); 1515 retval = zfcp_fsf_req_send(req);
1516 if (retval) { 1516 if (retval) {
1517 zfcp_fsf_req_free(req); 1517 zfcp_fsf_req_free(req);
1518 erp_action->fsf_req_id = 0; 1518 erp_action->fsf_req_id = 0;
1519 put_device(&port->sysfs_device); 1519 put_device(&port->dev);
1520 } 1520 }
1521out: 1521out:
1522 spin_unlock_bh(&qdio->req_q_lock); 1522 spin_unlock_bh(&qdio->req_q_lock);
@@ -2261,7 +2261,7 @@ skip_fsfstatus:
2261 else { 2261 else {
2262 zfcp_fsf_send_fcp_command_task_handler(req); 2262 zfcp_fsf_send_fcp_command_task_handler(req);
2263 req->unit = NULL; 2263 req->unit = NULL;
2264 put_device(&unit->sysfs_device); 2264 put_device(&unit->dev);
2265 } 2265 }
2266} 2266}
2267 2267
@@ -2299,7 +2299,7 @@ int zfcp_fsf_send_fcp_command_task(struct zfcp_unit *unit,
2299 } 2299 }
2300 2300
2301 req->status |= ZFCP_STATUS_FSFREQ_CLEANUP; 2301 req->status |= ZFCP_STATUS_FSFREQ_CLEANUP;
2302 get_device(&unit->sysfs_device); 2302 get_device(&unit->dev);
2303 req->unit = unit; 2303 req->unit = unit;
2304 req->data = scsi_cmnd; 2304 req->data = scsi_cmnd;
2305 req->handler = zfcp_fsf_send_fcp_command_handler; 2305 req->handler = zfcp_fsf_send_fcp_command_handler;
@@ -2356,7 +2356,7 @@ int zfcp_fsf_send_fcp_command_task(struct zfcp_unit *unit,
2356 goto out; 2356 goto out;
2357 2357
2358failed_scsi_cmnd: 2358failed_scsi_cmnd:
2359 put_device(&unit->sysfs_device); 2359 put_device(&unit->dev);
2360 zfcp_fsf_req_free(req); 2360 zfcp_fsf_req_free(req);
2361 scsi_cmnd->host_scribble = NULL; 2361 scsi_cmnd->host_scribble = NULL;
2362out: 2362out: