remove scsi_merge.c
PATCH 1/1 remove scsi_merge.c
In 2.5.44 it contains only two functions, that both have exactly one caller in other files and both are entirely unrelated to request merging..
drivers/scsi/Makefile +2 -2
@@ -122,8 +122,8 @@ obj-$(CONFIG_CHR_DEV_SG) += sg.o scsi_mod-objs := scsi.o hosts.o scsi_ioctl.o constants.o scsicam.o \ - scsi_proc.o scsi_error.o scsi_lib.o scsi_merge.o \ - scsi_scan.o scsi_syms.o + scsi_proc.o scsi_error.o scsi_lib.o scsi_scan.o \ + scsi_syms.o sd_mod-objs := sd.o sr_mod-objs := sr.o sr_ioctl.o sr_vendor.o
drivers/scsi/scsi.h +0 -14
@@ -446,20 +446,6 @@void scsi_free_sgtable (struct scatterlist *sgl,int index);/* -* Prototypes for functions in scsi_dma.c -*/ -void scsi_resize_dma_pool (void ); -int scsi_init_minimal_dma_pool (void ); -void *scsi_malloc (unsigned int ); -int scsi_free (void *,unsigned int ); - -/* -* Prototypes for functions in scsi_merge.c -*/ -extern void scsi_initialize_merge_fn (Scsi_Device *SDpnt); -extern int scsi_init_io (Scsi_Cmnd *SCpnt); - -/* * Prototypes for functions in scsi_lib.c */ extern int scsi_maybe_unblock_host (Scsi_Device * SDpnt);
drivers/scsi/scsi_lib.c +86 -0
92 lines not on this page · raw message
drivers/scsi/scsi_merge.c +0 -168
168 lines not on this page · raw message
drivers/scsi/scsi_scan.c +29 -0
@@ -483,6 +483,35 @@ }/** +* scsi_initialize_merge_fn() -Æ£initialize merge function for a host +* @sd: host descriptor +*/ +static void scsi_initialize_merge_fn (struct scsi_device *sd) +{ +request_queue_t *q = &sd->request_queue; +struct Scsi_Host *sh = sd->host; +u64 bounce_limit; + +if (sh->highmem_io) { +if (sh->pci_dev &&PCI_DMA_BUS_IS_PHYS ) { + bounce_limit = sh->pci_dev->dma_mask; + }else { +/* +* Platforms with virtual-DMA translation +* hardware have no practical limit. +*/ + bounce_limit =BLK_BOUNCE_ANY ; + } + }else if (sh->unchecked_isa_dma) { + bounce_limit =BLK_BOUNCE_ISA ; + }else { + bounce_limit =BLK_BOUNCE_HIGH ; + } + +blk_queue_bounce_limit (q, bounce_limit); +} + +/** * scsi_alloc_sdev - allocate and setup a Scsi_Device * * Description:
-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html