Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 317e6b65 authored by Swen Schillig's avatar Swen Schillig Committed by James Bottomley
Browse files

[SCSI] zfcp: Cleanup of code in zfcp_aux.c 



Overall cleanup of zfcp_aux.c to simplify code and follow kernel
coding style.

Signed-off-by: default avatarSwen Schillig <swen@vnet.ibm.com>
Signed-off-by: default avatarChristof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent f76af7d7

drivers/s390/scsi/zfcp_aux.c

+219 −364

File changed.

Preview size limit exceeded, changes collapsed.

drivers/s390/scsi/zfcp_ccw.c

+1 −3
Original line number Diff line number Diff line
@@ -20,12 +20,10 @@ 
 */

static int zfcp_ccw_probe(struct ccw_device *ccw_device)

{

	struct zfcp_adapter *adapter;

	int retval = 0;



	down(&zfcp_data.config_sema);

	adapter = zfcp_adapter_enqueue(ccw_device);

	if (!adapter) {

	if (zfcp_adapter_enqueue(ccw_device)) {

		dev_err(&ccw_device->dev,

			"Setup of data structures failed.\n");

		retval = -EINVAL;

drivers/s390/scsi/zfcp_def.h

+0 −13
Original line number Diff line number Diff line
@@ -730,13 +730,6 @@ struct zfcp_data { 
	struct kmem_cache		*gid_pn_cache;

};



/* number of elements for various memory pools */

#define ZFCP_POOL_FSF_REQ_ERP_NR	1

#define ZFCP_POOL_FSF_REQ_SCSI_NR	1

#define ZFCP_POOL_FSF_REQ_ABORT_NR	1

#define ZFCP_POOL_STATUS_READ_NR	FSF_STATUS_READS_RECOM

#define ZFCP_POOL_DATA_GID_PN_NR	1



/* struct used by memory pools for fsf_requests */

struct zfcp_fsf_req_qtcb {

	struct zfcp_fsf_req fsf_req;
@@ -757,12 +750,6 @@ struct zfcp_fsf_req_qtcb { 
           ((atomic_read(target) & mask) == mask)

#endif



extern void _zfcp_hex_dump(char *, int);

#define ZFCP_HEX_DUMP(level, addr, count) \

		if (ZFCP_LOG_CHECK(level)) { \

			_zfcp_hex_dump(addr, count); \

		}



#define zfcp_get_busid_by_adapter(adapter) (adapter->ccw_device->dev.bus_id)

#define zfcp_get_busid_by_port(port) (zfcp_get_busid_by_adapter(port->adapter))

#define zfcp_get_busid_by_unit(unit) (zfcp_get_busid_by_port(unit->port))

drivers/s390/scsi/zfcp_erp.c

+1 −1
Original line number Diff line number Diff line
@@ -1675,7 +1675,7 @@ static void zfcp_erp_open_ptp_port(struct zfcp_adapter *adapter) 
	struct zfcp_port *port;

	port = zfcp_port_enqueue(adapter, adapter->peer_wwpn, 0,

				 adapter->peer_d_id);

	if (!port) /* error or port already attached */

	if (IS_ERR(port)) /* error or port already attached */

		return;

	zfcp_erp_port_reopen_internal(port, 0, 150, NULL);

}

drivers/s390/scsi/zfcp_ext.h

+1 −3
Original line number Diff line number Diff line
@@ -26,9 +26,7 @@ extern void zfcp_sysfs_unit_release(struct device *); 
/**************************** CONFIGURATION  *********************************/

extern struct zfcp_unit *zfcp_get_unit_by_lun(struct zfcp_port *, fcp_lun_t);

extern struct zfcp_port *zfcp_get_port_by_wwpn(struct zfcp_adapter *, wwn_t);

extern struct zfcp_port *zfcp_get_port_by_did(struct zfcp_adapter *, u32);

struct zfcp_adapter *zfcp_get_adapter_by_busid(char *);

extern struct zfcp_adapter *zfcp_adapter_enqueue(struct ccw_device *);

extern int    zfcp_adapter_enqueue(struct ccw_device *);

extern int    zfcp_adapter_debug_register(struct zfcp_adapter *);

extern void   zfcp_adapter_dequeue(struct zfcp_adapter *);

extern void   zfcp_adapter_debug_unregister(struct zfcp_adapter *);