diff options
| author | Christof Schmitt <christof.schmitt@de.ibm.com> | 2010-02-17 11:18:56 +0100 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-02-17 17:46:30 -0600 |
| commit | 615f59e0daaf56e43dcaaf3ea228967d9bc21584 (patch) | |
| tree | 846366936a5077153b8f07b3125e868d7f6bce4e /drivers/s390/scsi/zfcp_fsf.c | |
| parent | 5bdecd2248d4af6f3b311b4d8ca7f3f5f83a7191 (diff) | |
| download | kernel_samsung_smdk4412-615f59e0daaf56e43dcaaf3ea228967d9bc21584.zip kernel_samsung_smdk4412-615f59e0daaf56e43dcaaf3ea228967d9bc21584.tar.gz kernel_samsung_smdk4412-615f59e0daaf56e43dcaaf3ea228967d9bc21584.tar.bz2 | |
[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.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c index 69393b8..bd4d71c 100644 --- a/drivers/s390/scsi/zfcp_fsf.c +++ b/drivers/s390/scsi/zfcp_fsf.c @@ -3,7 +3,7 @@ * * Implementation of FSF commands. * - * Copyright IBM Corporation 2002, 2009 + * Copyright IBM Corporation 2002, 2010 */ #define KMSG_COMPONENT "zfcp" @@ -1471,7 +1471,7 @@ static void zfcp_fsf_open_port_handler(struct zfcp_fsf_req *req) } out: - put_device(&port->sysfs_device); + put_device(&port->dev); } /** @@ -1509,14 +1509,14 @@ int zfcp_fsf_open_port(struct zfcp_erp_action *erp_action) req->data = port; req->erp_action = erp_action; erp_action->fsf_req_id = req->req_id; - get_device(&port->sysfs_device); + get_device(&port->dev); zfcp_fsf_start_erp_timer(req); retval = zfcp_fsf_req_send(req); if (retval) { zfcp_fsf_req_free(req); erp_action->fsf_req_id = 0; - put_device(&port->sysfs_device); + put_device(&port->dev); } out: spin_unlock_bh(&qdio->req_q_lock); @@ -2261,7 +2261,7 @@ skip_fsfstatus: else { zfcp_fsf_send_fcp_command_task_handler(req); req->unit = NULL; - put_device(&unit->sysfs_device); + put_device(&unit->dev); } } @@ -2299,7 +2299,7 @@ int zfcp_fsf_send_fcp_command_task(struct zfcp_unit *unit, } req->status |= ZFCP_STATUS_FSFREQ_CLEANUP; - get_device(&unit->sysfs_device); + get_device(&unit->dev); req->unit = unit; req->data = scsi_cmnd; req->handler = zfcp_fsf_send_fcp_command_handler; @@ -2356,7 +2356,7 @@ int zfcp_fsf_send_fcp_command_task(struct zfcp_unit *unit, goto out; failed_scsi_cmnd: - put_device(&unit->sysfs_device); + put_device(&unit->dev); zfcp_fsf_req_free(req); scsi_cmnd->host_scribble = NULL; out: |