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

Commit ba856d32 authored by Eric Moore's avatar Eric Moore Committed by James Bottomley
Browse files

[SCSI] mptfusion: misc fix's 



* removing obsolete 1066, 1066E from Kconfig
* initializing aen_event_read_flag after host reset
* remove oem references
* remove obsolete mpt_pq_filter command line option

Signed-off-by: default avatarEric Moore <Eric.Moore@lsil.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 0ccdb007

drivers/message/fusion/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -48,10 +48,8 @@ config FUSION_SAS 
	  List of supported controllers:



	  LSISAS1064

	  LSISAS1066

	  LSISAS1068

	  LSISAS1064E

	  LSISAS1066E

	  LSISAS1068E



config FUSION_MAX_SGE

drivers/message/fusion/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
#EXTRA_CFLAGS += -DMPT_DEBUG_EXIT

#EXTRA_CFLAGS += -DMPT_DEBUG_FAIL





#

# driver/module specifics...

#

drivers/message/fusion/mptbase.c

+4 −3
Original line number Diff line number Diff line
@@ -1054,9 +1054,8 @@ mpt_host_page_alloc(MPT_ADAPTER *ioc, pIOCInit_t ioc_init) 


				dinitprintk((MYIOC_s_INFO_FMT

				    "host_page_buffer @ %p, dma @ %x, sz=%d bytes\n",

				    ioc->name,

				    ioc->HostPageBuffer,

				    ioc->HostPageBuffer_dma,

				    ioc->name, ioc->HostPageBuffer,

				    (u32)ioc->HostPageBuffer_dma,

				    host_page_buffer_sz));

				ioc->alloc_total += host_page_buffer_sz;

				ioc->HostPageBuffer_sz = host_page_buffer_sz;
@@ -1378,6 +1377,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id) 
		printk(KERN_WARNING MYNAM

		  ": WARNING - %s did not initialize properly! (%d)\n",

		  ioc->name, r);



		list_del(&ioc->list);

		if (ioc->alt_ioc)

			ioc->alt_ioc->alt_ioc = NULL;
@@ -2668,6 +2668,7 @@ SendIocInit(MPT_ADAPTER *ioc, int sleepFlag) 
	dinitprintk((MYIOC_s_INFO_FMT "INFO - Wait IOC_OPERATIONAL state (cnt=%d)\n",

			ioc->name, count));



	ioc->aen_event_read_flag=0;

	return r;

}

drivers/message/fusion/mptbase.h

+0 −1
Original line number Diff line number Diff line
@@ -981,7 +981,6 @@ typedef struct _MPT_SCSI_HOST { 
	wait_queue_head_t	  scandv_waitq;

	int			  scandv_wait_done;

	long			  last_queue_full;

	u8			  mpt_pq_filter;

	u16			  tm_iocstatus;

} MPT_SCSI_HOST;

drivers/message/fusion/mptctl.c

+2 −2
Original line number Diff line number Diff line
@@ -2332,7 +2332,7 @@ mptctl_do_mpt_command (struct mpt_ioctl_command karg, void __user *mfPtr) 
}



/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/

/* Prototype Routine for the HP HOST INFO command.

/* Prototype Routine for the HOST INFO command.

 *

 * Outputs:	None.

 * Return:	0 if successful
@@ -2568,7 +2568,7 @@ mptctl_hp_hostinfo(unsigned long arg, unsigned int data_size) 
}



/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/

/* Prototype Routine for the HP TARGET INFO command.

/* Prototype Routine for the TARGET INFO command.

 *

 * Outputs:	None.

 * Return:	0 if successful