* [PATCH 07/14] drivers/scsi: Removing undead ifdef __ISAPNP__
[not found] <cover.1283782698.git.qy03fugy@stud.informatik.uni-erlangen.de>
@ 2010-09-06 14:36 ` Christian Dietrich
2010-09-06 14:36 ` [PATCH 08/14] drivers/scsi: Removing undead ifdef CONFIG_PCI Christian Dietrich
2010-09-06 14:36 ` [PATCH 09/14] drivers/scsi: Removing undead ifdef REAL_DMA Christian Dietrich
2 siblings, 0 replies; 3+ messages in thread
From: Christian Dietrich @ 2010-09-06 14:36 UTC (permalink / raw)
To: Juergen E. Fischer, James E.J. Bottomley, Tejun Heo, linux-scsi,
linux-kernel
Cc: vamos-dev
The __ISAPNP__ ifdef isn't necessary at this point, because it is
checked in an outer ifdef level already and has no effect here.
Signed-off-by: Christian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de>
---
drivers/scsi/aha152x.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c
index 8eab858..08f59da 100644
--- a/drivers/scsi/aha152x.c
+++ b/drivers/scsi/aha152x.c
@@ -3806,9 +3806,7 @@ static int __init aha152x_init(void)
#if defined(AHA152X_DEBUG)
setup[setup_count].debug = DEBUG_DEFAULT;
#endif
-#if defined(__ISAPNP__)
pnpdev[setup_count] = dev;
-#endif
printk (KERN_INFO
"aha152x: found ISAPnP adapter at io=0x%03x, irq=%d\n",
setup[setup_count].io_port, setup[setup_count].irq);
--
1.7.0.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 08/14] drivers/scsi: Removing undead ifdef CONFIG_PCI
[not found] <cover.1283782698.git.qy03fugy@stud.informatik.uni-erlangen.de>
2010-09-06 14:36 ` [PATCH 07/14] drivers/scsi: Removing undead ifdef __ISAPNP__ Christian Dietrich
@ 2010-09-06 14:36 ` Christian Dietrich
2010-09-06 14:36 ` [PATCH 09/14] drivers/scsi: Removing undead ifdef REAL_DMA Christian Dietrich
2 siblings, 0 replies; 3+ messages in thread
From: Christian Dietrich @ 2010-09-06 14:36 UTC (permalink / raw)
To: James E.J. Bottomley, linux-scsi, linux-kernel; +Cc: vamos-dev
The CONFIG_PCI ifdef isn't necessary at this point, because it is
checked in an outer ifdef level already and has no effect here.
Signed-off-by: Christian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de>
---
drivers/scsi/aic7xxx_old.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/aic7xxx_old.c b/drivers/scsi/aic7xxx_old.c
index 93984c9..c0953be 100644
--- a/drivers/scsi/aic7xxx_old.c
+++ b/drivers/scsi/aic7xxx_old.c
@@ -9655,9 +9655,7 @@ aic7xxx_detect(struct scsi_host_template *template)
found++;
continue;
skip_pci_controller:
-#ifdef CONFIG_PCI
pci_release_regions(temp_p->pdev);
-#endif
kfree(temp_p);
} /* Found an Adaptec PCI device. */
else /* Well, we found one, but we couldn't get any memory */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 09/14] drivers/scsi: Removing undead ifdef REAL_DMA
[not found] <cover.1283782698.git.qy03fugy@stud.informatik.uni-erlangen.de>
2010-09-06 14:36 ` [PATCH 07/14] drivers/scsi: Removing undead ifdef __ISAPNP__ Christian Dietrich
2010-09-06 14:36 ` [PATCH 08/14] drivers/scsi: Removing undead ifdef CONFIG_PCI Christian Dietrich
@ 2010-09-06 14:36 ` Christian Dietrich
2 siblings, 0 replies; 3+ messages in thread
From: Christian Dietrich @ 2010-09-06 14:36 UTC (permalink / raw)
To: James E.J. Bottomley, Tejun Heo, linux-scsi, linux-kernel; +Cc: vamos-dev
The REAL_DMA ifdef isn't necessary at this point, because it is
checked in an outer ifdef level already and has no effect here.
Signed-off-by: Christian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de>
---
drivers/scsi/atari_NCR5380.c | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/drivers/scsi/atari_NCR5380.c b/drivers/scsi/atari_NCR5380.c
index 158ebc3..7edec2d 100644
--- a/drivers/scsi/atari_NCR5380.c
+++ b/drivers/scsi/atari_NCR5380.c
@@ -1942,9 +1942,7 @@ static int NCR5380_transfer_dma(struct Scsi_Host *instance,
NCR5380_write(TARGET_COMMAND_REG, PHASE_SR_TO_TCR(p));
-#ifdef REAL_DMA
NCR5380_write(MODE_REG, MR_BASE | MR_DMA_MODE | MR_ENABLE_EOP_INTR | MR_MONITOR_BSY);
-#endif /* def REAL_DMA */
if (IS_A_TT()) {
/* On the Medusa, it is a must to initialize the DMA before
@@ -2101,16 +2099,12 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)
cmd->scsi_done(cmd);
/* XXX - need to source or sink data here, as appropriate */
} else {
-#ifdef REAL_DMA
/* ++roman: When using real DMA,
* information_transfer() should return after
* starting DMA since it has nothing more to
* do.
*/
return;
-#else
- cmd->SCp.this_residual -= transfersize - len;
-#endif
}
} else
#endif /* defined(REAL_DMA) */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 3+ messages in thread