ide: make /proc/ide/ optional
PATCH 1/3 ide: make /proc/ide/ optional
[PATCH] ide: make /proc/ide/ optional
All important information/features should be already available through sysfs and ioctl interfaces.
Add CONFIG_IDE_PROC_FS (CONFIG_SCSI_PROC_FS rip-off) config option, disabling it makes IDE driver ~5 kB smaller (on x86-32).
While at it add CONFIG_PROC_FS=n versions of proc_ide_{create,destroy}() and remove no longer needed #ifdefs.
---
drivers/ide/Kconfig | 11 +++++++++++ drivers/ide/Makefile | 2 +- drivers/ide/ide-cd.c | 4 ++-- drivers/ide/ide-disk.c | 4 ++-- drivers/ide/ide-floppy.c | 4 ++-- drivers/ide/ide-tape.c | 2 +- drivers/ide/ide.c | 15 ++++++--------- drivers/ide/pci/alim15x3.c | 8 ++++---- drivers/ide/pci/amd74xx.c | 6 +++--- drivers/ide/pci/cmd64x.c | 8 ++++---- drivers/ide/pci/sis5513.c | 6 +++--- drivers/scsi/ide-scsi.c | 2 +- include/linux/ide.h | 14 ++++++++------ 13 files changed, 48 insertions(+), 38 deletions(-)
drivers/ide/Kconfig +11 -0
@@ -288,6 +288,17 @@ config IDE_TASK_IOCTL If you are unsure, say N here. +config IDE_PROC_FS + bool "legacy /proc/ide/ support" + depends on IDE && PROC_FS + default y + help + This option enables support for the various files in + /proc/ide. In Linux 2.6 this has been superseded by + files in sysfs but many legacy applications rely on this. + + If unsure say Y. + comment "IDE chipset support/bugfixes" config IDE_GENERIC
drivers/ide/Makefile +1 -1
@@ -20,7 +20,7 @@ ide-core-$(CONFIG_BLK_DEV_CMD640) += pci # Core IDE code - must come before legacy ide-core-$(CONFIG_BLK_DEV_IDEPCI) += setup-pci.o ide-core-$(CONFIG_BLK_DEV_IDEDMA) += ide-dma.o -ide-core-$(CONFIG_PROC_FS) += ide-proc.o +ide-core-$(CONFIG_IDE_PROC_FS) += ide-proc.o ide-core-$(CONFIG_BLK_DEV_IDEPNP) += ide-pnp.o ide-core-$(CONFIG_BLK_DEV_IDEACPI) += ide-acpi.o
drivers/ide/ide-cd.c +2 -2
@@ -3265,7 +3265,7 @@ int ide_cdrom_setup (ide_drive_t *drive)return 0 ; } -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_IDE_PROC_FS static sector_t ide_cdrom_capacity (ide_drive_t *drive) {
@@ -3312,7 +3312,7 @@ static void ide_cd_release(struct kref *static int ide_cd_probe (ide_drive_t *); -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_IDE_PROC_FS static int proc_idecd_read_capacity (char *page,char **start,off_t off,int count,int *eof,void *data) {
drivers/ide/ide-disk.c +2 -2
@@ -561,7 +561,7 @@ static sector_t idedisk_capacity (ide_drreturn drive->capacity64 - drive->sect0; } -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_IDE_PROC_FS static int smart_enable (ide_drive_t *drive) {
@@ -685,7 +685,7 @@ static ide_proc_entry_t idedisk_proc[] =#define idedisk_proc NULL -#endif /* CONFIG_PROC_FS */ +#endif /* CONFIG_IDE_PROC_FS */ static void idedisk_prepare_flush (request_queue_t *q,struct request *rq) {
drivers/ide/ide-floppy.c +2 -2
@@ -1892,7 +1892,7 @@ static void ide_floppy_release(struct krkfree (floppy); } -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_IDE_PROC_FS static int proc_idefloppy_read_capacity (char *page,char **start,off_t off,int count,int *eof,void *data)
@@ -1914,7 +1914,7 @@ static ide_proc_entry_t idefloppy_proc[]#define idefloppy_proc NULL -#endif /* CONFIG_PROC_FS */ +#endif /* CONFIG_IDE_PROC_FS */ static int ide_floppy_probe (ide_drive_t *);
drivers/ide/ide-tape.c +1 -1
@@ -4730,7 +4730,7 @@ static void ide_tape_release(struct krefkfree (tape); } -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_IDE_PROC_FS static int proc_idetape_read_name (char *page,char **start,off_t off,int count,int *eof,void *data)
drivers/ide/ide.c +6 -9
@@ -356,7 +356,7 @@ static int ide_system_bus_speed(void)return system_bus_speed; } -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_IDE_PROC_FS struct proc_dir_entry *proc_ide_root;#endif
@@ -1882,7 +1882,7 @@ static void __init probe_for_hwifs (voidvoid ide_register_subdriver (ide_drive_t *drive,ide_driver_t *driver) { -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_IDE_PROC_FS ide_add_proc_entries (drive->proc, driver->proc, drive);#endif }
@@ -1904,8 +1904,8 @@ EXPORT_SYMBOL(ide_register_subdriver);void ide_unregister_subdriver (ide_drive_t *drive,ide_driver_t *driver) {unsigned long flags; - -#ifdef CONFIG_PROC_FS + +#ifdef CONFIG_IDE_PROC_FS ide_remove_proc_entries (drive->proc, driver->proc);#endif down (&ide_setting_sem);
@@ -2057,7 +2057,7 @@ static int __init ide_init(void)init_ide_data (); -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_IDE_PROC_FS proc_ide_root =proc_mkdir ("ide" ,NULL );#endif
@@ -2087,9 +2087,8 @@ static int __init ide_init(void)probe_for_hwifs (); initializing =0 ; -#ifdef CONFIG_PROC_FS proc_ide_create (); -#endif +return 0 ; }
@@ -2129,9 +2128,7 @@ void __exit cleanup_module (void)pnpide_exit ();#endif -#ifdef CONFIG_PROC_FS proc_ide_destroy (); -#endif bus_unregister (&ide_bus_type); }
drivers/ide/pci/alim15x3.c +4 -4
@@ -50,7 +50,7 @@ static u8 m5229_revision;static u8 chip_is_1543c_e;static struct pci_dev *isa_dev; -#if defined(DISPLAY_ALI_TIMINGS ) && defined(CONFIG_PROC_FS ) +#if defined(DISPLAY_ALI_TIMINGS ) && defined(CONFIG_IDE_PROC_FS )#include <linux/stat.h> #include <linux/proc_fs.h>
@@ -278,7 +278,7 @@ static int ali_get_info (char *buffer, c return p-buffer; /* => must be less than 4k! */ } -#endif /* defined(DISPLAY_ALI_TIMINGS) && defined(CONFIG_PROC_FS) */ +#endif /* defined(DISPLAY_ALI_TIMINGS) && defined(CONFIG_IDE_PROC_FS) */ /** * ali15x3_tune_pio - set up chipset for PIO mode
@@ -567,13 +567,13 @@ static unsigned int __devinit init_chips isa_dev =pci_get_device (PCI_VENDOR_ID_AL ,PCI_DEVICE_ID_AL_M1533 ,NULL ); -#if defined(DISPLAY_ALI_TIMINGS ) && defined(CONFIG_PROC_FS ) +#if defined(DISPLAY_ALI_TIMINGS ) && defined(CONFIG_IDE_PROC_FS )if (!ali_proc) { ali_proc =1 ; bmide_dev = dev;ide_pci_create_host_proc ("ali" , ali_get_info); } -#endif /* defined(DISPLAY_ALI_TIMINGS) && defined(CONFIG_PROC_FS) */ +#endif /* defined(DISPLAY_ALI_TIMINGS) && defined(CONFIG_IDE_PROC_FS) */ local_irq_save (flags);
drivers/ide/pci/amd74xx.c +3 -3
@@ -92,7 +92,7 @@ static unsigned char amd_cyc2udma[] = {* AMD /proc entry. */ -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_IDE_PROC_FS #include <linux/stat.h> #include <linux/proc_fs.h>
@@ -402,14 +402,14 @@ static unsigned int __devinit init_chips* Register /proc/ide/amd74xx entry */ -#if defined(DISPLAY_AMD_TIMINGS ) && defined(CONFIG_PROC_FS ) +#if defined(DISPLAY_AMD_TIMINGS ) && defined(CONFIG_IDE_PROC_FS )if (!amd74xx_proc) { amd_base =pci_resource_start (dev,4 ); bmide_dev = dev;ide_pci_create_host_proc ("amd74xx" , amd74xx_get_info); amd74xx_proc =1 ; } -#endif /* DISPLAY_AMD_TIMINGS && CONFIG_PROC_FS */ +#endif /* DISPLAY_AMD_TIMINGS && CONFIG_IDE_PROC_FS */ return dev->irq; }
drivers/ide/pci/cmd64x.c +4 -4
@@ -76,7 +76,7 @@#define UDIDETCR1 0x7B#define DTPR1 0x7C -#if defined(DISPLAY_CMD64X_TIMINGS ) && defined(CONFIG_PROC_FS ) +#if defined(DISPLAY_CMD64X_TIMINGS ) && defined(CONFIG_IDE_PROC_FS )#include <linux/stat.h> #include <linux/proc_fs.h>
@@ -187,7 +187,7 @@ static int cmd64x_get_info (char *buffer return p-buffer; /* => must be less than 4k! */ } -#endif /* defined(DISPLAY_CMD64X_TIMINGS) && defined(CONFIG_PROC_FS) */ +#endif /* defined(DISPLAY_CMD64X_TIMINGS) && defined(CONFIG_IDE_PROC_FS) */ /* * This routine writes the prepared setup/active/recovery counts
@@ -572,7 +572,7 @@ static unsigned int __devinit init_chips (void )pci_write_config_byte (dev,UDIDETCR0 ,0xf0 );#endif /* CONFIG_PPC */ -#if defined(DISPLAY_CMD64X_TIMINGS ) && defined(CONFIG_PROC_FS ) +#if defined(DISPLAY_CMD64X_TIMINGS ) && defined(CONFIG_IDE_PROC_FS ) cmd_devs[n_cmd_devs++] = dev;
@@ -580,7 +580,7 @@ static unsigned int __devinit init_chips cmd64x_proc =1 ; ide_pci_create_host_proc("cmd64x", cmd64x_get_info); } -#endif /* DISPLAY_CMD64X_TIMINGS && CONFIG_PROC_FS */ +#endif /* DISPLAY_CMD64X_TIMINGS && CONFIG_IDE_PROC_FS */ return 0 ; }
drivers/ide/pci/sis5513.c +3 -3
@@ -191,7 +191,7 @@ static char* chipset_capability[] = { "ATA 133 (1st gen)", "ATA 133 (2nd gen)" }; -#if defined(DISPLAY_SIS_TIMINGS ) && defined(CONFIG_PROC_FS ) +#if defined(DISPLAY_SIS_TIMINGS ) && defined(CONFIG_IDE_PROC_FS )#include <linux/stat.h> #include <linux/proc_fs.h>
@@ -426,7 +426,7 @@ static int sis_get_info (char *buffer, c return len > count ? count : len; } -#endif /* defined(DISPLAY_SIS_TIMINGS) && defined(CONFIG_PROC_FS) */ +#endif /* defined(DISPLAY_SIS_TIMINGS) && defined(CONFIG_IDE_PROC_FS) */ /* * Configuration functions
@@ -797,7 +797,7 @@ static unsigned int __devinit init_chipsbreak ; } -#if defined(DISPLAY_SIS_TIMINGS ) && defined(CONFIG_PROC_FS ) +#if defined(DISPLAY_SIS_TIMINGS ) && defined(CONFIG_IDE_PROC_FS )if (!sis_proc) { sis_proc =1 ; bmide_dev = dev;
drivers/scsi/ide-scsi.c +1 -1
@@ -770,7 +770,7 @@ static void ide_scsi_remove(ide_drive_tstatic int ide_scsi_probe (ide_drive_t *); -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_IDE_PROC_FS static ide_proc_entry_t idescsi_proc[] = { {"capacity" ,S_IFREG |S_IRUGO , proc_ide_read_capacity,NULL }, { NULL, 0, NULL, NULL }
include/linux/ide.h +8 -6
@@ -910,15 +910,15 @@ typedef struct {write_proc_t *write_proc; } ide_proc_entry_t; -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_IDE_PROC_FS extern struct proc_dir_entry *proc_ide_root; -extern void proc_ide_create (void ); -extern void proc_ide_destroy (void ); -extern void create_proc_ide_interfaces (void ); +void proc_ide_create (void ); +void proc_ide_destroy (void ); +void create_proc_ide_interfaces (void );void destroy_proc_ide_interface (ide_hwif_t *); -extern void ide_add_proc_entries (struct proc_dir_entry *,ide_proc_entry_t *,void *); -extern void ide_remove_proc_entries (struct proc_dir_entry *,ide_proc_entry_t *); +void ide_add_proc_entries (struct proc_dir_entry *,ide_proc_entry_t *,void *); +void ide_remove_proc_entries (struct proc_dir_entry *,ide_proc_entry_t *);read_proc_t proc_ide_read_capacity;read_proc_t proc_ide_read_geometry;
@@ -942,6 +942,8 @@ void ide_pci_create_host_proc(const char return len; \ }#else +static inline void proc_ide_create (void ) { ; } +static inline void proc_ide_destroy (void ) { ; }static inline void create_proc_ide_interfaces (void ) { ; }static inline void destroy_proc_ide_interface (ide_hwif_t *hwif) { ; }#define PROC_IDE_READ_RETURN (page,start,off,count,eof,len) return 0;
PATCH 2/3 ide: split off ioctl handling from IDE settings
[PATCH] ide: split off ioctl handling from IDE settings
* do write permission and min/max checks in ide_procset_t functions
* ide-disk.c: drive->id is always available so cleanup "multcount" setting accordingly
* ide-disk.c: "address" setting was incorrectly defined as type TYPE_INTA, fix it by using type TYPE_BYTE and updating ide_drive_t->adressing field, the bug didn't trigger because this IDE setting uses custom ->set function
* ide.c: add set_ksettings() for handling HDIO_SET_KEEPSETTINGS ioctl
* ide.c: add set_unmaskirq() for handling HDIO_SET_UNMASKINTR ioctl
* handle ioctls directly in generic_ide_ioclt() and idedisk_ioctl() instead of using IDE settings to deal with them
* remove no longer needed ide_find_setting_by_ioctl() and {read,write}_ioctl fields from ide_settings_t, also remove now unused TYPE_INTA handling
---
drivers/ide/ide-cd.c | 2 drivers/ide/ide-disk.c | 81 ++++++++++++++++++---- drivers/ide/ide-floppy.c | 10 +- drivers/ide/ide-tape.c | 30 ++++---- drivers/ide/ide.c | 171 +++++++++++++++++++++++++++-------------------- drivers/scsi/ide-scsi.c | 12 +-- include/linux/ide.h | 16 +--- 7 files changed, 198 insertions(+), 124 deletions(-)
drivers/ide/ide-cd.c +1 -1
@@ -3052,7 +3052,7 @@ int ide_cdrom_probe_capabilities (ide_drstatic void ide_cdrom_add_settings (ide_drive_t *drive) { -ide_add_setting (drive,"dsc_overlap" ,SETTING_RW ,-1 ,-1 ,TYPE_BYTE ,0 ,1 ,1 ,1 , &drive->dsc_overlap,NULL ); +ide_add_setting (drive,"dsc_overlap" ,SETTING_RW ,TYPE_BYTE ,0 ,1 ,1 ,1 , &drive->dsc_overlap,NULL ); }/*
drivers/ide/ide-disk.c +68 -13
125 lines not on this page · raw message
drivers/ide/ide-floppy.c +5 -5
@@ -1816,12 +1816,12 @@ static void idefloppy_add_settings(ide_didefloppy_floppy_t *floppy = drive->driver_data;/* -* drive setting name read/write ioctl ioctl data type min max mul_factor div_factor data pointer set function +* drive setting name read/write data type min max mul_factor div_factor data pointer set function */ -ide_add_setting (drive,"bios_cyl" ,SETTING_RW ,-1 ,-1 ,TYPE_INT ,0 ,1023 ,1 ,1 , &drive->bios_cyl,NULL ); -ide_add_setting (drive,"bios_head" ,SETTING_RW ,-1 ,-1 ,TYPE_BYTE ,0 ,255 ,1 ,1 , &drive->bios_head,NULL ); -ide_add_setting (drive,"bios_sect" ,SETTING_RW ,-1 ,-1 ,TYPE_BYTE ,0 ,63 ,1 ,1 , &drive->bios_sect,NULL ); -ide_add_setting (drive,"ticks" ,SETTING_RW ,-1 ,-1 ,TYPE_BYTE ,0 ,255 ,1 ,1 , &floppy->ticks,NULL ); +ide_add_setting (drive,"bios_cyl" ,SETTING_RW ,TYPE_INT ,0 ,1023 ,1 ,1 , &drive->bios_cyl,NULL ); +ide_add_setting (drive,"bios_head" ,SETTING_RW ,TYPE_BYTE ,0 ,255 ,1 ,1 , &drive->bios_head,NULL ); +ide_add_setting (drive,"bios_sect" ,SETTING_RW ,TYPE_BYTE ,0 ,63 ,1 ,1 , &drive->bios_sect,NULL ); +ide_add_setting (drive,"ticks" ,SETTING_RW ,TYPE_BYTE ,0 ,255 ,1 ,1 , &floppy->ticks,NULL ); }/*
drivers/ide/ide-tape.c +15 -15
@@ -4566,22 +4566,22 @@ static void idetape_add_settings (ide_dridetape_tape_t *tape = drive->driver_data;/* -* drive setting name read/write ioctl ioctl data type min max mul_factor div_factor data pointer set function +* drive setting name read/write data type min max mul_factor div_factor data pointer set function */ -ide_add_setting (drive,"buffer" ,SETTING_READ ,-1 ,-1 ,TYPE_SHORT ,0 ,0xffff ,1 ,2 , &tape->capabilities.buffer_size,NULL ); -ide_add_setting (drive,"pipeline_min" ,SETTING_RW ,-1 ,-1 ,TYPE_INT ,1 ,0xffff , tape->stage_size /1024 ,1 , &tape->min_pipeline,NULL ); -ide_add_setting (drive,"pipeline" ,SETTING_RW ,-1 ,-1 ,TYPE_INT ,1 ,0xffff , tape->stage_size /1024 ,1 , &tape->max_stages,NULL ); -ide_add_setting (drive,"pipeline_max" ,SETTING_RW ,-1 ,-1 ,TYPE_INT ,1 ,0xffff , tape->stage_size /1024 ,1 , &tape->max_pipeline,NULL ); -ide_add_setting (drive,"pipeline_used" ,SETTING_READ ,-1 ,-1 ,TYPE_INT ,0 ,0xffff , tape->stage_size /1024 ,1 , &tape->nr_stages,NULL ); -ide_add_setting (drive,"pipeline_pending" ,SETTING_READ ,-1 ,-1 ,TYPE_INT ,0 ,0xffff , tape->stage_size /1024 ,1 , &tape->nr_pending_stages,NULL ); -ide_add_setting (drive,"speed" ,SETTING_READ ,-1 ,-1 ,TYPE_SHORT ,0 ,0xffff ,1 ,1 , &tape->capabilities.speed,NULL ); -ide_add_setting (drive,"stage" ,SETTING_READ ,-1 ,-1 ,TYPE_INT ,0 ,0xffff ,1 ,1024 , &tape->stage_size,NULL ); -ide_add_setting (drive,"tdsc" ,SETTING_RW ,-1 ,-1 ,TYPE_INT ,IDETAPE_DSC_RW_MIN ,IDETAPE_DSC_RW_MAX ,1000 ,HZ , &tape->best_dsc_rw_frequency,NULL ); -ide_add_setting (drive,"dsc_overlap" ,SETTING_RW ,-1 ,-1 ,TYPE_BYTE ,0 ,1 ,1 ,1 , &drive->dsc_overlap,NULL ); -ide_add_setting (drive,"pipeline_head_speed_c" ,SETTING_READ ,-1 ,-1 ,TYPE_INT ,0 ,0xffff ,1 ,1 , &tape->controlled_pipeline_head_speed,NULL ); -ide_add_setting (drive,"pipeline_head_speed_u" ,SETTING_READ ,-1 ,-1 ,TYPE_INT ,0 ,0xffff ,1 ,1 , &tape->uncontrolled_pipeline_head_speed,NULL ); -ide_add_setting (drive,"avg_speed" ,SETTING_READ ,-1 ,-1 ,TYPE_INT ,0 ,0xffff ,1 ,1 , &tape->avg_speed,NULL ); -ide_add_setting (drive,"debug_level" ,SETTING_RW ,-1 ,-1 ,TYPE_INT ,0 ,0xffff ,1 ,1 , &tape->debug_level,NULL ); +ide_add_setting (drive,"buffer" ,SETTING_READ ,TYPE_SHORT ,0 ,0xffff ,1 ,2 , &tape->capabilities.buffer_size,NULL ); +ide_add_setting (drive,"pipeline_min" ,SETTING_RW ,TYPE_INT ,1 ,0xffff , tape->stage_size /1024 ,1 , &tape->min_pipeline,NULL ); +ide_add_setting (drive,"pipeline" ,SETTING_RW ,TYPE_INT ,1 ,0xffff , tape->stage_size /1024 ,1 , &tape->max_stages,NULL ); +ide_add_setting (drive,"pipeline_max" ,SETTING_RW ,TYPE_INT ,1 ,0xffff , tape->stage_size /1024 ,1 , &tape->max_pipeline,NULL ); +ide_add_setting (drive,"pipeline_used" ,SETTING_READ ,TYPE_INT ,0 ,0xffff , tape->stage_size /1024 ,1 , &tape->nr_stages,NULL ); +ide_add_setting (drive,"pipeline_pending" ,SETTING_READ ,TYPE_INT ,0 ,0xffff , tape->stage_size /1024 ,1 , &tape->nr_pending_stages,NULL ); +ide_add_setting (drive,"speed" ,SETTING_READ ,TYPE_SHORT ,0 ,0xffff ,1 ,1 , &tape->capabilities.speed,NULL ); +ide_add_setting (drive,"stage" ,SETTING_READ ,TYPE_INT ,0 ,0xffff ,1 ,1024 , &tape->stage_size,NULL ); +ide_add_setting (drive,"tdsc" ,SETTING_RW ,TYPE_INT ,IDETAPE_DSC_RW_MIN ,IDETAPE_DSC_RW_MAX ,1000 ,HZ , &tape->best_dsc_rw_frequency,NULL ); +ide_add_setting (drive,"dsc_overlap" ,SETTING_RW ,TYPE_BYTE ,0 ,1 ,1 ,1 , &drive->dsc_overlap,NULL ); +ide_add_setting (drive,"pipeline_head_speed_c" ,SETTING_READ ,TYPE_INT ,0 ,0xffff ,1 ,1 , &tape->controlled_pipeline_head_speed,NULL ); +ide_add_setting (drive,"pipeline_head_speed_u" ,SETTING_READ ,TYPE_INT ,0 ,0xffff ,1 ,1 , &tape->uncontrolled_pipeline_head_speed,NULL ); +ide_add_setting (drive,"avg_speed" ,SETTING_READ ,TYPE_INT ,0 ,0xffff ,1 ,1 , &tape->avg_speed,NULL ); +ide_add_setting (drive,"debug_level" ,SETTING_RW ,TYPE_INT ,0 ,0xffff ,1 ,1 , &tape->debug_level,NULL ); }/*
drivers/ide/ide.c +99 -72
282 lines not on this page · raw message
drivers/scsi/ide-scsi.c +6 -6
@@ -726,13 +726,13 @@ static void idescsi_add_settings(ide_driidescsi_scsi_t *scsi =drive_to_idescsi (drive);/* -* drive setting name read/write ioctl ioctl data type min max mul_factor div_factor data pointer set function +* drive setting name read/write data type min max mul_factor div_factor data pointer set function */ -ide_add_setting (drive,"bios_cyl" ,SETTING_RW ,-1 ,-1 ,TYPE_INT ,0 ,1023 ,1 ,1 , &drive->bios_cyl,NULL ); -ide_add_setting (drive,"bios_head" ,SETTING_RW ,-1 ,-1 ,TYPE_BYTE ,0 ,255 ,1 ,1 , &drive->bios_head,NULL ); -ide_add_setting (drive,"bios_sect" ,SETTING_RW ,-1 ,-1 ,TYPE_BYTE ,0 ,63 ,1 ,1 , &drive->bios_sect,NULL ); -ide_add_setting (drive,"transform" ,SETTING_RW ,-1 ,-1 ,TYPE_INT ,0 ,3 ,1 ,1 , &scsi->transform,NULL ); -ide_add_setting (drive,"log" ,SETTING_RW ,-1 ,-1 ,TYPE_INT ,0 ,1 ,1 ,1 , &scsi->log,NULL ); +ide_add_setting (drive,"bios_cyl" ,SETTING_RW ,TYPE_INT ,0 ,1023 ,1 ,1 , &drive->bios_cyl,NULL ); +ide_add_setting (drive,"bios_head" ,SETTING_RW ,TYPE_BYTE ,0 ,255 ,1 ,1 , &drive->bios_head,NULL ); +ide_add_setting (drive,"bios_sect" ,SETTING_RW ,TYPE_BYTE ,0 ,63 ,1 ,1 , &drive->bios_sect,NULL ); +ide_add_setting (drive,"transform" ,SETTING_RW ,TYPE_INT ,0 ,3 ,1 ,1 , &scsi->transform,NULL ); +ide_add_setting (drive,"log" ,SETTING_RW ,TYPE_INT ,0 ,1 ,1 ,1 , &scsi->log,NULL ); }/*
include/linux/ide.h +4 -12
@@ -601,16 +601,11 @@ typedef struct ide_drive_s { unsigned remap_0_to_1 : 1; /* 0=noremap, 1=remap 0->1 (for EZDrive) */ unsigned blocked : 1; /* 1=powermanagment told us not to do anything, so sleep nicely */ unsigned vdma : 1; /* 1=doing PIO over DMA 0=doing normal DMA */ -unsigned addressing;/* : 3; -* 0=28-bit -* 1=48-bit -* 2=48-bit doing 28-bit -* 3=64-bit -*/ unsigned scsi : 1; /* 0=default, 1=ide-scsi emulation */ unsigned sleeping : 1; /* 1=sleeping & sleep field valid */ unsigned post_reset : 1; +u8 addressing;/* 0=28-bit, 1=48-bit, 2=48-bit doing 28-bit */ u8 quirk_list;/* considered quirky, set for a specific host */ u8 init_speed;/* transfer rate set at boot */ u8 pio_speed;/* unused by core, used by some drivers for fallback from DMA */
@@ -868,9 +863,8 @@ typedef struct hwgroup_s {*/ #define TYPE_INT 0 -#define TYPE_INTA 1 -#define TYPE_BYTE 2 -#define TYPE_SHORT 3 +#define TYPE_BYTE 1 +#define TYPE_SHORT 2#define SETTING_READ (1 << 0)#define SETTING_WRITE (1 << 1)
@@ -880,8 +874,6 @@ typedef int (ide_procset_t)(ide_drive_t typedef struct ide_settings_s { char *name; int rw; - int read_ioctl; - int write_ioctl; int data_type; int min; int max;
@@ -894,7 +886,7 @@ typedef struct ide_settings_s { } ide_settings_t;extern struct semaphore ide_setting_sem; -extern int ide_add_setting (ide_drive_t *drive,const char *name,int rw,int read_ioctl,int write_ioctl,int data_type,int min,int max,int mul_factor,int div_factor,void *data,ide_procset_t *set); +int ide_add_setting (ide_drive_t *,const char *,int ,int ,int ,int ,int ,int ,void *,ide_procset_t *set);extern ide_settings_t *ide_find_setting_by_name (ide_drive_t *drive,char *name);extern int ide_read_setting (ide_drive_t *t,ide_settings_t *setting);extern int ide_write_setting (ide_drive_t *drive,ide_settings_t *setting,int val);
PATCH 3/3 ide: move IDE settings handling to ide-proc.c
In reply to Bartlomiej Zolnierkiewicz[PATCH] ide: move IDE settings handling to ide-proc.c
* move
__ide_add_setting() ide_add_setting() __ide_remove_setting() auto_remove_settings() ide_find_setting_by_name() ide_read_setting() ide_write_setting() set_xfer_rate() ide_add_generic_settings() ide_register_subdriver() ide_unregister_subdriver()
from ide.c to ide-proc.c
* set_{io_32bit,pio_mode,using_dma}() cannot be marked static now, fix it
* rename ide_[un]register_subdriver() to ide_proc_[un]register_driver(), update device drivers to use new names
* add CONFIG_IDE_PROC_FS=n versions of ide_proc_[un]register_driver() and ide_add_generic_settings()
* make ide_find_setting_by_name(), ide_{read,write}_setting() and ide_{add,remove}_proc_entries() static
* cover IDE settings code in device drivers with CONFIG_IDE_PROC_FS #ifdef, also while at it cover with CONFIG_IDE_PROC_FS #ifdef ide_driver_t.proc
* remove bogus comment from ide.h
* cover with CONFIG_IDE_PROC_FS #ifdef .proc and .settings in ide_drive_t
Besides saner code this patch results in the IDE core smaller by ~2 kB (on x86-32) and IDE disk driver by ~1 kB (ditto) when CONFIG_IDE_PROC_FS=n.
---
drivers/ide/ide-cd.c | 14 +- drivers/ide/ide-disk.c | 16 +- drivers/ide/ide-floppy.c | 16 +- drivers/ide/ide-proc.c | 310 ++++++++++++++++++++++++++++++++++++++++++++++ drivers/ide/ide-tape.c | 17 +- drivers/ide/ide.c | 313 ----------------------------------------------- drivers/scsi/ide-scsi.c | 16 +- include/linux/ide.h | 39 +++-- 8 files changed, 378 insertions(+), 363 deletions(-)
drivers/ide/ide-cd.c +9 -5
@@ -3050,10 +3050,14 @@ int ide_cdrom_probe_capabilities (ide_drreturn nslots; } +#ifdef CONFIG_IDE_PROC_FS static void ide_cdrom_add_settings (ide_drive_t *drive) {ide_add_setting (drive,"dsc_overlap" ,SETTING_RW ,TYPE_BYTE ,0 ,1 ,1 ,1 , &drive->dsc_overlap,NULL ); } +#else +static inline void ide_cdrom_add_settings (ide_drive_t *drive) { ; } +#endif /* * standard prep_rq_fn that builds 10 byte cmds
@@ -3282,7 +3286,7 @@ static void ide_cd_remove(ide_drive_t *d {struct cdrom_info *info = drive->driver_data; -ide_unregister_subdriver (drive, info->driver); +ide_proc_unregister_driver (drive, info->driver);del_gendisk (info->disk);
@@ -3327,8 +3331,6 @@ static ide_proc_entry_t idecd_proc[] = { { "capacity", S_IFREG|S_IRUGO, proc_idecd_read_capacity, NULL }, { NULL, 0, NULL, NULL } }; -#else -# define idecd_proc NULL #endif static ide_driver_t ide_cdrom_driver = {
@@ -3346,7 +3348,9 @@ static ide_driver_t ide_cdrom_driver = { .end_request = ide_end_request, .error = __ide_error, .abort = __ide_abort, +#ifdef CONFIG_IDE_PROC_FS .proc = idecd_proc, +#endif };static int idecd_open (struct inode * inode,struct file * file)
@@ -3508,7 +3512,7 @@ static int ide_cd_probe(ide_drive_t *driide_init_disk (g, drive); -ide_register_subdriver (drive, &ide_cdrom_driver); +ide_proc_register_driver (drive, &ide_cdrom_driver);kref_init (&info->kref);
@@ -3525,7 +3529,7 @@ static int ide_cd_probe(ide_drive_t *dri g->flags =GENHD_FL_CD |GENHD_FL_REMOVABLE ;if (ide_cdrom_setup (drive)) {struct cdrom_device_info *devinfo = &info->devinfo; -ide_unregister_subdriver (drive, &ide_cdrom_driver); +ide_proc_unregister_driver (drive, &ide_cdrom_driver);kfree (info->buffer);kfree (info->toc);kfree (info->changer_info);
drivers/ide/ide-disk.c +8 -8
@@ -562,7 +562,6 @@ static sector_t idedisk_capacity (ide_dr }#ifdef CONFIG_IDE_PROC_FS -static int smart_enable (ide_drive_t *drive) {ide_task_t args;
@@ -680,11 +679,6 @@ static ide_proc_entry_t idedisk_proc[] = { "smart_thresholds", S_IFREG|S_IRUSR, proc_idedisk_read_smart_thresholds, NULL }, { NULL, 0, NULL, NULL } }; - -#else - -#define idedisk_proc NULL - #endif /* CONFIG_IDE_PROC_FS */ static void idedisk_prepare_flush(request_queue_t *q, struct request *rq)
@@ -883,6 +877,7 @@ static int set_lba_addressing(ide_drive_return 0 ; } +#ifdef CONFIG_IDE_PROC_FS static void idedisk_add_settings (ide_drive_t *drive) {struct hd_driveid *id = drive->id;
@@ -900,6 +895,9 @@ static void idedisk_add_settings(ide_driide_add_setting (drive,"failures" ,SETTING_RW ,TYPE_INT ,0 ,65535 ,1 ,1 , &drive->failures,NULL ); ide_add_setting(drive, "max_failures", SETTING_RW, TYPE_INT, 0, 65535, 1, 1, &drive->max_failures, NULL); } +#else +static inline void idedisk_add_settings (ide_drive_t *drive) { ; } +#endif static void idedisk_setup (ide_drive_t *drive) {
@@ -1018,7 +1016,7 @@ static void ide_disk_remove(ide_drive_tstruct ide_disk_obj *idkp = drive->driver_data;struct gendisk *g = idkp->disk; -ide_unregister_subdriver (drive, idkp->driver); +ide_proc_unregister_driver (drive, idkp->driver);del_gendisk (g);
@@ -1083,7 +1081,9 @@ static ide_driver_t idedisk_driver = { .end_request = ide_end_request, .error = __ide_error, .abort = __ide_abort, +#ifdef CONFIG_IDE_PROC_FS .proc = idedisk_proc, +#endif };static int idedisk_open (struct inode *inode,struct file *filp)
@@ -1259,7 +1259,7 @@ static int ide_disk_probe(ide_drive_t *dide_init_disk (g, drive); -ide_register_subdriver (drive, &idedisk_driver); +ide_proc_register_driver (drive, &idedisk_driver);kref_init (&idkp->kref);
drivers/ide/ide-floppy.c +8 -8
@@ -1811,6 +1811,7 @@ static int idefloppy_identify_device (idreturn 0 ; } +#ifdef CONFIG_IDE_PROC_FS static void idefloppy_add_settings (ide_drive_t *drive) {idefloppy_floppy_t *floppy = drive->driver_data;
@@ -1823,6 +1824,9 @@ static void idefloppy_add_settings(ide_dide_add_setting (drive,"bios_sect" ,SETTING_RW ,TYPE_BYTE ,0 ,63 ,1 ,1 , &drive->bios_sect,NULL ); ide_add_setting(drive, "ticks", SETTING_RW, TYPE_BYTE, 0, 255, 1, 1, &floppy->ticks, NULL); } +#else +static inline void idefloppy_add_settings (ide_drive_t *drive) { ; } +#endif /* * Driver initialization.
@@ -1873,7 +1877,7 @@ static void ide_floppy_remove(ide_drive_idefloppy_floppy_t *floppy = drive->driver_data;struct gendisk *g = floppy->disk; -ide_unregister_subdriver (drive, floppy->driver); +ide_proc_unregister_driver (drive, floppy->driver);del_gendisk (g);
@@ -1893,7 +1897,6 @@ static void ide_floppy_release(struct kr }#ifdef CONFIG_IDE_PROC_FS -static int proc_idefloppy_read_capacity (char *page,char **start,off_t off,int count,int *eof,void *data) {
@@ -1909,11 +1912,6 @@ static ide_proc_entry_t idefloppy_proc[] { "geometry", S_IFREG|S_IRUGO, proc_ide_read_geometry, NULL }, { NULL, 0, NULL, NULL } }; - -#else - -#define idefloppy_proc NULL - #endif /* CONFIG_IDE_PROC_FS */ static int ide_floppy_probe(ide_drive_t *);
@@ -1933,7 +1931,9 @@ static ide_driver_t idefloppy_driver = { .end_request = idefloppy_do_end_request, .error = __ide_error, .abort = __ide_abort, +#ifdef CONFIG_IDE_PROC_FS .proc = idefloppy_proc, +#endif };static int idefloppy_open (struct inode *inode,struct file *filp)
@@ -2159,7 +2159,7 @@ static int ide_floppy_probe(ide_drive_tide_init_disk (g, drive); -ide_register_subdriver (drive, &idefloppy_driver); +ide_proc_register_driver (drive, &idefloppy_driver);kref_init (&floppy->kref);
drivers/ide/ide-proc.c +308 -2
340 lines not on this page · raw message
drivers/ide/ide-tape.c +9 -8
@@ -4561,6 +4561,8 @@ static void idetape_get_blocksize_from_bprintk (KERN_INFO "ide-tape: Adjusted block size - %d\n" , tape->tape_block_size);#endif /* IDETAPE_DEBUG_INFO */ } + +#ifdef CONFIG_IDE_PROC_FS static void idetape_add_settings (ide_drive_t *drive) {idetape_tape_t *tape = drive->driver_data;
@@ -4583,6 +4585,9 @@ static void idetape_add_settings (ide_dride_add_setting (drive,"avg_speed" ,SETTING_READ ,TYPE_INT ,0 ,0xffff ,1 ,1 , &tape->avg_speed,NULL ); ide_add_setting(drive, "debug_level", SETTING_RW, TYPE_INT, 0, 0xffff, 1, 1, &tape->debug_level, NULL); } +#else +static inline void idetape_add_settings (ide_drive_t *drive) { ; } +#endif /* * ide_setup is called to:
@@ -4703,7 +4708,7 @@ static void ide_tape_remove(ide_drive_t {idetape_tape_t *tape = drive->driver_data; -ide_unregister_subdriver (drive, tape->driver); +ide_proc_unregister_driver (drive, tape->driver);ide_unregister_region (tape->disk);
@@ -4731,7 +4736,6 @@ static void ide_tape_release(struct kref }#ifdef CONFIG_IDE_PROC_FS -static int proc_idetape_read_name (char *page,char **start,off_t off,int count,int *eof,void *data) {
@@ -4749,11 +4753,6 @@ static ide_proc_entry_t idetape_proc[] = { "name", S_IFREG|S_IRUGO, proc_idetape_read_name, NULL }, { NULL, 0, NULL, NULL } }; - -#else - -#define idetape_proc NULL - #endif static int ide_tape_probe(ide_drive_t *);
@@ -4773,7 +4772,9 @@ static ide_driver_t idetape_driver = { .end_request = idetape_end_request, .error = __ide_error, .abort = __ide_abort, +#ifdef CONFIG_IDE_PROC_FS .proc = idetape_proc, +#endif };/*
@@ -4864,7 +4865,7 @@ static int ide_tape_probe(ide_drive_t *dide_init_disk (g, drive); -ide_register_subdriver (drive, &idetape_driver); +ide_proc_register_driver (drive, &idetape_driver);kref_init (&tape->kref);
drivers/ide/ide.c +3 -310
349 lines not on this page · raw message
drivers/scsi/ide-scsi.c +10 -6
@@ -721,6 +721,7 @@ static ide_startstop_t idescsi_do_requesreturn ide_stopped; } +#ifdef CONFIG_IDE_PROC_FS static void idescsi_add_settings (ide_drive_t *drive) {idescsi_scsi_t *scsi =drive_to_idescsi (drive);
@@ -734,6 +735,9 @@ static void idescsi_add_settings(ide_driide_add_setting (drive,"transform" ,SETTING_RW ,TYPE_INT ,0 ,3 ,1 ,1 , &scsi->transform,NULL ); ide_add_setting(drive, "log", SETTING_RW, TYPE_INT, 0, 1, 1, 1, &scsi->log, NULL); } +#else +static inline void idescsi_add_settings (ide_drive_t *drive) { ; } +#endif /* * Driver initialization.
@@ -756,7 +760,7 @@ static void ide_scsi_remove(ide_drive_tstruct ide_scsi_obj *scsi =scsihost_to_idescsi (scsihost);struct gendisk *g = scsi->disk; -ide_unregister_subdriver (drive, scsi->driver); +ide_proc_unregister_driver (drive, scsi->driver);ide_unregister_region (g);
@@ -775,8 +779,6 @@ static ide_proc_entry_t idescsi_proc[] = { "capacity", S_IFREG|S_IRUGO, proc_ide_read_capacity, NULL }, { NULL, 0, NULL, NULL } }; -#else -# define idescsi_proc NULL #endif static ide_driver_t idescsi_driver = {
@@ -790,11 +792,13 @@ static ide_driver_t idescsi_driver = { .version = IDESCSI_VERSION, .media = ide_scsi, .supports_dsc_overlap = 0, - .proc = idescsi_proc, .do_request = idescsi_do_request, .end_request = idescsi_end_request, .error = idescsi_atapi_error, .abort = idescsi_atapi_abort, +#ifdef CONFIG_IDE_PROC_FS + .proc = idescsi_proc, +#endif };static int idescsi_ide_open (struct inode *inode,struct file *filp)
@@ -1153,7 +1157,7 @@ static int ide_scsi_probe(ide_drive_t *d idescsi->host = host; idescsi->disk = g; g->private_data = &idescsi->driver; -ide_register_subdriver (drive, &idescsi_driver); +ide_proc_register_driver (drive, &idescsi_driver); err =0 ;idescsi_setup (drive, idescsi); g->fops = &idescsi_ops;
@@ -1165,7 +1169,7 @@ static int ide_scsi_probe(ide_drive_t *d }/* fall through on error */ ide_unregister_region (g); -ide_unregister_subdriver (drive, &idescsi_driver); +ide_proc_unregister_driver (drive, &idescsi_driver);put_disk (g); out_host_put:
include/linux/ide.h +23 -16
@@ -559,9 +559,10 @@ typedef struct ide_drive_s {struct ide_drive_s *next;/* circular list of hwgroup drives */ void *driver_data;/* extra driver data */ struct hd_driveid *id;/* drive model identification info */ +#ifdef CONFIG_IDE_PROC_FS struct proc_dir_entry *proc;/* /proc/ide/ directory entry */ struct ide_settings_s *settings;/* /proc/ide/ drive settings */ - +#endif struct hwif_s *hwif;/* actually (ide_hwif_t *) */ unsigned long sleep;/* sleep until this time */
@@ -856,8 +857,15 @@ typedef struct hwgroup_s {unsigned char cmd_buf[4 ]; } ide_hwgroup_t; -/* structure attached to the request for IDE_TASK_CMDS */ +typedef struct ide_driver_s ide_driver_t ; + +extern struct semaphore ide_setting_sem; +int set_io_32bit (ide_drive_t *,int ); +int set_pio_mode (ide_drive_t *,int ); +int set_using_dma (ide_drive_t *,int ); + +#ifdef CONFIG_IDE_PROC_FS /* * configurable drive settings */
@@ -885,12 +893,7 @@ typedef struct ide_settings_s {struct ide_settings_s *next; } ide_settings_t; -extern struct semaphore ide_setting_sem;int ide_add_setting (ide_drive_t *,const char *,int ,int ,int ,int ,int ,int ,void *,ide_procset_t *set); -extern ide_settings_t *ide_find_setting_by_name (ide_drive_t *drive,char *name); -extern int ide_read_setting (ide_drive_t *t,ide_settings_t *setting); -extern int ide_write_setting (ide_drive_t *drive,ide_settings_t *setting,int val); -extern void ide_add_generic_settings (ide_drive_t *drive);/* * /proc/ide interface
@@ -902,15 +905,17 @@ typedef struct {write_proc_t *write_proc; } ide_proc_entry_t; -#ifdef CONFIG_IDE_PROC_FS extern struct proc_dir_entry *proc_ide_root;void proc_ide_create (void );void proc_ide_destroy (void );void create_proc_ide_interfaces (void );void destroy_proc_ide_interface (ide_hwif_t *); -void ide_add_proc_entries (struct proc_dir_entry *,ide_proc_entry_t *,void *); -void ide_remove_proc_entries (struct proc_dir_entry *,ide_proc_entry_t *); +void ide_proc_register_driver (ide_drive_t *,ide_driver_t *); +void ide_proc_unregister_driver (ide_drive_t *,ide_driver_t *); + +void ide_add_generic_settings (ide_drive_t *); +read_proc_t proc_ide_read_capacity;read_proc_t proc_ide_read_geometry;
@@ -938,6 +943,9 @@ static inline void proc_ide_create(void)static inline void proc_ide_destroy (void ) { ; }static inline void create_proc_ide_interfaces (void ) { ; }static inline void destroy_proc_ide_interface (ide_hwif_t *hwif) { ; } +static inline void ide_proc_register_driver (ide_drive_t *drive,ide_driver_t *driver) { ; } +static inline void ide_proc_unregister_driver (ide_drive_t *drive,ide_driver_t *driver) { ; } +static inline void ide_add_generic_settings (ide_drive_t *drive) { ; }#define PROC_IDE_READ_RETURN (page,start,off,count,eof,len) return 0;#endif
@@ -980,7 +988,7 @@ enum {* The gendriver.owner field should be set to the module owner of this driver. * The gendriver.name field should be set to the name of this driver */ -typedef struct ide_driver_s { +struct ide_driver_s {const char *version;u8 media;unsigned supports_dsc_overlap :1 ;
@@ -988,12 +996,14 @@ typedef struct ide_driver_s {int (*end_request)(ide_drive_t *,int ,int );ide_startstop_t (*error)(ide_drive_t *,struct request *rq,u8 ,u8 );ide_startstop_t (*abort)(ide_drive_t *,struct request *rq); -ide_proc_entry_t *proc;struct device_driver gen_driver;int (*probe)(ide_drive_t *);void (*remove)(ide_drive_t *);void (*shutdown)(ide_drive_t *); -} ide_driver_t; +#ifdef CONFIG_IDE_PROC_FS +ide_proc_entry_t *proc; +#endif +};#define to_ide_driver (drv) container_of(drv, ide_driver_t, gen_driver)
@@ -1203,9 +1213,6 @@ extern void default_hwif_iops(ide_hwif_textern void default_hwif_mmiops (ide_hwif_t *);extern void default_hwif_transport (ide_hwif_t *); -void ide_register_subdriver (ide_drive_t *,ide_driver_t *); -void ide_unregister_subdriver (ide_drive_t *,ide_driver_t *); -#define ON_BOARD 1#define NEVER_BOARD 0