ide-2.6 update

Kill most of /proc/ide/<chipset> bloat.

Please do a

	bk pull bk://bart.bkbits.net/ide-2.6

This will update the following files:

 drivers/ide/pci/aec62xx.c      |  110 --------------------------
 drivers/ide/pci/aec62xx.h      |    2 
 drivers/ide/pci/atiixp.c       |  118 ----------------------------
 drivers/ide/pci/cs5520.c       |   74 +-----------------
 drivers/ide/pci/cs5530.c       |   58 --------------
 drivers/ide/pci/hpt366.c       |   72 -----------------
 drivers/ide/pci/hpt366.h       |    2 
 drivers/ide/pci/pdc202xx_new.c |   64 ---------------
 drivers/ide/pci/pdc202xx_new.h |    2 
 drivers/ide/pci/pdc202xx_old.c |  130 -------------------------------
 drivers/ide/pci/pdc202xx_old.h |   37 ---------
 drivers/ide/pci/piix.c         |  167 ----------------------------------------
 drivers/ide/pci/piix.h         |    4 
 drivers/ide/pci/sc1200.c       |   65 ---------------
 drivers/ide/pci/serverworks.c  |  168 -----------------------------------------
 drivers/ide/pci/serverworks.h  |    2 
 drivers/ide/pci/slc90e66.c     |  111 ---------------------------
 17 files changed, 12 insertions(+), 1174 deletions(-)

through these ChangeSets:

<bzolnier@trik.(none)> (04/10/23 1.2039)
[ide] slc90e66: kill /proc/ide/slc90e66

<bzolnier@trik.(none)> (04/10/23 1.2038)
[ide] serverworks: kill /proc/ide/svwks

<bzolnier@trik.(none)> (04/10/23 1.2037)
[ide] sc1200: kill /proc/ide/sc1200

<bzolnier@trik.(none)> (04/10/23 1.2036)
[ide] piix: kill /proc/ide/piix

<bzolnier@trik.(none)> (04/10/23 1.2035)
[ide] pdc202xx_old: kill /proc/ide/pdc202xx

<bzolnier@trik.(none)> (04/10/23 1.2034)
[ide] pdc202xx_new: kill /proc/ide/pdcnew

<bzolnier@trik.(none)> (04/10/23 1.2033)
[ide] hpt366: kill /proc/ide/hpt366

<bzolnier@trik.(none)> (04/10/23 1.2032)
[ide] cs5530: kill /proc/ide/cs5530

<bzolnier@trik.(none)> (04/10/23 1.2031)
[ide] cs5520: kill /proc/ide/cs5520

<bzolnier@trik.(none)> (04/10/23 1.2030)
[ide] atiixp: kill /proc/ide/atiixp

<bzolnier@trik.(none)> (04/10/23 1.2029)
[ide] aec62xx: kill /proc/ide/aec62xx

diff -Nru a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c
@@ -18,52 +18,7 @@
 
 #include "aec62xx.h"
 
-#if defined(DISPLAY_AEC62XX_TIMINGS) && defined(CONFIG_PROC_FS)
-#include <linux/stat.h>
-#include <linux/proc_fs.h>
-
-static u8 aec62xx_proc = 0;
-
-#define AEC_MAX_DEVS		5
-
-static struct pci_dev *aec_devs[AEC_MAX_DEVS];
-static int n_aec_devs;
-
-static int aec62xx_get_info (char *buffer, char **addr, off_t offset,

int count)
-{
- char *p = buffer;
- char *chipset_nums[] = {"error", "error", "error", "error",
- "error", "error", "850UF", "860",
- "860R", "865", "865R", "error" };
- int len;
- int i;
-
- for (i = 0; i < n_aec_devs; i++) {
- struct pci_dev *dev = aec_devs[i];
- unsigned long iobase = pci_resource_start(dev, 4);
- u8 c0 = 0, c1 = 0, art = 0;
-
- c0 = inb(iobase + 0x02);
- c1 = inb(iobase + 0x0a);
-
- p += sprintf(p, "\nController: %d\n", i);
- p += sprintf(p, "Chipset: AEC%s\n", chipset_nums[dev->device]);
-
- p += sprintf(p, "--------------- Primary Channel "
- "---------------- Secondary Channel "
- "-------------\n");
- (void) pci_read_config_byte(dev, 0x4a, &art);
- p += sprintf(p, " %sabled ",
- (art&0x02)?" en":"dis");
- p += sprintf(p, " %sabled\n",
- (art&0x04)?" en":"dis");
- p += sprintf(p, "--------------- drive0 --------- drive1 "
- "-------- drive0 ---------- drive1 ------\n");
- p += sprintf(p, "DMA enabled: %s %s ",
- (c0&0x20)?"yes":"no ",(c0&0x40)?"yes":"no ");
- p += sprintf(p, " %s %s\n",
- (c1&0x20)?"yes":"no ",(c1&0x40)?"yes":"no ");
-
+#if 0
if (dev->device == PCI_DEVICE_ID_ARTOP_ATP850UF) {
(void) pci_read_config_byte(dev, 0x54, &art);
p += sprintf(p, "DMA Mode: %s(%s)",
@@ -79,59 +34,7 @@
(c1&0x40)?((art&0xc0)?"UDMA":" DMA"):" PIO", (art&0x80)?"2":(art&0x40)?"1":"0");
} else {
- /*
- * case PCI_DEVICE_ID_ARTOP_ATP860:
- * case PCI_DEVICE_ID_ARTOP_ATP860R:
- * case PCI_DEVICE_ID_ARTOP_ATP865:
- * case PCI_DEVICE_ID_ARTOP_ATP865R:
- */
- (void) pci_read_config_byte(dev, 0x44, &art);
- p += sprintf(p, "DMA Mode: %s(%s)",
- (c0&0x20)?((art&0x07)?"UDMA":" DMA"):" PIO",
- ((art&0x07)==0x07)?"6":
- ((art&0x06)==0x06)?"5":
- ((art&0x05)==0x05)?"4":
- ((art&0x04)==0x04)?"3":
- ((art&0x03)==0x03)?"2":
- ((art&0x02)==0x02)?"1":
- ((art&0x01)==0x01)?"0":"?");
- p += sprintf(p, " %s(%s)",
- (c0&0x40)?((art&0x70)?"UDMA":" DMA"):" PIO",
- ((art&0x70)==0x70)?"6":
- ((art&0x60)==0x60)?"5":
- ((art&0x50)==0x50)?"4":
- ((art&0x40)==0x40)?"3":
- ((art&0x30)==0x30)?"2":
- ((art&0x20)==0x20)?"1":
- ((art&0x10)==0x10)?"0":"?");
- (void) pci_read_config_byte(dev, 0x45, &art);
- p += sprintf(p, " %s(%s)",
- (c1&0x20)?((art&0x07)?"UDMA":" DMA"):" PIO",
- ((art&0x07)==0x07)?"6":
- ((art&0x06)==0x06)?"5":
- ((art&0x05)==0x05)?"4":
- ((art&0x04)==0x04)?"3":
- ((art&0x03)==0x03)?"2":
- ((art&0x02)==0x02)?"1":
- ((art&0x01)==0x01)?"0":"?");
- p += sprintf(p, " %s(%s)\n",
- (c1&0x40)?((art&0x70)?"UDMA":" DMA"):" PIO",
- ((art&0x70)==0x70)?"6":
- ((art&0x60)==0x60)?"5":
- ((art&0x50)==0x50)?"4":
- ((art&0x40)==0x40)?"3":
- ((art&0x30)==0x30)?"2":
- ((art&0x20)==0x20)?"1":
- ((art&0x10)==0x10)?"0":"?");
- }
- }
- /* p - buffer must be less than 4k! */
- len = (p - buffer) - offset;
- *addr = buffer + offset;
-
- return len > count ? count : len;
-}
-#endif /* defined(DISPLAY_AEC62xx_TIMINGS) && defined(CONFIG_PROC_FS) */
+#endif

/*
* TO DO: active tuning and correction of cards without a bios.
@@ -374,15 +277,6 @@
pci_write_config_dword(dev, PCI_ROM_ADDRESS,
dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE);
printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name,
dev->resource[PCI_ROM_RESOURCE].start);
}
-
-#if defined(DISPLAY_AEC62XX_TIMINGS) && defined(CONFIG_PROC_FS)
- aec_devs[n_aec_devs++] = dev;
-
- if (!aec62xx_proc) {
- aec62xx_proc = 1;
- ide_pci_create_host_proc("aec62xx", aec62xx_get_info);
- }
-#endif /* DISPLAY_AEC62XX_TIMINGS && CONFIG_PROC_FS */

if (bus_speed <= 33)
pci_set_drvdata(dev, (void *) aec6xxx_33_base);

diff -Nru a/drivers/ide/pci/aec62xx.h b/drivers/ide/pci/aec62xx.h
@@ -5,8 +5,6 @@
 #include <linux/pci.h>
 #include <linux/ide.h>
 
-#define DISPLAY_AEC62XX_TIMINGS
-
 struct chipset_bus_clock_list_entry {
 	byte		xfer_speed;
 	byte		chipset_settings;

*dev, const char *name)
-{
-#if defined(DISPLAY_ATIIXP_TIMINGS) && defined(CONFIG_PROC_FS)
- if (!atiixp_proc) {
- atiixp_proc = 1;
- bmide_dev = dev;
- ide_pci_create_host_proc("atiixp", atiixp_get_info);
- }
-#endif /* DISPLAY_ATIIXP_TIMINGS && CONFIG_PROC_FS */
- return 0;
-}
-
-/**
* init_hwif_atiixp - fill in the hwif for the ATIIXP
* @hwif: IDE interface
*
@@ -459,7 +342,6 @@
static ide_pci_device_t atiixp_pci_info[] __devinitdata = {
{ /* 0 */
.name = "ATIIXP",
- .init_chipset = init_chipset_atiixp,
.init_hwif = init_hwif_atiixp,
.channels = 2,
.autodma = AUTODMA,

*dev, const char *name)
-{
-#if defined(DISPLAY_CS5520_TIMINGS) && defined(CONFIG_PROC_FS)
- if (!cs5520_proc) {
- cs5520_proc = 1;
- bmide_dev = dev;
- ide_pci_create_host_proc("cs5520", cs5520_get_info);
- }
-#endif /* DISPLAY_CS5520_TIMINGS && CONFIG_PROC_FS */
- return 0;
-}

/*
* We provide a callback for our nonstandard DMA location
@@ -255,7 +193,6 @@
#define DECLARE_CS_DEV(name_str) \
{ \
.name = name_str, \
- .init_chipset = init_chipset_cs5520, \
.init_setup_dma = cs5520_init_setup_dma, \
.init_hwif = init_hwif_cs5520, \
.channels = 2, \
@@ -294,7 +231,6 @@
printk(KERN_WARNING "cs5520: No suitable DMA available.\n"); return -ENODEV;
}
- init_chipset_cs5520(dev, d->name);

index.all = 0xf0f0;

!= NULL) {

diff -Nru a/drivers/ide/pci/hpt366.h b/drivers/ide/pci/hpt366.h
@@ -5,8 +5,6 @@
 #include <linux/pci.h>
 #include <linux/ide.h>
 
-#define DISPLAY_HPT366_TIMINGS
-
 /* various tuning parameters */
 #define HPT_RESET_STATE_ENGINE
 #undef HPT_DELAY_INTERRUPT

diff -Nru a/drivers/ide/pci/pdc202xx_new.h b/drivers/ide/pci/pdc202xx_new.h
@@ -43,8 +43,6 @@
 		set_2regs(0x13,(c));			\
 	} while(0)
 
-#define DISPLAY_PDC202XX_TIMINGS
-
 static void init_setup_pdcnew(struct pci_dev *, ide_pci_device_t *);
 static void init_setup_pdc20270(struct pci_dev *, ide_pci_device_t *);
 static void init_setup_pdc20276(struct pci_dev *dev, ide_pci_device_t *d);

offset, int count)
-{
- char *p = buffer;
- int i, len;
-
- for (i = 0; i < n_pdc202_devs; i++) {
- struct pci_dev *dev = pdc202_devs[i];
- p = pdc202xx_info(buffer, dev);
- }
- /* p - buffer must be less than 4k! */
- len = (p - buffer) - offset;
- *addr = buffer + offset;
-
- return len > count ? count : len;
-}
-#endif /* defined(DISPLAY_PDC202XX_TIMINGS) && defined(CONFIG_PROC_FS) */ -

static u8 pdc202xx_ratemask (ide_drive_t *drive)
{
@@ -546,11 +429,13 @@
u8 sc1d = hwif->INB((high_16 + 0x001d));

if (hwif->channel) {
+ /* bit7: Error, bit6: Interrupting, bit5: FIFO Full, bit4: FIFO Empty */
if ((sc1d & 0x50) == 0x50)
goto somebody_else;
else if ((sc1d & 0x40) == 0x40)
return (dma_stat & 4) == 4;
} else {
+ /* bit3: Error, bit2: Interrupting, bit1: FIFO Full, bit0: FIFO Empty */
if ((sc1d & 0x05) == 0x05)
goto somebody_else;
else if ((sc1d & 0x04) == 0x04)
@@ -667,15 +552,6 @@
printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n",
name, dev->resource[PCI_ROM_RESOURCE].start);
}
-
-#if defined(DISPLAY_PDC202XX_TIMINGS) && defined(CONFIG_PROC_FS)
- pdc202_devs[n_pdc202_devs++] = dev;
-
- if (!pdc202xx_proc) {
- pdc202xx_proc = 1;
- ide_pci_create_host_proc("pdc202xx", pdc202xx_get_info);
- }
-#endif /* DISPLAY_PDC202XX_TIMINGS && CONFIG_PROC_FS */

/*
* software reset - this is required because the bios

diff -Nru a/drivers/ide/pci/pdc202xx_old.h b/drivers/ide/pci/pdc202xx_old.h
@@ -23,41 +23,6 @@
 	NULL
 };
 
-static inline u8 *pdc202xx_pio_verbose (u32 drive_pci)
-{
-	if ((drive_pci & 0x000ff000) == 0x000ff000) return("NOTSET");
-	if ((drive_pci & 0x00000401) == 0x00000401) return("PIO 4");
-	if ((drive_pci & 0x00000602) == 0x00000602) return("PIO 3");
-	if ((drive_pci & 0x00000803) == 0x00000803) return("PIO 2");
-	if ((drive_pci & 0x00000C05) == 0x00000C05) return("PIO 1");
-	if ((drive_pci & 0x00001309) == 0x00001309) return("PIO 0");
-	return("PIO ?");
-}
-
-static inline u8 *pdc202xx_dma_verbose (u32 drive_pci)
-{
-	if ((drive_pci & 0x00036000) == 0x00036000) return("MWDMA 2");
-	if ((drive_pci & 0x00046000) == 0x00046000) return("MWDMA 1");
-	if ((drive_pci & 0x00056000) == 0x00056000) return("MWDMA 0");
-	if ((drive_pci & 0x00056000) == 0x00056000) return("SWDMA 2");
-	if ((drive_pci & 0x00068000) == 0x00068000) return("SWDMA 1");
-	if ((drive_pci & 0x000BC000) == 0x000BC000) return("SWDMA 0");
-	return("PIO---");
-}
-
-static inline u8 *pdc202xx_ultra_verbose (u32 drive_pci, u16 slow_cable)
-{
-	if ((drive_pci & 0x000ff000) == 0x000ff000)
-		return("NOTSET");
-	if ((drive_pci & 0x00012000) == 0x00012000)
-		return((slow_cable) ? "UDMA 2" : "UDMA 4");
-	if ((drive_pci & 0x00024000) == 0x00024000)
-		return((slow_cable) ? "UDMA 1" : "UDMA 3");
-	if ((drive_pci & 0x00036000) == 0x00036000)
-		return("UDMA 0");
-	return(pdc202xx_dma_verbose(drive_pci));
-}
-
 /* A Register */
 #define	SYNC_ERRDY_EN	0xC0
 

@@ -97,8 +62,6 @@
 #define	MC2		0x04	/* DMA"C" timing */
 #define	MC1		0x02	/* DMA"C" timing */
 #define	MC0		0x01	/* DMA"C" timing */
-
-#define DISPLAY_PDC202XX_TIMINGS
 
 static void init_setup_pdc202ata4(struct pci_dev *dev, ide_pci_device_t *d);
 static void init_setup_pdc20265(struct pci_dev *, ide_pci_device_t *);

diff -Nru a/drivers/ide/pci/piix.h b/drivers/ide/pci/piix.h
@@ -5,10 +5,6 @@
 #include <linux/pci.h>
 #include <linux/ide.h>
 
-#define PIIX_DEBUG_DRIVE_INFO		0
-
-#define DISPLAY_PIIX_TIMINGS
-
 static void init_setup_piix(struct pci_dev *, ide_pci_device_t *);
 static unsigned int __devinit init_chipset_piix(struct pci_dev *,

const char *);
static void init_hwif_piix(ide_hwif_t *);

diff -Nru a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c
@@ -67,55 +67,6 @@
 	return pci_clock;
 }
 
-#define DISPLAY_SC1200_TIMINGS
-
-#if defined(DISPLAY_SC1200_TIMINGS) && defined(CONFIG_PROC_FS)
-#include <linux/stat.h>
-#include <linux/proc_fs.h>
-
-static int sc1200_get_info(char *, char **, off_t, int);
-extern int (*sc1200_display_info)(char *, char **, off_t, int); /*

ide-proc.c */
-extern char *ide_media_verbose(ide_drive_t *);
-static u8 sc1200_proc = 0;
-
-static struct pci_dev *bmide_dev;
-
-static int sc1200_get_info (char *buffer, char **addr, off_t offset, int count) -{
- char *p = buffer;
- unsigned long bibma = pci_resource_start(bmide_dev, 4);
- int len;
- u8 c0 = 0, c1 = 0;
-
- /*
- * at that point bibma+0x2 et bibma+0xa are byte registers
- * to investigate:
- */
-
- c0 = inb_p(bibma + 0x02);
- c1 = inb_p(bibma + 0x0a);
-
- p += sprintf(p, "\n National SCx200
Chipset.\n");
- p += sprintf(p, "--------------- Primary Channel ----------------
Secondary Channel -------------\n");
- p += sprintf(p, " %sabled %sabled\n",
- (c0&0x80) ? "dis" : " en",
- (c1&0x80) ? "dis" : " en");
- p += sprintf(p, "--------------- drive0 --------- drive1 --------
drive0 ---------- drive1 ------\n");
- p += sprintf(p, "DMA enabled: %s %s %s

            %s\n",

- (c0&0x20) ? "yes" : "no ", (c0&0x40) ? "yes" : "no ",
- (c1&0x20) ? "yes" : "no ", (c1&0x40) ? "yes" : "no " );
-
- p += sprintf(p, "UDMA\n");
- p += sprintf(p, "DMA\n");
- p += sprintf(p, "PIO\n");
-
- len = (p - buffer) - offset;
- *addr = buffer + offset;
-
- return len > count ? count : len;
-}
-#endif /* DISPLAY_SC1200_TIMINGS && CONFIG_PROC_FS */ -
extern char *ide_xfer_verbose (byte xfer_rate);

/*
@@ -505,21 +456,6 @@
}

/*
- * Initialize the sc1200 bridge for reliable IDE DMA operation.
- */
-static unsigned int __init init_chipset_sc1200 (struct pci_dev *dev, const char *name)
-{
-#if defined(DISPLAY_SC1200_TIMINGS) && defined(CONFIG_PROC_FS)
- if (!bmide_dev) {
- sc1200_proc = 1;
- bmide_dev = dev;
- ide_pci_create_host_proc("sc1200", sc1200_get_info);
- }
-#endif /* DISPLAY_SC1200_TIMINGS && CONFIG_PROC_FS */
- return 0;
-}
-
-/*
* This gets invoked by the IDE driver once for each channel,
* and performs channel-specific pre-initialization before drive probing. */
@@ -545,7 +481,6 @@

static ide_pci_device_t sc1200_chipset __devinitdata = {
.name = "SC1200",
- .init_chipset = init_chipset_sc1200,
.init_hwif = init_hwif_sc1200,
.channels = 2,
.autodma = AUTODMA,

diff -Nru a/drivers/ide/pci/serverworks.h b/drivers/ide/pci/serverworks.h
@@ -21,8 +21,6 @@
 	NULL
 };
 
-#define DISPLAY_SVWKS_TIMINGS	1
-
 static void init_setup_svwks(struct pci_dev *, ide_pci_device_t *);
 static void init_setup_csb6(struct pci_dev *, ide_pci_device_t *);
 static unsigned int init_chipset_svwks(struct pci_dev *, const char *);

diff -Nru a/drivers/ide/pci/slc90e66.c b/drivers/ide/pci/slc90e66.c
@@ -21,103 +21,6 @@
 
 #include <asm/io.h>
 
-#define DISPLAY_SLC90E66_TIMINGS
-
-#if defined(DISPLAY_SLC90E66_TIMINGS) && defined(CONFIG_PROC_FS)
-#include <linux/stat.h>
-#include <linux/proc_fs.h>
-
-static u8 slc90e66_proc = 0;
-static struct pci_dev *bmide_dev;
-
-static int slc90e66_get_info (char *buffer, char **addr, off_t

offset, int count)
-{
- char *p = buffer;
- int len;
- unsigned long bibma = pci_resource_start(bmide_dev, 4);
- u16 reg40 = 0, psitre = 0, reg42 = 0, ssitre = 0;
- u8 c0 = 0, c1 = 0;
- u8 reg44 = 0, reg47 = 0, reg48 = 0, reg4a = 0, reg4b = 0;
-
- pci_read_config_word(bmide_dev, 0x40, &reg40);
- pci_read_config_word(bmide_dev, 0x42, &reg42);
- pci_read_config_byte(bmide_dev, 0x44, &reg44);
- pci_read_config_byte(bmide_dev, 0x47, &reg47);
- pci_read_config_byte(bmide_dev, 0x48, &reg48);
- pci_read_config_byte(bmide_dev, 0x4a, &reg4a);
- pci_read_config_byte(bmide_dev, 0x4b, &reg4b);
-
- psitre = (reg40 & 0x4000) ? 1 : 0;
- ssitre = (reg42 & 0x4000) ? 1 : 0;
-
- /*

-         * at that point bibma+0x2 et bibma+0xa are byte registers
-         * to investigate:
-         */

- c0 = inb_p(bibma + 0x02);
- c1 = inb_p(bibma + 0x0a);
-
- p += sprintf(p, " SLC90E66 Chipset.\n");
- p += sprintf(p, "--------------- Primary Channel "
- "---------------- Secondary Channel "
- "-------------\n");
- p += sprintf(p, " %sabled "
- " %sabled\n",
- (c0&0x80) ? "dis" : " en",
- (c1&0x80) ? "dis" : " en");
- p += sprintf(p, "--------------- drive0 --------- drive1 "
- "-------- drive0 ---------- drive1 ------\n");
- p += sprintf(p, "DMA enabled: %s %s "
- " %s %s\n",
- (c0&0x20) ? "yes" : "no ",
- (c0&0x40) ? "yes" : "no ",
- (c1&0x20) ? "yes" : "no ",
- (c1&0x40) ? "yes" : "no " );
- p += sprintf(p, "UDMA enabled: %s %s "
- " %s %s\n",
- (reg48&0x01) ? "yes" : "no ",
- (reg48&0x02) ? "yes" : "no ",
- (reg48&0x04) ? "yes" : "no ",
- (reg48&0x08) ? "yes" : "no " );
- p += sprintf(p, "UDMA enabled: %s %s "
- " %s %s\n",
- ((reg4a&0x04)==0x04) ? "4" :
- ((reg4a&0x03)==0x03) ? "3" :
- (reg4a&0x02) ? "2" :
- (reg4a&0x01) ? "1" :
- (reg4a&0x00) ? "0" : "X",
- ((reg4a&0x40)==0x40) ? "4" :
- ((reg4a&0x30)==0x30) ? "3" :
- (reg4a&0x20) ? "2" :
- (reg4a&0x10) ? "1" :
- (reg4a&0x00) ? "0" : "X",
- ((reg4b&0x04)==0x04) ? "4" :
- ((reg4b&0x03)==0x03) ? "3" :
- (reg4b&0x02) ? "2" :
- (reg4b&0x01) ? "1" :
- (reg4b&0x00) ? "0" : "X",
- ((reg4b&0x40)==0x40) ? "4" :
- ((reg4b&0x30)==0x30) ? "3" :
- (reg4b&0x20) ? "2" :
- (reg4b&0x10) ? "1" :
- (reg4b&0x00) ? "0" : "X");
-
- p += sprintf(p, "UDMA\n");
- p += sprintf(p, "DMA\n");
- p += sprintf(p, "PIO\n");
-
-/*
- * FIXME.... Add configuration junk data....blah blah......
- */
-
- /* p - buffer must be less than 4k! */
- len = (p - buffer) - offset;
- *addr = buffer + offset;
-
- return len > count ? count : len;
-}
-#endif /* defined(DISPLAY_SLC90E66_TIMINGS) && defined(CONFIG_PROC_FS) */ -
static u8 slc90e66_ratemask (ide_drive_t *drive)
{
u8 mode = 2;
@@ -236,6 +139,7 @@
if (speed >= XFER_UDMA_0) {
if (!(reg48 & u_flag))
pci_write_config_word(dev, 0x48, reg48|u_flag);
+ /* FIXME: (reg4a & a_speed) ? */
if ((reg4a & u_speed) != u_speed) {
pci_write_config_word(dev, 0x4a, reg4a & ~a_speed); pci_read_config_word(dev, 0x4a, &reg4a);
@@ -313,18 +217,6 @@
}
#endif /* CONFIG_BLK_DEV_IDEDMA */

-static unsigned int __init init_chipset_slc90e66 (struct pci_dev *dev, const char *name)
-{
-#if defined(DISPLAY_SLC90E66_TIMINGS) && defined(CONFIG_PROC_FS)
- if (!slc90e66_proc) {
- slc90e66_proc = 1;
- bmide_dev = dev;
- ide_pci_create_host_proc("slc90e66", slc90e66_get_info);
- }
-#endif /* DISPLAY_SLC90E66_TIMINGS && CONFIG_PROC_FS */
- return 0;
-}
-
static void __init init_hwif_slc90e66 (ide_hwif_t *hwif) {
u8 reg47 = 0;
@@ -366,7 +258,6 @@

static ide_pci_device_t slc90e66_chipset __devinitdata = {
.name = "SLC90E66",
- .init_chipset = init_chipset_slc90e66,
.init_hwif = init_hwif_slc90e66,
.channels = 2,
.autodma = AUTODMA,

Are all of the data displayed in /proc/ide/piix et al now available in sysfs? If so, 'twould've been useful for a small utility -- a la lsscsi(8) -- that can format that data like the /proc/ide files to have been released before dropping the /proc files....

It is a regression to loose convenient access to the controllers' current configs....

-JimC

All these data can be obtained from user-space,
no need for bloating sysfs.

http://home.elka.pw.edu.pl/~bzolnier/atapci/

released > 2 years ago :)

works fine but probably needs some cut'n'paste updates

Most of these /proc files were buggy / inaccurate and keeping them had real maintenance cost (hpt366 bug, triflex bug etc.) with absolutely no added gain in debugging problems (raw PCI config gives much more info).

and yes, this should've been done 2 years ago...

BZ> All these data can be obtained from user-space, no need for BZ> bloating sysfs.

Cool.

BZ> http://home.elka.pw.edu.pl/~bzolnier/atapci/

BZ> released > 2 years ago :)

BZ> works fine but probably needs some cut'n'paste updates

Now to get the distributions to pick it up. I've checked gentoo and debian (sid); neither has it.

BZ> Most of these /proc files were buggy / inaccurate and keeping them BZ> had real maintenance cost (hpt366 bug, triflex bug etc.) with BZ> absolutely no added gain in debugging problems (raw PCI config BZ> gives much more info).

I always went their first for a quick overview, but since your atapci(8) provides all of that -- and more, of course -- lspci(8)- style ubiquity for it is enough. :)

-JimC

Other than one obvious patch to get rid of all the warnings from putting comments after #endif w/o a comment inducer, seems to work...

   -bill davidsen ([email protected])
"The secret to procrastination is to put things off until the
 last possible moment - but no longer"  -me