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

Commit 7cc16380 authored by Arvind Bhushan's avatar Arvind Bhushan Committed by David S. Miller
Browse files

csiostor: Cleanup chip specific operations. 



This patch removes chip specific operations from the common hardware
paths, as well as the Makefile change to accomodate the new files.

Signed-off-by: default avatarArvind Bhushan <arvindb@chelsio.com>
Signed-off-by: default avatarNaresh Kumar Inna <naresh@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d69630e8

drivers/scsi/csiostor/Makefile

+2 −1
Original line number Original line Diff line number Diff line
@@ -8,4 +8,5 @@ ccflags-y += -I$(srctree)/drivers/net/ethernet/chelsio/cxgb4 
obj-$(CONFIG_SCSI_CHELSIO_FCOE) += csiostor.o

obj-$(CONFIG_SCSI_CHELSIO_FCOE) += csiostor.o





csiostor-objs := csio_attr.o csio_init.o csio_lnode.o csio_scsi.o \

csiostor-objs := csio_attr.o csio_init.o csio_lnode.o csio_scsi.o \

		csio_hw.o csio_isr.o csio_mb.o csio_rnode.o csio_wr.o
 
		csio_hw.o csio_hw_t4.o csio_hw_t5.o csio_isr.o \

		csio_mb.o csio_rnode.o csio_wr.o

drivers/scsi/csiostor/csio_hw.c

+119 −440

File changed.

Preview size limit exceeded, changes collapsed.

drivers/scsi/csiostor/csio_hw.h

+18 −29

File changed.

Preview size limit exceeded, changes collapsed.

drivers/scsi/csiostor/csio_init.c

+38 −10

File changed.

Preview size limit exceeded, changes collapsed.

drivers/scsi/csiostor/csio_init.h

+4 −25
Original line number Original line Diff line number Diff line
@@ -52,31 +52,6 @@ 
#define CSIO_DRV_DESC			"Chelsio FCoE driver"

#define CSIO_DRV_DESC			"Chelsio FCoE driver"

#define CSIO_DRV_VERSION		"1.0.0"

#define CSIO_DRV_VERSION		"1.0.0"





#define CSIO_DEVICE(devid, idx)					\

{ PCI_VENDOR_ID_CHELSIO, (devid), PCI_ANY_ID, PCI_ANY_ID, 0, 0, (idx) }



#define CSIO_IS_T4_FPGA(_dev)		(((_dev) == CSIO_DEVID_PE10K) ||\

					 ((_dev) == CSIO_DEVID_PE10K_PF1))



/* FCoE device IDs */

#define CSIO_DEVID_PE10K		0xA000

#define CSIO_DEVID_PE10K_PF1		0xA001

#define CSIO_DEVID_T440DBG_FCOE		0x4600

#define CSIO_DEVID_T420CR_FCOE		0x4601

#define CSIO_DEVID_T422CR_FCOE		0x4602

#define CSIO_DEVID_T440CR_FCOE		0x4603

#define CSIO_DEVID_T420BCH_FCOE		0x4604

#define CSIO_DEVID_T440BCH_FCOE		0x4605

#define CSIO_DEVID_T440CH_FCOE		0x4606

#define CSIO_DEVID_T420SO_FCOE		0x4607

#define CSIO_DEVID_T420CX_FCOE		0x4608

#define CSIO_DEVID_T420BT_FCOE		0x4609

#define CSIO_DEVID_T404BT_FCOE		0x460A

#define CSIO_DEVID_B420_FCOE		0x460B

#define CSIO_DEVID_B404_FCOE		0x460C

#define CSIO_DEVID_T480CR_FCOE		0x460D

#define CSIO_DEVID_T440LPCR_FCOE	0x460E



extern struct fc_function_template csio_fc_transport_funcs;

extern struct fc_function_template csio_fc_transport_funcs;

extern struct fc_function_template csio_fc_transport_vport_funcs;

extern struct fc_function_template csio_fc_transport_vport_funcs;
@@ -100,6 +75,10 @@ struct csio_lnode *csio_shost_init(struct csio_hw *, struct device *, bool, 
void csio_shost_exit(struct csio_lnode *);

void csio_shost_exit(struct csio_lnode *);

void csio_lnodes_exit(struct csio_hw *, bool);

void csio_lnodes_exit(struct csio_hw *, bool);





/* DebugFS helper routines */

void csio_add_debugfs_mem(struct csio_hw *, const char *,

		unsigned int, unsigned int);



static inline struct Scsi_Host *

static inline struct Scsi_Host *

csio_ln_to_shost(struct csio_lnode *ln)

csio_ln_to_shost(struct csio_lnode *ln)

{

{