aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-12-03 11:25:58 -0500
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-12-03 11:25:58 -0500
commitf9288e1525e1cca59fdca56463ad9f5a6625dffe (patch)
tree25300a64beae342610094a46c59ae43e921b5219 /drivers/ide
parentde9e80577f1409782c8f54e08fa6beef9f91e810 (diff)
sl82c105: remove no longer needed debugging code
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/sl82c105.c24
1 files changed, 1 insertions, 23 deletions
diff --git a/drivers/ide/sl82c105.c b/drivers/ide/sl82c105.c
index d698da470d6f..3c2bbf0057ea 100644
--- a/drivers/ide/sl82c105.c
+++ b/drivers/ide/sl82c105.c
@@ -24,13 +24,6 @@
24 24
25#define DRV_NAME "sl82c105" 25#define DRV_NAME "sl82c105"
26 26
27#undef DEBUG
28
29#ifdef DEBUG
30#define DBG(arg) printk arg
31#else
32#define DBG(fmt,...)
33#endif
34/* 27/*
35 * SL82C105 PCI config register 0x40 bits. 28 * SL82C105 PCI config register 0x40 bits.
36 */ 29 */
@@ -104,9 +97,6 @@ static void sl82c105_set_dma_mode(ide_drive_t *drive, const u8 speed)
104 unsigned long timings = (unsigned long)ide_get_drivedata(drive); 97 unsigned long timings = (unsigned long)ide_get_drivedata(drive);
105 u16 drv_ctrl; 98 u16 drv_ctrl;
106 99
107 DBG(("sl82c105_tune_chipset(drive:%s, speed:%s)\n",
108 drive->name, ide_xfer_verbose(speed)));
109
110 drv_ctrl = mwdma_timings[speed - XFER_MW_DMA_0]; 100 drv_ctrl = mwdma_timings[speed - XFER_MW_DMA_0];
111 101
112 /* 102 /*
@@ -196,8 +186,6 @@ static void sl82c105_dma_start(ide_drive_t *drive)
196 struct pci_dev *dev = to_pci_dev(hwif->dev); 186 struct pci_dev *dev = to_pci_dev(hwif->dev);
197 int reg = 0x44 + drive->dn * 4; 187 int reg = 0x44 + drive->dn * 4;
198 188
199 DBG(("%s(drive:%s)\n", __func__, drive->name));
200
201 pci_write_config_word(dev, reg, 189 pci_write_config_word(dev, reg,
202 (unsigned long)ide_get_drivedata(drive) >> 16); 190 (unsigned long)ide_get_drivedata(drive) >> 16);
203 191
@@ -209,8 +197,6 @@ static void sl82c105_dma_clear(ide_drive_t *drive)
209{ 197{
210 struct pci_dev *dev = to_pci_dev(drive->hwif->dev); 198 struct pci_dev *dev = to_pci_dev(drive->hwif->dev);
211 199
212 DBG(("sl82c105_dma_clear(drive:%s)\n", drive->name));
213
214 sl82c105_reset_host(dev); 200 sl82c105_reset_host(dev);
215} 201}
216 202
@@ -218,11 +204,7 @@ static int sl82c105_dma_end(ide_drive_t *drive)
218{ 204{
219 struct pci_dev *dev = to_pci_dev(drive->hwif->dev); 205 struct pci_dev *dev = to_pci_dev(drive->hwif->dev);
220 int reg = 0x44 + drive->dn * 4; 206 int reg = 0x44 + drive->dn * 4;
221 int ret; 207 int ret = ide_dma_end(drive);
222
223 DBG(("%s(drive:%s)\n", __func__, drive->name));
224
225 ret = ide_dma_end(drive);
226 208
227 pci_write_config_word(dev, reg, 209 pci_write_config_word(dev, reg,
228 (unsigned long)ide_get_drivedata(drive)); 210 (unsigned long)ide_get_drivedata(drive));
@@ -239,8 +221,6 @@ static void sl82c105_resetproc(ide_drive_t *drive)
239 struct pci_dev *dev = to_pci_dev(drive->hwif->dev); 221 struct pci_dev *dev = to_pci_dev(drive->hwif->dev);
240 u32 val; 222 u32 val;
241 223
242 DBG(("sl82c105_resetproc(drive:%s)\n", drive->name));
243
244 pci_read_config_dword(dev, 0x40, &val); 224 pci_read_config_dword(dev, 0x40, &val);
245 val |= (CTRL_P1F16 | CTRL_P0F16); 225 val |= (CTRL_P1F16 | CTRL_P0F16);
246 pci_write_config_dword(dev, 0x40, val); 226 pci_write_config_dword(dev, 0x40, val);
@@ -291,8 +271,6 @@ static int init_chipset_sl82c105(struct pci_dev *dev)
291{ 271{
292 u32 val; 272 u32 val;
293 273
294 DBG(("init_chipset_sl82c105()\n"));
295
296 pci_read_config_dword(dev, 0x40, &val); 274 pci_read_config_dword(dev, 0x40, &val);
297 val |= CTRL_P0EN | CTRL_P0F16 | CTRL_P1F16; 275 val |= CTRL_P0EN | CTRL_P0F16 | CTRL_P1F16;
298 pci_write_config_dword(dev, 0x40, val); 276 pci_write_config_dword(dev, 0x40, val);