diff options
| author | Xiangliang Yu <yuxiangl@marvell.com> | 2011-05-24 22:33:11 +0800 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2011-07-26 10:34:13 +0400 |
| commit | 8882f081329a82737b7471b97e59ce8c407f6655 (patch) | |
| tree | d65c5653d4d033c65c6c837002dba4463ef90de1 /drivers/scsi/mvsas/mv_sas.h | |
| parent | 83c7b61cf49c2659829050fec240601415c7f9d9 (diff) | |
| download | linux-8882f081329a82737b7471b97e59ce8c407f6655.tar.gz linux-8882f081329a82737b7471b97e59ce8c407f6655.tar.bz2 linux-8882f081329a82737b7471b97e59ce8c407f6655.zip | |
[SCSI] mvsas: fix 94xx hotplug issue
Fix 94xx A0/B0 revision hotplug issue.
Remove unused macro: DISABLE_HOTPLUG_DMA_FIX
Signed-off-by: Xiangliang Yu <yuxiangl@marvell.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/mvsas/mv_sas.h')
| -rw-r--r-- | drivers/scsi/mvsas/mv_sas.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/scsi/mvsas/mv_sas.h b/drivers/scsi/mvsas/mv_sas.h index 089ef1ef3865..5cfa4cc18f2d 100644 --- a/drivers/scsi/mvsas/mv_sas.h +++ b/drivers/scsi/mvsas/mv_sas.h @@ -168,9 +168,8 @@ struct mvs_dispatch { ); int (*spi_issuecmd)(struct mvs_info *mvi, u32 cmd); int (*spi_waitdataready)(struct mvs_info *mvi, u32 timeout); -#ifndef DISABLE_HOTPLUG_DMA_FIX - void (*dma_fix)(dma_addr_t buf_dma, int buf_len, int from, void *prd); -#endif + void (*dma_fix)(struct mvs_info *mvi, u32 phy_mask, + int buf_len, int from, void *prd); void (*tune_interrupt)(struct mvs_info *mvi, u32 time); void (*non_spec_ncq_error)(struct mvs_info *mvi); @@ -409,11 +408,11 @@ struct mvs_info { void *addon; struct hba_info_page hba_info_param; struct mvs_device devices[MVS_MAX_DEVICES]; -#ifndef DISABLE_HOTPLUG_DMA_FIX void *bulk_buffer; dma_addr_t bulk_buffer_dma; + void *bulk_buffer1; + dma_addr_t bulk_buffer_dma1; #define TRASH_BUCKET_SIZE 0x20000 -#endif void *dma_pool; struct mvs_slot_info slot_info[0]; }; |