aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-19 16:01:30 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-19 16:01:30 -0500
commitdd397a6d1ae125686d97a20f983778c331093206 (patch)
tree2491fcd5d0c50ff72de2668439f12de55928cae8 /drivers/scsi
parent976fd0e29cb1647bf59f939f81a22eba55c2bf0c (diff)
parentccf352894ceef79d40d015e1deee4c46c3aa42ed (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6: (30 commits) ide: make ide_hwif_t.ide_dma_host_on void (v2) ide: make ide_hwif_t.ide_dma_{host_off,off_quietly} void (v2) ide: add ide_set_dma() helper (v2) sgiioc4: fix sgiioc4_ide_dma_check() to enable/disable DMA properly ide: disable DMA in ->ide_dma_check for "no IORDY" case (v2) ide: convert ide_hwif_t.mmio into flag (v2) ide: use PIO/MMIO operations directly where possible (v2) ide: add ide_use_fast_pio() helper (v3) ide: unexport ide_set_xfer_rate() (v2) ide: remove ide_drive_t.usage ide: remove ide_pci_device_t tables with only one entry ide: remove write-only ide_hwif_t.no_dsc flag ide: remove write-only ide_pio_data_t.blacklisted sis5513: sis5513_config_xfer_rate() cleanup piix: cleanup svwks: small cleanup cs5530: small cleanup hpt366: remove redundant check from init_dma_hpt366() trm290: remove redundant CONFIG_BLK_DEV_IDEDMA #ifdef-s au1xxx-ide: remove dead code ...
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/ide-scsi.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
index 8f6b5bf580f6..2b5b8a93bc10 100644
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
@@ -801,15 +801,10 @@ static int idescsi_ide_open(struct inode *inode, struct file *filp)
801{ 801{
802 struct gendisk *disk = inode->i_bdev->bd_disk; 802 struct gendisk *disk = inode->i_bdev->bd_disk;
803 struct ide_scsi_obj *scsi; 803 struct ide_scsi_obj *scsi;
804 ide_drive_t *drive;
805 804
806 if (!(scsi = ide_scsi_get(disk))) 805 if (!(scsi = ide_scsi_get(disk)))
807 return -ENXIO; 806 return -ENXIO;
808 807
809 drive = scsi->drive;
810
811 drive->usage++;
812
813 return 0; 808 return 0;
814} 809}
815 810
@@ -817,9 +812,6 @@ static int idescsi_ide_release(struct inode *inode, struct file *filp)
817{ 812{
818 struct gendisk *disk = inode->i_bdev->bd_disk; 813 struct gendisk *disk = inode->i_bdev->bd_disk;
819 struct ide_scsi_obj *scsi = ide_scsi_g(disk); 814 struct ide_scsi_obj *scsi = ide_scsi_g(disk);
820 ide_drive_t *drive = scsi->drive;
821
822 drive->usage--;
823 815
824 ide_scsi_put(scsi); 816 ide_scsi_put(scsi);
825 817