/*
* This is the /proc/ide/ filesystem implementation.
*
- * The major reason this exists is to provide sufficient access
- * to driver and config data, such that user-mode programs can
- * be developed to handle chipset tuning for most PCI interfaces.
- * This should provide better utilities, and less kernel bloat.
- *
- * The entire pci config space for a PCI interface chipset can be
- * retrieved by just reading it. e.g. "cat /proc/ide3/config"
- *
- * To modify registers *safely*, do something like:
- * echo "P40:88" >/proc/ide/ide3/config
- * That expression writes 0x88 to pci config register 0x40
- * on the chip which controls ide3. Multiple tuples can be issued,
- * and the writes will be completed as an atomic set:
- * echo "P40:88 P41:35 P42:00 P43:00" >/proc/ide/ide3/config
- *
- * All numbers must be specified using pairs of ascii hex digits.
- * It is important to note that these writes will be performed
- * after waiting for the IDE controller (both interfaces)
- * to be completely idle, to ensure no corruption of I/O in progress.
- *
- * Non-PCI registers can also be written, using "R" in place of "P"
- * in the above examples. The size of the port transfer is determined
- * by the number of pairs of hex digits given for the data. If a two
- * digit value is given, the write will be a byte operation; if four
- * digits are used, the write will be performed as a 16-bit operation;
- * and if eight digits are specified, a 32-bit "dword" write will be
- * performed. Odd numbers of digits are not permitted.
- *
- * If there is an error *anywhere* in the string of registers/data
- * then *none* of the writes will be performed.
- *
* Drive/Driver settings can be retrieved by reading the drive's
* "settings" files. e.g. "cat /proc/ide0/hda/settings"
* To write a new value "val" into a specific setting "name", use:
* returned data as 256 16-bit words. The "hdparm" utility will
* be updated someday soon to use this mechanism.
*
- * Feel free to develop and distribute fancy GUI configuration
- * utilities for your favorite PCI chipsets. I'll be working on
- * one for the Promise 20246 someday soon. -ml
- *
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <asm/uaccess.h>
#include <asm/io.h>
-static int do_proc_ide_write_config(struct file *file, const char __user *buffer,
- unsigned long count, void *data)
-{
- ide_hwif_t *hwif = ide_hwif_from_key(data);
- ide_hwgroup_t *mygroup = (ide_hwgroup_t *)(hwif->hwgroup);
- ide_hwgroup_t *mategroup = NULL;
- unsigned long timeout;
- unsigned long flags;
- const char *start = NULL, *msg = NULL;
- struct entry { u32 val; u16 reg; u8 size; u8 pci; } *prog, *q, *r;
- int want_pci = 0;
- char *buf, *s;
- int err;
-
- if (hwif->mate && hwif->mate->hwgroup)
- mategroup = (ide_hwgroup_t *)(hwif->mate->hwgroup);
-
- if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RAWIO))
- return -EACCES;
-
- if (count >= PAGE_SIZE)
- return -EINVAL;
-
- s = buf = (char *)__get_free_page(GFP_USER);
- if (!buf)
- return -ENOMEM;
-
- err = -ENOMEM;
- q = prog = (struct entry *)__get_free_page(GFP_USER);
- if (!prog)
- goto out;
-
- err = -EFAULT;
- if (copy_from_user(buf, buffer, count))
- goto out1;
-
- buf[count] = '\0';
-
- while (isspace(*s))
- s++;
-
- while (*s) {
- char *p;
- int digits;
-
- start = s;
-
- if ((char *)(q + 1) > (char *)prog + PAGE_SIZE) {
- msg = "too many entries";
- goto parse_error;
- }
-
- switch (*s++) {
- case 'R': q->pci = 0;
- break;
- case 'P': q->pci = 1;
- want_pci = 1;
- break;
- default: msg = "expected 'R' or 'P'";
- goto parse_error;
- }
-
- q->reg = simple_strtoul(s, &p, 16);
- digits = p - s;
- if (!digits || digits > 4 || (q->pci && q->reg > 0xff)) {
- msg = "bad/missing register number";
- goto parse_error;
- }
- if (*p++ != ':') {
- msg = "missing ':'";
- goto parse_error;
- }
- q->val = simple_strtoul(p, &s, 16);
- digits = s - p;
- if (digits != 2 && digits != 4 && digits != 8) {
- msg = "bad data, 2/4/8 digits required";
- goto parse_error;
- }
- q->size = digits / 2;
-
- if (q->pci) {
-#ifdef CONFIG_BLK_DEV_IDEPCI
- if (q->reg & (q->size - 1)) {
- msg = "misaligned access";
- goto parse_error;
- }
-#else
- msg = "not a PCI device";
- goto parse_error;
-#endif /* CONFIG_BLK_DEV_IDEPCI */
- }
-
- q++;
-
- if (*s && !isspace(*s++)) {
- msg = "expected whitespace after data";
- goto parse_error;
- }
- while (isspace(*s))
- s++;
- }
-
- /*
- * What follows below is fucking insane, even for IDE people.
- * For now I've dealt with the obvious problems on the parsing
- * side, but IMNSHO we should simply remove the write access
- * to /proc/ide/.../config, killing that FPOS completely.
- */
-
- err = -EBUSY;
- timeout = jiffies + (3 * HZ);
- spin_lock_irqsave(&ide_lock, flags);
- while (mygroup->busy ||
- (mategroup && mategroup->busy)) {
- spin_unlock_irqrestore(&ide_lock, flags);
- if (time_after(jiffies, timeout)) {
- printk("/proc/ide/%s/config: channel(s) busy, cannot write\n", hwif->name);
- goto out1;
- }
- spin_lock_irqsave(&ide_lock, flags);
- }
-
-#ifdef CONFIG_BLK_DEV_IDEPCI
- if (want_pci && (!hwif->pci_dev || hwif->pci_dev->vendor)) {
- spin_unlock_irqrestore(&ide_lock, flags);
- printk("proc_ide: PCI registers not accessible for %s\n",
- hwif->name);
- err = -EINVAL;
- goto out1;
- }
-#endif /* CONFIG_BLK_DEV_IDEPCI */
-
- for (r = prog; r < q; r++) {
- unsigned int reg = r->reg, val = r->val;
- if (r->pci) {
-#ifdef CONFIG_BLK_DEV_IDEPCI
- int rc = 0;
- struct pci_dev *dev = hwif->pci_dev;
- switch (q->size) {
- case 1: msg = "byte";
- rc = pci_write_config_byte(dev, reg, val);
- break;
- case 2: msg = "word";
- rc = pci_write_config_word(dev, reg, val);
- break;
- case 4: msg = "dword";
- rc = pci_write_config_dword(dev, reg, val);
- break;
- }
- if (rc) {
- spin_unlock_irqrestore(&ide_lock, flags);
- printk("proc_ide_write_config: error writing %s at bus %02x dev %02x reg 0x%x value 0x%x\n",
- msg, dev->bus->number, dev->devfn, reg, val);
- printk("proc_ide_write_config: error %d\n", rc);
- err = -EIO;
- goto out1;
- }
-#endif /* CONFIG_BLK_DEV_IDEPCI */
- } else { /* not pci */
- switch (r->size) {
- case 1: hwif->OUTB(val, reg);
- break;
- case 2: hwif->OUTW(val, reg);
- break;
- case 4: hwif->OUTL(val, reg);
- break;
- }
- }
- }
- spin_unlock_irqrestore(&ide_lock, flags);
- err = count;
-out1:
- free_page((unsigned long)prog);
-out:
- free_page((unsigned long)buf);
- return err;
-
-parse_error:
- printk("parse error\n");
- printk("proc_ide: error: %s: '%s'\n", msg, start);
- err = -EINVAL;
- goto out1;
-}
-
-static int proc_ide_write_config(struct file *file, const char __user *buffer,
- unsigned long count, void *data)
-{
- int ret;
- down(&ide_cfg_sem);
- ret = do_proc_ide_write_config(file, buffer, count, data);
- up(&ide_cfg_sem);
- return ret;
-}
-
-static int proc_ide_read_config
- (char *page, char **start, off_t off, int count, int *eof, void *data)
-{
- char *out = page;
- int len;
-
-#ifdef CONFIG_BLK_DEV_IDEPCI
- ide_hwif_t *hwif = ide_hwif_from_key(data);
-
- down(&ide_cfg_sem);
- hwif = ide_hwif_from_key(data);
-
- if(hwif)
- {
- struct pci_dev *dev = hwif->pci_dev;
- if ((hwif->pci_dev && hwif->pci_dev->vendor) && dev && dev->bus)
- {
- int reg = 0;
-
- out += sprintf(out, "pci bus %02x device %02x vendor %04x "
- "device %04x channel %d\n",
- dev->bus->number, dev->devfn,
- hwif->pci_dev->vendor, hwif->pci_dev->device,
- hwif->channel);
- do {
- u8 val;
- int rc = pci_read_config_byte(dev, reg, &val);
- if (rc) {
- printk("proc_ide_read_config: error %d reading"
- " bus %02x dev %02x reg 0x%02x\n",
- rc, dev->bus->number, dev->devfn, reg);
- out += sprintf(out, "??%c",
- (++reg & 0xf) ? ' ' : '\n');
- } else
- out += sprintf(out, "%02x%c",
- val, (++reg & 0xf) ? ' ' : '\n');
- } while (reg < 0x100);
- }
- else
- out += sprintf(out, "(none)\n");
- }
-#else /* CONFIG_BLK_DEV_IDEPCI */
- out += sprintf(out, "(none)\n");
-#endif
- up(&ide_cfg_sem);
- len = out - page;
- PROC_IDE_READ_RETURN(page,start,off,count,eof,len);
-}
-
static int proc_ide_read_imodel
(char *page, char **start, off_t off, int count, int *eof, void *data)
{
- ide_hwif_t *hwif;
+ ide_hwif_t *hwif = (ide_hwif_t *) data;
int len;
- const char *name = "";
-
- down(&ide_cfg_sem);
- hwif = ide_hwif_from_key(data);
- if(hwif)
- {
- /*
- * Neither ide_unknown nor ide_forced should be set at this point.
- */
- switch (hwif->chipset) {
- case ide_generic: name = "generic"; break;
- case ide_pci: name = "pci"; break;
- case ide_cmd640: name = "cmd640"; break;
- case ide_dtc2278: name = "dtc2278"; break;
- case ide_ali14xx: name = "ali14xx"; break;
- case ide_qd65xx: name = "qd65xx"; break;
- case ide_umc8672: name = "umc8672"; break;
- case ide_ht6560b: name = "ht6560b"; break;
- case ide_pdc4030: name = "pdc4030"; break;
- case ide_rz1000: name = "rz1000"; break;
- case ide_trm290: name = "trm290"; break;
- case ide_cmd646: name = "cmd646"; break;
- case ide_cy82c693: name = "cy82c693"; break;
- case ide_4drives: name = "4drives"; break;
- case ide_pmac: name = "mac-io"; break;
- default: name = "(unknown)"; break;
- }
+ const char *name;
+
+ /*
+ * Neither ide_unknown nor ide_forced should be set at this point.
+ */
+ switch (hwif->chipset) {
+ case ide_generic: name = "generic"; break;
+ case ide_pci: name = "pci"; break;
+ case ide_cmd640: name = "cmd640"; break;
+ case ide_dtc2278: name = "dtc2278"; break;
+ case ide_ali14xx: name = "ali14xx"; break;
+ case ide_qd65xx: name = "qd65xx"; break;
+ case ide_umc8672: name = "umc8672"; break;
+ case ide_ht6560b: name = "ht6560b"; break;
+ case ide_rz1000: name = "rz1000"; break;
+ case ide_trm290: name = "trm290"; break;
+ case ide_cmd646: name = "cmd646"; break;
+ case ide_cy82c693: name = "cy82c693"; break;
+ case ide_4drives: name = "4drives"; break;
+ case ide_pmac: name = "mac-io"; break;
+ case ide_au1xxx: name = "au1xxx"; break;
+ default: name = "(unknown)"; break;
}
len = sprintf(page, "%s\n", name);
- up(&ide_cfg_sem);
PROC_IDE_READ_RETURN(page,start,off,count,eof,len);
}
static int proc_ide_read_mate
(char *page, char **start, off_t off, int count, int *eof, void *data)
{
- ide_hwif_t *hwif;
+ ide_hwif_t *hwif = (ide_hwif_t *) data;
int len;
- down(&ide_cfg_sem);
- hwif = ide_hwif_from_key(data);
if (hwif && hwif->mate && hwif->mate->present)
len = sprintf(page, "%s\n", hwif->mate->name);
else
len = sprintf(page, "(none)\n");
- up(&ide_cfg_sem);
PROC_IDE_READ_RETURN(page,start,off,count,eof,len);
}
static int proc_ide_read_channel
(char *page, char **start, off_t off, int count, int *eof, void *data)
{
- ide_hwif_t *hwif;
- int len = 0;
-
- down(&ide_cfg_sem);
- hwif = ide_hwif_from_key(data);
- if(hwif) {
- page[0] = hwif->channel ? '1' : '0';
- page[1] = '\n';
- len = 2;
- }
- else
- page[0] = '\n';
- up(&ide_cfg_sem);
+ ide_hwif_t *hwif = (ide_hwif_t *) data;
+ int len;
+
+ page[0] = hwif->channel ? '1' : '0';
+ page[1] = '\n';
+ len = 2;
PROC_IDE_READ_RETURN(page,start,off,count,eof,len);
}
static int proc_ide_read_identify
(char *page, char **start, off_t off, int count, int *eof, void *data)
{
- ide_drive_t *drive;
+ ide_drive_t *drive = (ide_drive_t *)data;
int len = 0, i = 0;
int err = 0;
len = sprintf(page, "\n");
- down(&ide_cfg_sem);
- drive = ide_drive_from_key(data);
-
if (drive) {
unsigned short *val = (unsigned short *) page;
- BUG_ON(!drive->driver);
-
err = taskfile_lib_get_identify(drive, page);
if (!err) {
char *out = ((char *)page) + (SECTOR_WORDS * 4);
len = out - page;
}
}
- up(&ide_cfg_sem);
PROC_IDE_READ_RETURN(page,start,off,count,eof,len);
}
+static void proc_ide_settings_warn(void)
+{
+ static int warned = 0;
+
+ if (warned)
+ return;
+
+ printk(KERN_WARNING "Warning: /proc/ide/hd?/settings interface is "
+ "obsolete, and will be removed soon!\n");
+ warned = 1;
+}
+
static int proc_ide_read_settings
(char *page, char **start, off_t off, int count, int *eof, void *data)
{
- ide_drive_t *drive;
- ide_settings_t *setting;
+ ide_drive_t *drive = (ide_drive_t *) data;
+ ide_settings_t *setting = (ide_settings_t *) drive->settings;
char *out = page;
int len, rc, mul_factor, div_factor;
-
- down(&ide_cfg_sem);
- drive = ide_drive_from_key(data);
-
- if(drive == NULL)
- {
- up(&ide_cfg_sem);
- return -EIO;
- }
- setting = (ide_settings_t *) drive->settings;
+ proc_ide_settings_warn();
+
down(&ide_setting_sem);
out += sprintf(out, "name\t\t\tvalue\t\tmin\t\tmax\t\tmode\n");
out += sprintf(out, "----\t\t\t-----\t\t---\t\t---\t\t----\n");
}
len = out - page;
up(&ide_setting_sem);
- up(&ide_cfg_sem);
PROC_IDE_READ_RETURN(page,start,off,count,eof,len);
}
#define MAX_LEN 30
-static int do_proc_ide_write_settings(struct file *file, const char __user *buffer,
+static int proc_ide_write_settings(struct file *file, const char __user *buffer,
unsigned long count, void *data)
{
- ide_drive_t *drive = ide_drive_from_key(data);
+ ide_drive_t *drive = (ide_drive_t *) data;
char name[MAX_LEN + 1];
int for_real = 0;
unsigned long n;
if (!capable(CAP_SYS_ADMIN))
return -EACCES;
-
- if (drive == NULL)
- return -EIO;
+
+ proc_ide_settings_warn();
if (count >= PAGE_SIZE)
return -EINVAL;
return -EINVAL;
}
-static int proc_ide_write_settings(struct file *file, const char __user *buffer,
- unsigned long count, void *data)
-{
- int ret;
-
- down(&ide_cfg_sem);
- ret = do_proc_ide_write_settings(file, buffer, count, data);
- up(&ide_cfg_sem);
- return ret;
-}
-
int proc_ide_read_capacity
(char *page, char **start, off_t off, int count, int *eof, void *data)
{
- ide_drive_t *drive;
- int len;
-
- down(&ide_cfg_sem);
- drive = ide_drive_from_key(data);
- if(drive == NULL)
- {
- up(&ide_cfg_sem);
- return -EIO;
- }
-
- len = sprintf(page,"%llu\n",
- (long long) (DRIVER(drive)->capacity(drive)));
- up(&ide_cfg_sem);
+ int len = sprintf(page,"%llu\n", (long long)0x7fffffff);
PROC_IDE_READ_RETURN(page,start,off,count,eof,len);
}
+EXPORT_SYMBOL_GPL(proc_ide_read_capacity);
+
int proc_ide_read_geometry
(char *page, char **start, off_t off, int count, int *eof, void *data)
{
- ide_drive_t *drive;
+ ide_drive_t *drive = (ide_drive_t *) data;
char *out = page;
int len;
-
- down(&ide_cfg_sem);
- drive = ide_drive_from_key(data);
- if(drive == NULL)
- {
- up(&ide_cfg_sem);
- return -EIO;
- }
out += sprintf(out,"physical %d/%d/%d\n",
drive->cyl, drive->head, drive->sect);
drive->bios_cyl, drive->bios_head, drive->bios_sect);
len = out - page;
- up(&ide_cfg_sem);
PROC_IDE_READ_RETURN(page,start,off,count,eof,len);
}
static int proc_ide_read_dmodel
(char *page, char **start, off_t off, int count, int *eof, void *data)
{
- ide_drive_t *drive;
- struct hd_driveid *id;
+ ide_drive_t *drive = (ide_drive_t *) data;
+ struct hd_driveid *id = drive->id;
int len;
- down(&ide_cfg_sem);
- drive = ide_drive_from_key(data);
- if(drive == NULL)
- {
- up(&ide_cfg_sem);
- return -EIO;
- }
-
- id = drive->id;
len = sprintf(page, "%.40s\n",
(id && id->model[0]) ? (char *)id->model : "(none)");
- up(&ide_cfg_sem);
PROC_IDE_READ_RETURN(page,start,off,count,eof,len);
}
static int proc_ide_read_driver
(char *page, char **start, off_t off, int count, int *eof, void *data)
{
- ide_drive_t *drive;
- ide_driver_t *driver;
+ ide_drive_t *drive = (ide_drive_t *) data;
+ struct device *dev = &drive->gendev;
+ ide_driver_t *ide_drv;
int len;
- down(&ide_cfg_sem);
- drive = ide_drive_from_key(data);
- if(drive == NULL)
- {
- up(&ide_cfg_sem);
- return -EIO;
+ down_read(&dev->bus->subsys.rwsem);
+ if (dev->driver) {
+ ide_drv = container_of(dev->driver, ide_driver_t, gen_driver);
+ len = sprintf(page, "%s version %s\n",
+ dev->driver->name, ide_drv->version);
+ } else
+ len = sprintf(page, "ide-default version 0.9.newide\n");
+ up_read(&dev->bus->subsys.rwsem);
+ PROC_IDE_READ_RETURN(page,start,off,count,eof,len);
+}
+
+static int ide_replace_subdriver(ide_drive_t *drive, const char *driver)
+{
+ struct device *dev = &drive->gendev;
+ int ret = 1;
+ int err;
+
+ down_write(&dev->bus->subsys.rwsem);
+ device_release_driver(dev);
+ /* FIXME: device can still be in use by previous driver */
+ strlcpy(drive->driver_req, driver, sizeof(drive->driver_req));
+ err = device_attach(dev);
+ if (err < 0)
+ printk(KERN_WARNING "IDE: %s: device_attach error: %d\n",
+ __FUNCTION__, err);
+ drive->driver_req[0] = 0;
+ if (dev->driver == NULL) {
+ err = device_attach(dev);
+ if (err < 0)
+ printk(KERN_WARNING
+ "IDE: %s: device_attach(2) error: %d\n",
+ __FUNCTION__, err);
}
-
- driver = drive->driver;
+ if (dev->driver && !strcmp(dev->driver->name, driver))
+ ret = 0;
+ up_write(&dev->bus->subsys.rwsem);
- len = sprintf(page, "%s version %s\n",
- driver->name, driver->version);
- up(&ide_cfg_sem);
- PROC_IDE_READ_RETURN(page,start,off,count,eof,len);
+ return ret;
+}
+
+static int proc_ide_write_driver
+ (struct file *file, const char __user *buffer, unsigned long count, void *data)
+{
+ ide_drive_t *drive = (ide_drive_t *) data;
+ char name[32];
+
+ if (!capable(CAP_SYS_ADMIN))
+ return -EACCES;
+ if (count > 31)
+ count = 31;
+ if (copy_from_user(name, buffer, count))
+ return -EFAULT;
+ name[count] = '\0';
+ if (ide_replace_subdriver(drive, name))
+ return -EINVAL;
+ return count;
}
static int proc_ide_read_media
(char *page, char **start, off_t off, int count, int *eof, void *data)
{
- ide_drive_t *drive;
+ ide_drive_t *drive = (ide_drive_t *) data;
const char *media;
int len;
- down(&ide_cfg_sem);
- drive = ide_drive_from_key(data);
- if(drive == NULL)
- {
- up(&ide_cfg_sem);
- return -EIO;
- }
-
switch (drive->media) {
case ide_disk: media = "disk\n";
break;
break;
case ide_floppy:media = "floppy\n";
break;
+ case ide_optical:media = "optical\n";
+ break;
default: media = "UNKNOWN\n";
break;
}
strcpy(page,media);
len = strlen(media);
- up(&ide_cfg_sem);
PROC_IDE_READ_RETURN(page,start,off,count,eof,len);
}
static ide_proc_entry_t generic_drive_entries[] = {
- { "driver", S_IFREG|S_IRUGO, proc_ide_read_driver, NULL },
+ { "driver", S_IFREG|S_IRUGO, proc_ide_read_driver, proc_ide_write_driver },
{ "identify", S_IFREG|S_IRUSR, proc_ide_read_identify, NULL },
{ "media", S_IFREG|S_IRUGO, proc_ide_read_media, NULL },
{ "model", S_IFREG|S_IRUGO, proc_ide_read_dmodel, NULL },
drive->proc = proc_mkdir(drive->name, parent);
if (drive->proc)
- ide_add_proc_entries(drive->proc, generic_drive_entries, ide_drive_to_key(drive));
+ ide_add_proc_entries(drive->proc, generic_drive_entries, drive);
sprintf(name,"ide%d/%s", (drive->name[2]-'a')/2, drive->name);
ent = proc_symlink(drive->name, proc_ide_root, name);
if (!ent) return;
static void destroy_proc_ide_device(ide_hwif_t *hwif, ide_drive_t *drive)
{
- ide_driver_t *driver = drive->driver;
-
if (drive->proc) {
- ide_remove_proc_entries(drive->proc, driver->proc);
ide_remove_proc_entries(drive->proc, generic_drive_entries);
remove_proc_entry(drive->name, proc_ide_root);
remove_proc_entry(drive->name, hwif->proc);
}
}
-void destroy_proc_ide_drives(ide_hwif_t *hwif)
+static void destroy_proc_ide_drives(ide_hwif_t *hwif)
{
int d;
static ide_proc_entry_t hwif_entries[] = {
{ "channel", S_IFREG|S_IRUGO, proc_ide_read_channel, NULL },
- { "config", S_IFREG|S_IRUGO|S_IWUSR,proc_ide_read_config, proc_ide_write_config },
{ "mate", S_IFREG|S_IRUGO, proc_ide_read_mate, NULL },
{ "model", S_IFREG|S_IRUGO, proc_ide_read_imodel, NULL },
{ NULL, 0, NULL, NULL }
hwif->proc = proc_mkdir(hwif->name, proc_ide_root);
if (!hwif->proc)
return;
- ide_add_proc_entries(hwif->proc, hwif_entries, ide_hwif_to_key(hwif));
+ ide_add_proc_entries(hwif->proc, hwif_entries, hwif);
}
create_proc_ide_drives(hwif);
}
void destroy_proc_ide_interface(ide_hwif_t *hwif)
{
- int exist = (hwif->proc != NULL);
-#if 0
- if (!hwif->present)
- continue;
-#endif
- if (exist) {
+ if (hwif->proc) {
destroy_proc_ide_drives(hwif);
ide_remove_proc_entries(hwif->proc, hwif_entries);
remove_proc_entry(hwif->name, proc_ide_root);
}
}
-EXPORT_SYMBOL(destroy_proc_ide_interface);
+static int proc_print_driver(struct device_driver *drv, void *data)
+{
+ ide_driver_t *ide_drv = container_of(drv, ide_driver_t, gen_driver);
+ struct seq_file *s = data;
+
+ seq_printf(s, "%s version %s\n", drv->name, ide_drv->version);
+
+ return 0;
+}
-static void destroy_proc_ide_interfaces(void)
+static int ide_drivers_show(struct seq_file *s, void *p)
{
- int h;
+ int err;
- for (h = 0; h < MAX_HWIFS; h++) {
- ide_hwif_t *hwif = &ide_hwifs[h];
- destroy_proc_ide_interface(hwif);
- }
+ err = bus_for_each_drv(&ide_bus_type, NULL, s, proc_print_driver);
+ if (err < 0)
+ printk(KERN_WARNING "IDE: %s: bus_for_each_drv error: %d\n",
+ __FUNCTION__, err);
+ return 0;
}
-extern struct seq_operations ide_drivers_op;
static int ide_drivers_open(struct inode *inode, struct file *file)
{
- return seq_open(file, &ide_drivers_op);
+ return single_open(file, &ide_drivers_show, NULL);
}
+
static struct file_operations ide_drivers_operations = {
.open = ide_drivers_open,
.read = seq_read,
.llseek = seq_lseek,
- .release = seq_release,
+ .release = single_release,
};
void proc_ide_create(void)
void proc_ide_destroy(void)
{
- remove_proc_entry("ide/drivers", proc_ide_root);
- destroy_proc_ide_interfaces();
+ remove_proc_entry("drivers", proc_ide_root);
remove_proc_entry("ide", NULL);
}
git://git.onelab.eu / linux-2.6.git / blobdiff