small atang update

Index: b/drivers/ata/pata_opti.c
===================================================================
@@ -35,14 +35,6 @@
 #define DRV_NAME "pata_opti"
 #define DRV_VERSION "0.2.9"
 
-enum {
-	READ_REG	= 0,	/* index of Read cycle timing register */
-	WRITE_REG 	= 1,	/* index of Write cycle timing register */
-	CNTRL_REG 	= 3,	/* index of Control register */
-	STRAP_REG 	= 5,	/* index of Strap register */
-	MISC_REG 	= 6	/* index of Miscellaneous register */
-};
-
 /**
  *	opti_pre_reset		-	probe begin
  *	@link: ATA link

@@ -66,87 +58,7 @@ static int opti_pre_reset(struct ata_lin
 	return ata_sff_prereset(link, deadline);
 }
 
-/**
- *	opti_write_reg		-	control register setup
- *	@ap: ATA port
- *	@value: value
- *	@reg: control register number
- *
- *	The Opti uses magic 'trapdoor' register accesses to do configuration
- *	rather than using PCI space as other controllers do. The double inw
- *	on the error register activates configuration mode. We can then write
- *	the control register
- */
-
-static void opti_write_reg(struct ata_port *ap, u8 val, int reg)
-{
-	void __iomem *regio = ap->ioaddr.cmd_addr;
-
-	/* These 3 unlock the control register access */
-	ioread16(regio + 1);
-	ioread16(regio + 1);
-	iowrite8(3, regio + 2);
-
-	/* Do the I/O */
-	iowrite8(val, regio + reg);
-
-	/* Relock */
-	iowrite8(0x83, regio + 2);
-}
-
-/**
- *	opti_set_piomode	-	set initial PIO mode data
- *	@ap: ATA interface
- *	@adev: ATA device
- *
- *	Called to do the PIO mode setup. Timing numbers are taken from
- *	the FreeBSD driver then pre computed to keep the code clean. There
- *	are two tables depending on the hardware clock speed.
- */
-
-static void opti_set_piomode(struct ata_port *ap, struct ata_device *adev)
-{
-	struct ata_device *pair = ata_dev_pair(adev);
-	int clock;
-	int pio = adev->pio_mode - XFER_PIO_0;
-	void __iomem *regio = ap->ioaddr.cmd_addr;
-	u8 addr;
-
-	/* Address table precomputed with prefetch off and a DCLK of 2 */
-	static const u8 addr_timing[2][5] = {
-		{ 0x30, 0x20, 0x20, 0x10, 0x10 },
-		{ 0x20, 0x20, 0x10, 0x10, 0x10 }
-	};
-	static const u8 data_rec_timing[2][5] = {
-		{ 0x6B, 0x56, 0x42, 0x32, 0x31 },
-		{ 0x58, 0x44, 0x32, 0x22, 0x21 }
-	};
-
-	iowrite8(0xff, regio + 5);
-	clock = ioread16(regio + 5) & 1;
-
-	/*
- 	 *	As with many controllers the address setup time is shared
- 	 *	and must suit both devices if present.
-	 */
-
-	addr = addr_timing[clock][pio];
-	if (pair) {
-		/* Hardware constraint */
-		u8 pair_addr = addr_timing[clock][pair->pio_mode - XFER_PIO_0];
-		if (pair_addr > addr)
-			addr = pair_addr;
-	}
-
-	/* Commence primary programming sequence */
-	opti_write_reg(ap, adev->devno, MISC_REG);
-	opti_write_reg(ap, data_rec_timing[clock][pio], READ_REG);
-	opti_write_reg(ap, data_rec_timing[clock][pio], WRITE_REG);
-	opti_write_reg(ap, addr, MISC_REG);
-
-	/* Programming sequence complete, override strapping */
-	opti_write_reg(ap, 0x85, CNTRL_REG);
-}
+#include "pata_opti.h"
 
 static struct scsi_host_template opti_sht = {
 	ATA_PIO_SHT(DRV_NAME),

90 lines not on this page · raw message

Index: b/drivers/ata/pata_opti.h
===================================================================
@@ -21,8 +21,9 @@ enum {
 
 static void opti_write_reg(struct ata_port *ap, u8 val, int reg)
 {
+#ifndef __IDE2LIBATA
 	void __iomem *regio = ap->ioaddr.cmd_addr;
-
+#endif
 	/* These 3 unlock the control register access */
 	ioread16(regio + 1);
 	ioread16(regio + 1);

@@ -35,6 +36,23 @@ static void opti_write_reg(struct ata_po
 	iowrite8(0x83, regio + 2);
 }
 
+#ifdef __IDE2LIBATA
+static u8 opti_read_reg(int reg)
+{
+	u8 ret = 0;
+
+	ioread16(regio + 1);
+	ioread16(regio + 1);
+	iowrite8(3, regio + 2);
+
+	ret = ioread8(regio + reg);
+
+	iowrite8(0x83, regio + 2);
+
+	return ret;
+}
+#endif
+
 /**
  *	opti_set_piomode	-	set initial PIO mode data
  *	@ap: ATA interface

@@ -50,10 +68,15 @@ static void opti_set_piomode(struct ata_
 	struct ata_device *pair = ata_dev_pair(adev);
 	int clock;
 	int pio = adev->pio_mode - XFER_PIO_0;
+#ifndef __IDE2LIBATA
 	void __iomem *regio = ap->ioaddr.cmd_addr;
+#else
+	unsigned long flags;
+#endif
 	u8 addr;
 
 	/* Address table precomputed with prefetch off and a DCLK of 2 */
+#ifndef __IDE2LIBATA
 	static const u8 addr_timing[2][5] = {
 		{ 0x30, 0x20, 0x20, 0x10, 0x10 },
 		{ 0x20, 0x20, 0x10, 0x10, 0x10 }

@@ -62,10 +85,34 @@ static void opti_set_piomode(struct ata_
 		{ 0x6B, 0x56, 0x42, 0x32, 0x31 },
 		{ 0x58, 0x44, 0x32, 0x22, 0x21 }
 	};
+#else
+	static const u8 addr_timing[2][5] = {
+		{ 0x20, 0x10, 0x00, 0x00, 0x00 },	/* 33 MHz */
+		{ 0x10, 0x10, 0x00, 0x00, 0x00 },	/* 25 MHz */
+	};
+	static const u8 data_rec_timing[2][5] = {
+		{ 0x5b, 0x45, 0x32, 0x21, 0x20 },	/* 33 MHz */
+		{ 0x48, 0x34, 0x21, 0x10, 0x10 }	/* 25 MHz */
+	};
+
+	spin_lock_irqsave(&opti621_lock, flags);
+
+	regio = ap->io_ports.data_addr;
+
+	iowrite8(0xc0, regio + CNTRL_REG); /* allow Register-B */
+#endif
 
 	iowrite8(0xff, regio + 5);
+#ifdef __IDE2LIBATA
+	/* if reads 0xff, adapter not exist? */
+	(void)ioread8(regio + CNTRL_REG);
+	/* if reads 0xc0, no interface exist? */
+	opti_read_reg(CNTRL_REG);
+#endif
 	clock = ioread16(regio + 5) & 1;
-
+#ifdef __IDE2LIBATA
+	printk(KERN_INFO "%s: CLK = %d MHz\n", ap->name, clock ? 25 : 33);
+#endif
 	/*
 	 *	As with many controllers the address setup time is shared
 	 *	and must suit both devices if present.

@@ -87,4 +134,8 @@ static void opti_set_piomode(struct ata_
 
 	/* Programming sequence complete, override strapping */
 	opti_write_reg(ap, 0x85, CNTRL_REG);
+
+#ifdef __IDE2LIBATA
+	spin_unlock_irqrestore(&opti621_lock, flags);
+#endif
 }

136 lines not on this page · raw message

Index: b/drivers/ide/ide-cd.c
===================================================================
@@ -1420,11 +1420,6 @@ static ide_proc_entry_t *ide_cd_proc_ent
 {
 	return idecd_proc;
 }
-
-static const struct ide_proc_devset *ide_cd_proc_devsets(ide_drive_t *drive)
-{
-	return NULL;
-}
 #endif
 
 static const struct cd_list_entry ide_cd_quirks_list[] = {

@@ -1578,7 +1573,6 @@ static struct ide_driver ide_cdrom_drive
 	.do_request		= ide_cd_do_request,
 #ifdef CONFIG_IDE_PROC_FS
 	.proc_entries		= ide_cd_proc_entries,
-	.proc_devsets		= ide_cd_proc_devsets,
 #endif
 };
 

Index: b/drivers/ide/ide-disk.h
===================================================================
@@ -19,11 +19,9 @@ int ide_disk_ioctl(ide_drive_t *, struct
 #ifdef CONFIG_IDE_PROC_FS
 /* ide-disk_proc.c */
 extern ide_proc_entry_t ide_disk_proc[];
-extern const struct ide_proc_devset ide_disk_settings[];
 #endif
 #else
 #define ide_disk_proc		NULL
-#define ide_disk_settings	NULL
 #endif
 
 #endif /* __IDE_DISK_H */

Index: b/drivers/ide/ide-disk_proc.c
===================================================================
@@ -150,25 +150,3 @@ ide_proc_entry_t ide_disk_proc[] = {
 	{ "smart_thresholds", S_IFREG|S_IRUSR, &idedisk_st_proc_fops	},
 	{}
 };
-
-ide_devset_rw_field(bios_cyl, bios_cyl);
-ide_devset_rw_field(bios_head, bios_head);
-ide_devset_rw_field(bios_sect, bios_sect);
-ide_devset_rw_field(failures, failures);
-ide_devset_rw_field(lun, lun);
-ide_devset_rw_field(max_failures, max_failures);
-
-const struct ide_proc_devset ide_disk_settings[] = {
-	IDE_PROC_DEVSET(acoustic,	0,   254),
-	IDE_PROC_DEVSET(address,	0,     2),
-	IDE_PROC_DEVSET(bios_cyl,	0, 65535),
-	IDE_PROC_DEVSET(bios_head,	0,   255),
-	IDE_PROC_DEVSET(bios_sect,	0,    63),
-	IDE_PROC_DEVSET(failures,	0, 65535),
-	IDE_PROC_DEVSET(lun,		0,     7),
-	IDE_PROC_DEVSET(max_failures,	0, 65535),
-	IDE_PROC_DEVSET(multcount,	0,    16),
-	IDE_PROC_DEVSET(nowerr,		0,     1),
-	IDE_PROC_DEVSET(wcache,		0,     1),
-	{ NULL },
-};

Index: b/drivers/ide/ide-floppy.h
===================================================================
@@ -29,11 +29,9 @@ int ide_floppy_ioctl(ide_drive_t *, stru
 #ifdef CONFIG_IDE_PROC_FS
 /* ide-floppy_proc.c */
 extern ide_proc_entry_t ide_floppy_proc[];
-extern const struct ide_proc_devset ide_floppy_settings[];
 #endif
 #else
 #define ide_floppy_proc		NULL
-#define ide_floppy_settings	NULL
 #endif
 
 #endif /*__IDE_FLOPPY_H */

Index: b/drivers/ide/ide-floppy_proc.c
===================================================================
@@ -30,16 +30,3 @@ ide_proc_entry_t ide_floppy_proc[] = {
 	{ "geometry",	S_IFREG|S_IRUGO, &ide_geometry_proc_fops	},
 	{}
 };
-
-ide_devset_rw_field(bios_cyl, bios_cyl);
-ide_devset_rw_field(bios_head, bios_head);
-ide_devset_rw_field(bios_sect, bios_sect);
-ide_devset_rw_field(ticks, pc_delay);
-
-const struct ide_proc_devset ide_floppy_settings[] = {
-	IDE_PROC_DEVSET(bios_cyl,  0, 1023),
-	IDE_PROC_DEVSET(bios_head, 0,  255),
-	IDE_PROC_DEVSET(bios_sect, 0,   63),
-	IDE_PROC_DEVSET(ticks,	   0,  255),
-	{ NULL },
-};

Index: b/drivers/ide/ide-gd.c
===================================================================
@@ -146,12 +146,6 @@ static ide_proc_entry_t *ide_disk_proc_e
 {
 	return (drive->media == ide_disk) ? ide_disk_proc : ide_floppy_proc;
 }
-
-static const struct ide_proc_devset *ide_disk_proc_devsets(ide_drive_t *drive)
-{
-	return (drive->media == ide_disk) ? ide_disk_settings
-					  : ide_floppy_settings;
-}
 #endif
 
 static ide_startstop_t ide_gd_do_request(ide_drive_t *drive,

@@ -174,7 +168,6 @@ static struct ide_driver ide_gd_driver =
 	.do_request		= ide_gd_do_request,
 #ifdef CONFIG_IDE_PROC_FS
 	.proc_entries		= ide_disk_proc_entries,
-	.proc_devsets		= ide_disk_proc_devsets,
 #endif
 };
 

345 lines not on this page · raw message

75 lines not on this page · raw message

Index: b/include/linux/ide.h
===================================================================
@@ -494,7 +494,6 @@ struct ide_drive_s {
 	u16			*id;	/* identification info */
 #ifdef CONFIG_IDE_PROC_FS
 	struct proc_dir_entry *proc;	/* /proc/ide/ directory entry */
-	const struct ide_proc_devset *settings; /* /proc/ide/ drive settings */
 #endif
 	struct hwif_s		*hwif;	/* actually (ide_hwif_t *) */
 

@@ -907,36 +906,6 @@ ide_decl_devset(using_dma);
  * /proc/ide interface
  */
 
-#define ide_devset_rw_field(_name, _field) \
-ide_devset_get(_name, _field); \
-ide_devset_set(_name, _field); \
-IDE_DEVSET(_name, DS_SYNC, get_##_name, set_##_name)
-
-#define ide_devset_rw_flag(_name, _field) \
-ide_devset_get_flag(_name, _field); \
-ide_devset_set_flag(_name, _field); \
-IDE_DEVSET(_name, DS_SYNC, get_##_name, set_##_name)
-
-struct ide_proc_devset {
-	const char		*name;
-	const struct ide_devset	*setting;
-	int			min, max;
-	int			(*mulf)(ide_drive_t *);
-	int			(*divf)(ide_drive_t *);
-};
-
-#define __IDE_PROC_DEVSET(_name, _min, _max, _mulf, _divf) { \
-	.name = __stringify(_name), \
-	.setting = &ide_devset_##_name, \
-	.min = _min, \
-	.max = _max, \
-	.mulf = _mulf, \
-	.divf = _divf, \
-}
-
-#define IDE_PROC_DEVSET(_name, _min, _max) \
-__IDE_PROC_DEVSET(_name, _min, _max, NULL, NULL)
-
 typedef struct {
 	const char	*name;
 	mode_t		mode;

@@ -1043,7 +1012,6 @@ struct ide_driver {
 	void		(*shutdown)(ide_drive_t *);
 #ifdef CONFIG_IDE_PROC_FS
 	ide_proc_entry_t *		(*proc_entries)(ide_drive_t *);
-	const struct ide_proc_devset *	(*proc_devsets)(ide_drive_t *);
 #endif
 };
 

72 lines not on this page · raw message

Index: b/drivers/ide/ide-disk.c
===================================================================
@@ -651,15 +651,12 @@ static int ide_disk_check(ide_drive_t *d
 
 static void ide_disk_setup(ide_drive_t *drive)
 {
-	struct ide_disk_obj *idkp = drive->driver_data;
 	struct request_queue *q = drive->queue;
 	ide_hwif_t *hwif = drive->hwif;
 	u16 *id = drive->id;
 	char *m = (char *)&id[ATA_ID_PROD];
 	unsigned long long capacity;
 
-	ide_proc_register_driver(drive, idkp->driver);
-
 	if ((drive->dev_flags & IDE_DFLAG_ID_READ) == 0)
 		return;
 

Index: b/drivers/ide/ide-disk.h
===================================================================
@@ -15,13 +15,6 @@ ide_decl_devset(acoustic);
 /* ide-disk_ioctl.c */
 int ide_disk_ioctl(ide_drive_t *, struct block_device *, fmode_t, unsigned int,
 		   unsigned long);
-
-#ifdef CONFIG_IDE_PROC_FS
-/* ide-disk_proc.c */
-extern ide_proc_entry_t ide_disk_proc[];
-#endif
-#else
-#define ide_disk_proc		NULL
 #endif
 
 #endif /* __IDE_DISK_H */

152 lines not on this page · raw message

Index: b/drivers/ide/ide-floppy.c
===================================================================
@@ -468,7 +468,6 @@ static int ide_floppy_get_capacity(ide_d
 
 static void ide_floppy_setup(ide_drive_t *drive)
 {
-	struct ide_disk_obj *floppy = drive->driver_data;
 	u16 *id = drive->id;
 
 	drive->pc_callback	 = ide_floppy_callback;

@@ -502,8 +501,6 @@ static void ide_floppy_setup(ide_drive_t
 
 	(void) ide_floppy_get_capacity(drive);
 
-	ide_proc_register_driver(drive, floppy->driver);
-
 	drive->dev_flags |= IDE_DFLAG_ATTACH;
 }
 

Index: b/drivers/ide/ide-floppy.h
===================================================================
@@ -25,13 +25,6 @@ void ide_floppy_create_read_capacity_cmd
 /* ide-floppy_ioctl.c */
 int ide_floppy_ioctl(ide_drive_t *, struct block_device *, fmode_t,
 		     unsigned int, unsigned long);
-
-#ifdef CONFIG_IDE_PROC_FS
-/* ide-floppy_proc.c */
-extern ide_proc_entry_t ide_floppy_proc[];
-#endif
-#else
-#define ide_floppy_proc		NULL
 #endif
 
 #endif /*__IDE_FLOPPY_H */

Index: b/drivers/ide/ide-floppy_proc.c
===================================================================
@@ -1,32 +0,0 @@
-#include <linux/kernel.h>
-#include <linux/ide.h>
-#include <linux/seq_file.h>
-
-#include "ide-floppy.h"
-
-static int idefloppy_capacity_proc_show(struct seq_file *m, void *v)
-{
-	ide_drive_t*drive = (ide_drive_t *)m->private;
-
-	seq_printf(m, "%llu\n", (long long)ide_gd_capacity(drive));
-	return 0;
-}
-
-static int idefloppy_capacity_proc_open(struct inode *inode, struct file *file)
-{
-	return single_open(file, idefloppy_capacity_proc_show, PDE(inode)->data);
-}
-
-static const struct file_operations idefloppy_capacity_proc_fops = {
-	.owner		= THIS_MODULE,
-	.open		= idefloppy_capacity_proc_open,
-	.read		= seq_read,
-	.llseek		= seq_lseek,
-	.release	= single_release,
-};
-
-ide_proc_entry_t ide_floppy_proc[] = {
-	{ "capacity",	S_IFREG|S_IRUGO, &idefloppy_capacity_proc_fops	},
-	{ "geometry",	S_IFREG|S_IRUGO, &ide_geometry_proc_fops	},
-	{}
-};

Index: b/drivers/ide/ide-gd.c
===================================================================
@@ -66,7 +66,6 @@ static void ide_gd_remove(ide_drive_t *d
 	struct ide_disk_obj *idkp = drive->driver_data;
 	struct gendisk *g = idkp->disk;
 
-	ide_proc_unregister_driver(drive, idkp->driver);
 	device_del(&idkp->dev);
 	del_gendisk(g);
 	drive->disk_ops->flush(drive);

@@ -141,13 +140,6 @@ static void ide_gd_shutdown(ide_drive_t
 	drive->gendev.bus->suspend(&drive->gendev, PMSG_SUSPEND);
 }
 
-#ifdef CONFIG_IDE_PROC_FS
-static ide_proc_entry_t *ide_disk_proc_entries(ide_drive_t *drive)
-{
-	return (drive->media == ide_disk) ? ide_disk_proc : ide_floppy_proc;
-}
-#endif
-
 static ide_startstop_t ide_gd_do_request(ide_drive_t *drive,
 					 struct request *rq, sector_t sector)
 {

@@ -166,9 +158,6 @@ static struct ide_driver ide_gd_driver =
 	.shutdown		= ide_gd_shutdown,
 	.version		= IDE_GD_VERSION,
 	.do_request		= ide_gd_do_request,
-#ifdef CONFIG_IDE_PROC_FS
-	.proc_entries		= ide_disk_proc_entries,
-#endif
 };
 
 static int ide_gd_open(struct block_device *bdev, fmode_t mode)

Index: b/drivers/ide/ide-probe.c
===================================================================
@@ -956,8 +956,6 @@ static void drive_release_dev (struct de
 {
 	ide_drive_t *drive = container_of(dev, ide_drive_t, gendev);
 
-	ide_proc_unregister_device(drive);
-
 	blk_cleanup_queue(drive->queue);
 	drive->queue = NULL;
 

@@ -1465,10 +1463,6 @@ int ide_host_register(struct ide_host *h
 			continue;
 
 		ide_sysfs_register_port(hwif);
-		ide_proc_register_port(hwif);
-
-		if (hwif->present)
-			ide_proc_port_register_devices(hwif);
 	}
 
 	return j ? 0 : -1;

@@ -1545,8 +1539,6 @@ static void ide_unregister(ide_hwif_t *h
 		hwif->present = 0;
 	}
 
-	ide_proc_unregister_port(hwif);
-
 	free_irq(hwif->irq, hwif);
 
 	device_unregister(hwif->portdev);

@@ -1617,6 +1609,5 @@ void ide_port_scan(ide_hwif_t *hwif)
 	ide_port_setup_devices(hwif);
 	ide_acpi_port_init_devices(hwif);
 	hwif_register_devices(hwif);
-	ide_proc_port_register_devices(hwif);
 }
 EXPORT_SYMBOL_GPL(ide_port_scan);

481 lines not on this page · raw message

65 lines not on this page · raw message

Index: b/drivers/ide/ide.c
===================================================================
@@ -385,8 +385,6 @@ static int __init ide_init(void)
 
 	ide_acpi_init();
 
-	proc_ide_create();
-
 	return 0;
 
 out_port_class:

@@ -397,8 +395,6 @@ out_port_class:
 
 static void __exit ide_exit(void)
 {
-	proc_ide_destroy();
-
 	class_destroy(ide_port_class);
 
 	bus_unregister(&ide_bus_type);

59 lines not on this page · raw message