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

Commit 7ba58c9c authored by Swen Schillig's avatar Swen Schillig Committed by James Bottomley
Browse files

[SCSI] zfcp: remove all typedefs and replace them with standards 



Remove typedefs from zfcp, use already existing types instead.

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 5ab944f9

drivers/s390/scsi/zfcp_aux.c

+12 −9
Original line number Diff line number Diff line
@@ -88,11 +88,13 @@ static int __init zfcp_device_setup(char *devstr) 
	strncpy(zfcp_data.init_busid, token, BUS_ID_SIZE);



	token = strsep(&str, ",");

	if (!token || strict_strtoull(token, 0, &zfcp_data.init_wwpn))

	if (!token || strict_strtoull(token, 0,

				(unsigned long long *) &zfcp_data.init_wwpn))

		goto err_out;



	token = strsep(&str, ",");

	if (!token || strict_strtoull(token, 0, &zfcp_data.init_fcp_lun))

	if (!token || strict_strtoull(token, 0,

				(unsigned long long *) &zfcp_data.init_fcp_lun))

		goto err_out;



	kfree(str);
@@ -231,8 +233,7 @@ module_init(zfcp_module_init); 
 *

 * Returns: pointer to zfcp_unit or NULL

 */

struct zfcp_unit *zfcp_get_unit_by_lun(struct zfcp_port *port,

				       fcp_lun_t fcp_lun)

struct zfcp_unit *zfcp_get_unit_by_lun(struct zfcp_port *port, u64 fcp_lun)

{

	struct zfcp_unit *unit;
@@ -251,7 +252,7 @@ struct zfcp_unit *zfcp_get_unit_by_lun(struct zfcp_port *port, 
 * Returns: pointer to zfcp_port or NULL

 */

struct zfcp_port *zfcp_get_port_by_wwpn(struct zfcp_adapter *adapter,

					wwn_t wwpn)

					u64 wwpn)

{

	struct zfcp_port *port;
@@ -276,7 +277,7 @@ static void zfcp_sysfs_unit_release(struct device *dev) 
 *

 * Sets up some unit internal structures and creates sysfs entry.

 */

struct zfcp_unit *zfcp_unit_enqueue(struct zfcp_port *port, fcp_lun_t fcp_lun)

struct zfcp_unit *zfcp_unit_enqueue(struct zfcp_port *port, u64 fcp_lun)

{

	struct zfcp_unit *unit;
@@ -290,7 +291,8 @@ struct zfcp_unit *zfcp_unit_enqueue(struct zfcp_port *port, fcp_lun_t fcp_lun) 
	unit->port = port;

	unit->fcp_lun = fcp_lun;



	snprintf(unit->sysfs_device.bus_id, BUS_ID_SIZE, "0x%016llx", fcp_lun);

	snprintf(unit->sysfs_device.bus_id, BUS_ID_SIZE, "0x%016llx",

		 (unsigned long long) fcp_lun);

	unit->sysfs_device.parent = &port->sysfs_device;

	unit->sysfs_device.release = zfcp_sysfs_unit_release;

	dev_set_drvdata(&unit->sysfs_device, unit);
@@ -620,7 +622,7 @@ static void zfcp_sysfs_port_release(struct device *dev) 
 * d_id is used to enqueue ports with a well known address like the Directory

 * Service for nameserver lookup.

 */

struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *adapter, wwn_t wwpn,

struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *adapter, u64 wwpn,

				     u32 status, u32 d_id)

{

	struct zfcp_port *port;
@@ -644,7 +646,8 @@ struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *adapter, wwn_t wwpn, 
	atomic_set_mask(status | ZFCP_STATUS_COMMON_REMOVE, &port->status);

	atomic_set(&port->refcount, 0);



	snprintf(port->sysfs_device.bus_id, BUS_ID_SIZE, "0x%016llx", wwpn);

	snprintf(port->sysfs_device.bus_id, BUS_ID_SIZE, "0x%016llx",

		 (unsigned long long) wwpn);

	port->sysfs_device.parent = &adapter->ccw_device->dev;



	port->sysfs_device.release = zfcp_sysfs_port_release;

drivers/s390/scsi/zfcp_def.h

+15 −24
Original line number Diff line number Diff line
@@ -78,11 +78,6 @@ 


/*************** FIBRE CHANNEL PROTOCOL SPECIFIC DEFINES ********************/



typedef unsigned long long wwn_t;

typedef unsigned long long fcp_lun_t;

/* data length field may be at variable position in FCP-2 FCP_CMND IU */

typedef unsigned int       fcp_dl_t;



/* timeout for name-server lookup (in seconds) */

#define ZFCP_NS_GID_PN_TIMEOUT		10
@@ -106,7 +101,7 @@ typedef unsigned int fcp_dl_t; 


/* FCP(-2) FCP_CMND IU */

struct fcp_cmnd_iu {

	fcp_lun_t fcp_lun;	   /* FCP logical unit number */

	u64 fcp_lun;	   /* FCP logical unit number */

	u8  crn;	           /* command reference number */

	u8  reserved0:5;	   /* reserved */

	u8  task_attribute:3;	   /* task attribute */
@@ -181,7 +176,7 @@ struct fcp_rscn_element { 
struct fcp_logo {

        u32 command;

        u32 nport_did;

        wwn_t nport_wwpn;

	u64 nport_wwpn;

} __attribute__((packed));



/*
@@ -330,7 +325,7 @@ struct ct_hdr { 
 * a port name is required */

struct ct_iu_gid_pn_req {

	struct ct_hdr header;

	wwn_t wwpn;

	u64 wwpn;

} __attribute__ ((packed));



/* FS_ACC IU and data unit for GID_PN nameserver request */
@@ -339,8 +334,6 @@ struct ct_iu_gid_pn_resp { 
	u32 d_id;

} __attribute__ ((packed));



typedef void (*zfcp_send_ct_handler_t)(unsigned long);



/**

 * struct zfcp_send_ct - used to pass parameters to function zfcp_fsf_send_ct

 * @wka_port: port where the request is sent to
@@ -360,7 +353,7 @@ struct zfcp_send_ct { 
	struct scatterlist *resp;

	unsigned int req_count;

	unsigned int resp_count;

	zfcp_send_ct_handler_t handler;

	void (*handler)(unsigned long);

	unsigned long handler_data;

	int timeout;

	struct completion *completion;
@@ -377,8 +370,6 @@ struct zfcp_gid_pn_data { 
        struct zfcp_port *port;

};



typedef void (*zfcp_send_els_handler_t)(unsigned long);



/**

 * struct zfcp_send_els - used to pass parameters to function zfcp_fsf_send_els

 * @adapter: adapter where request is sent from
@@ -402,7 +393,7 @@ struct zfcp_send_els { 
	struct scatterlist *resp;

	unsigned int req_count;

	unsigned int resp_count;

	zfcp_send_els_handler_t handler;

	void (*handler)(unsigned long);

	unsigned long handler_data;

	struct completion *completion;

	int ls_code;
@@ -468,8 +459,8 @@ struct zfcp_adapter { 
	atomic_t                refcount;          /* reference count */

	wait_queue_head_t	remove_wq;         /* can be used to wait for

						      refcount drop to zero */

	wwn_t			peer_wwnn;	   /* P2P peer WWNN */

	wwn_t			peer_wwpn;	   /* P2P peer WWPN */

	u64			peer_wwnn;	   /* P2P peer WWNN */

	u64			peer_wwpn;	   /* P2P peer WWPN */

	u32			peer_d_id;	   /* P2P peer D_ID */

	struct ccw_device       *ccw_device;	   /* S/390 ccw device */

	u32			hydra_version;	   /* Hydra version */
@@ -546,8 +537,8 @@ struct zfcp_port { 
						  list */

	u32		       units;	       /* # of logical units in list */

	atomic_t	       status;	       /* status of this remote port */

	wwn_t		       wwnn;	       /* WWNN if known */

	wwn_t		       wwpn;	       /* WWPN */

	u64		       wwnn;	       /* WWNN if known */

	u64		       wwpn;	       /* WWPN */

	u32		       d_id;	       /* D_ID */

	u32		       handle;	       /* handle assigned by FSF */

	struct zfcp_erp_action erp_action;     /* pending error recovery */
@@ -566,7 +557,7 @@ struct zfcp_unit { 
	struct zfcp_port       *port;	       /* remote port of unit */

	atomic_t	       status;	       /* status of this logical unit */

	unsigned int	       scsi_lun;       /* own SCSI LUN */

	fcp_lun_t	       fcp_lun;	       /* own FCP_LUN */

	u64		       fcp_lun;	       /* own FCP_LUN */

	u32		       handle;	       /* handle assigned by FSF */

        struct scsi_device     *device;        /* scsi device struct pointer */

	struct zfcp_erp_action erp_action;     /* pending error recovery */
@@ -620,8 +611,8 @@ struct zfcp_data { 
						       changes */

	atomic_t		loglevel;            /* current loglevel */

	char                    init_busid[BUS_ID_SIZE];

	wwn_t                   init_wwpn;

	fcp_lun_t               init_fcp_lun;

	u64			init_wwpn;

	u64			init_fcp_lun;

	struct kmem_cache	*fsf_req_qtcb_cache;

	struct kmem_cache	*sr_buffer_cache;

	struct kmem_cache	*gid_pn_cache;

drivers/s390/scsi/zfcp_erp.c

+6 −4
Original line number Diff line number Diff line
@@ -991,7 +991,8 @@ static int zfcp_erp_strategy_check_unit(struct zfcp_unit *unit, int result) 
			dev_err(&unit->port->adapter->ccw_device->dev,

				"ERP failed for unit 0x%016Lx on "

				"port 0x%016Lx\n",

				unit->fcp_lun, unit->port->wwpn);

				(unsigned long long)unit->fcp_lun,

				(unsigned long long)unit->port->wwpn);

			zfcp_erp_unit_failed(unit, 21, NULL);

		}

		break;
@@ -1021,7 +1022,7 @@ static int zfcp_erp_strategy_check_port(struct zfcp_port *port, int result) 
		if (atomic_read(&port->erp_counter) > ZFCP_MAX_ERPS) {

			dev_err(&port->adapter->ccw_device->dev,

				"ERP failed for remote port 0x%016Lx\n",

				port->wwpn);

				(unsigned long long)port->wwpn);

			zfcp_erp_port_failed(port, 22, NULL);

		}

		break;
@@ -1199,7 +1200,8 @@ static void zfcp_erp_schedule_work(struct zfcp_unit *unit) 
	if (!p) {

		dev_err(&unit->port->adapter->ccw_device->dev,

			"Registering unit 0x%016Lx on port 0x%016Lx failed\n",

			unit->fcp_lun, unit->port->wwpn);

			(unsigned long long)unit->fcp_lun,

			(unsigned long long)unit->port->wwpn);

		return;

	}
@@ -1221,7 +1223,7 @@ static void zfcp_erp_rport_register(struct zfcp_port *port) 
	if (!port->rport) {

		dev_err(&port->adapter->ccw_device->dev,

			"Registering port 0x%016Lx failed\n",

			port->wwpn);

			(unsigned long long)port->wwpn);

		return;

	}

drivers/s390/scsi/zfcp_ext.h

+4 −7
Original line number Diff line number Diff line
@@ -12,16 +12,14 @@ 
#include "zfcp_def.h"



/* zfcp_aux.c */

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_unit *zfcp_get_unit_by_lun(struct zfcp_port *, u64);

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

extern int zfcp_adapter_enqueue(struct ccw_device *);

extern void zfcp_adapter_dequeue(struct zfcp_adapter *);

extern struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *, wwn_t, u32,

extern struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *, u64, u32,

					   u32);

extern void zfcp_port_dequeue(struct zfcp_port *);

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

extern struct zfcp_unit *zfcp_unit_enqueue(struct zfcp_port *, u64);

extern void zfcp_unit_dequeue(struct zfcp_unit *);

extern int zfcp_reqlist_isempty(struct zfcp_adapter *);

extern void zfcp_sg_free_table(struct scatterlist *, int);
@@ -150,7 +148,6 @@ extern void zfcp_qdio_close(struct zfcp_adapter *); 
extern struct zfcp_data zfcp_data;

extern int zfcp_adapter_scsi_register(struct zfcp_adapter *);

extern void zfcp_adapter_scsi_unregister(struct zfcp_adapter *);

extern void zfcp_set_fcp_dl(struct fcp_cmnd_iu *, fcp_dl_t);

extern char *zfcp_get_fcp_sns_info_ptr(struct fcp_rsp_iu *);

extern struct fc_function_template zfcp_transport_functions;

drivers/s390/scsi/zfcp_fc.c

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ static void zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req) 
	schedule_work(&fsf_req->adapter->scan_work);

}



static void zfcp_fc_incoming_wwpn(struct zfcp_fsf_req *req, wwn_t wwpn)

static void zfcp_fc_incoming_wwpn(struct zfcp_fsf_req *req, u64 wwpn)

{

	struct zfcp_adapter *adapter = req->adapter;

	struct zfcp_port *port;