diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 13:01:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 13:01:30 -0800 |
| commit | dd397a6d1ae125686d97a20f983778c331093206 (patch) | |
| tree | 2491fcd5d0c50ff72de2668439f12de55928cae8 /drivers/scsi | |
| parent | 976fd0e29cb1647bf59f939f81a22eba55c2bf0c (diff) | |
| parent | ccf352894ceef79d40d015e1deee4c46c3aa42ed (diff) | |
| download | linux-3.10-dd397a6d1ae125686d97a20f983778c331093206.tar.gz linux-3.10-dd397a6d1ae125686d97a20f983778c331093206.tar.bz2 linux-3.10-dd397a6d1ae125686d97a20f983778c331093206.zip | |
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.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c index 8f6b5bf580f..2b5b8a93bc1 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) { struct gendisk *disk = inode->i_bdev->bd_disk; struct ide_scsi_obj *scsi; - ide_drive_t *drive; if (!(scsi = ide_scsi_get(disk))) return -ENXIO; - drive = scsi->drive; - - drive->usage++; - return 0; } @@ -817,9 +812,6 @@ static int idescsi_ide_release(struct inode *inode, struct file *filp) { struct gendisk *disk = inode->i_bdev->bd_disk; struct ide_scsi_obj *scsi = ide_scsi_g(disk); - ide_drive_t *drive = scsi->drive; - - drive->usage--; ide_scsi_put(scsi); |