ide: remove SECTOR_WORDS define
PATCH 1/5 ide: remove SECTOR_WORDS define
Just use SECTOR_SIZE instead.
---
another batch of small cleanups...
drivers/ide/ide-disk.c | 5 +++-- drivers/ide/ide-iops.c | 2 +- drivers/ide/ide-probe.c | 2 +- drivers/ide/ide-proc.c | 5 +++-- drivers/ide/ide-taskfile.c | 2 +- include/linux/ide.h | 2 +- 6 files changed, 10 insertions(+), 8 deletions(-)
drivers/ide/ide-disk.c +3 -2
@@ -546,13 +546,14 @@ static int proc_idedisk_read_smart(charif (get_smart_data (drive, page, sub_cmd) ==0 ) {unsigned short *val = (unsigned short *) page; -char *out = ((char *)val) + (SECTOR_WORDS *4 ); +char *out = (char *)val +SECTOR_SIZE ; + page = out;do { out +=sprintf (out,"%04x%c" ,le16_to_cpu (*val), (++i &7 ) ?' ' :'\n' ); val +=1 ; - }while (i < (SECTOR_WORDS *2 )); + }while (i <SECTOR_SIZE /2 ); len = out - page; }
drivers/ide/ide-iops.c +1 -1
@@ -693,7 +693,7 @@ int ide_driveid_update(ide_drive_t *driv }local_irq_save (flags);SELECT_MASK (drive,0 ); - id =kmalloc (SECTOR_WORDS *4 ,GFP_ATOMIC ); + id =kmalloc (SECTOR_SIZE ,GFP_ATOMIC );if (!id) {local_irq_restore (flags);return 0 ;
drivers/ide/ide-probe.c +1 -1
@@ -561,7 +561,7 @@ static inline u8 probe_for_drive (ide_dr* Also note that 0 everywhere means "can't do X" */ - drive->id =kzalloc (SECTOR_WORDS *4 ,GFP_KERNEL ); + drive->id =kzalloc (SECTOR_SIZE ,GFP_KERNEL ); drive->id_read =0 ;if (drive->id ==NULL ) {
drivers/ide/ide-proc.c +3 -2
@@ -100,13 +100,14 @@ static int proc_ide_read_identify err =taskfile_lib_get_identify (drive, page);if (!err) { -char *out = ((char *)page) + (SECTOR_WORDS *4 ); +char *out = (char *)page +SECTOR_SIZE ; + page = out;do { out +=sprintf (out,"%04x%c" ,le16_to_cpup (val), (++i &7 ) ?' ' :'\n' ); val +=1 ; - }while (i < (SECTOR_WORDS *2 )); + }while (i <SECTOR_SIZE /2 ); len = out - page; } }
drivers/ide/ide-taskfile.c +1 -1
@@ -768,7 +768,7 @@ int ide_cmd_ioctl (ide_drive_t *drive, uif (args[3 ]) { tfargs.tf_flags |=IDE_TFLAG_IO_16BIT ; - bufsize =SECTOR_WORDS *4 * args[3 ]; + bufsize =SECTOR_SIZE * args[3 ]; buf =kzalloc (bufsize,GFP_KERNEL );if (buf ==NULL )return -ENOMEM ;
include/linux/ide.h +1 -1
@@ -126,7 +126,7 @@ struct ide_io_ports {#define PARTN_BITS 6/* number of minor dev bits for partitions */ #define MAX_DRIVES 2/* per interface; 2 assumed by lots of code */ #define SECTOR_SIZE 512 -#define SECTOR_WORDS (SECTOR_SIZE / 4)/* number of 32bit words per sector */ +#define IDE_LARGE_SEEK (b1,b2,t) (((b1) > (b2) + (t)) || ((b2) > (b1) + (t)))/*
PATCH 2/5 cmd640: add __set_prefetch_mode()
Factor out the common code from check_prefetch()
and set_prefetch_mode() to __set_prefetch_mode().
--- drivers/ide/pci/cmd640.c | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-)
drivers/ide/pci/cmd640.c +20 -22
@@ -374,6 +374,21 @@ static void cmd640_dump_regs(void) }#endif +static void __set_prefetch_mode (ide_drive_t *drive,int mode) +{ +if (mode) {/* want prefetch on? */ +#if CMD640_PREFETCH_MASKS + drive->no_unmask =1 ; + drive->unmask =0 ; +#endif + drive->no_io_32bit =0 ; + }else { + drive->no_unmask =0 ; + drive->no_io_32bit =1 ; + drive->io_32bit =0 ; + } +} +#ifndef CONFIG_BLK_DEV_CMD640_ENHANCED /* * Check whether prefetch is on for a drive,
@@ -383,19 +398,10 @@ static void __init check_prefetch(ide_dr {u8 b =get_cmd640_reg (prefetch_regs[index]); -if (b & prefetch_masks[index]) {/* is prefetch off? */ - drive->no_unmask =0 ; - drive->no_io_32bit =1 ; - drive->io_32bit =0 ; - }else { -#if CMD640_PREFETCH_MASKS - drive->no_unmask =1 ; - drive->unmask =0 ; -#endif - drive->no_io_32bit =0 ; - } +__set_prefetch_mode (drive, (b & prefetch_masks[index]) ?0 :1 ); }#else +/* * Sets prefetch mode for a drive. */
@@ -407,19 +413,11 @@ static void set_prefetch_mode(ide_drive_spin_lock_irqsave (&cmd640_lock, flags); b =__get_cmd640_reg (reg); -if (mode) {/* want prefetch on? */ -#if CMD640_PREFETCH_MASKS - drive->no_unmask =1 ; - drive->unmask =0 ; -#endif - drive->no_io_32bit =0 ; +__set_prefetch_mode (drive, mode); +if (mode) b &= ~prefetch_masks[index];/* enable prefetch */ - }else { - drive->no_unmask =0 ; - drive->no_io_32bit =1 ; - drive->io_32bit =0 ; +else b |= prefetch_masks[index];/* disable prefetch */ - }__put_cmd640_reg (reg, b);spin_unlock_irqrestore (&cmd640_lock, flags); }
PATCH 3/5 ide: remove read-only ->atapi_overlap field from ide_drive_t
In reply to Bartlomiej Zolnierkiewicz--- drivers/ide/ide.c | 1 - include/linux/ide.h | 1 - 2 files changed, 2 deletions(-)
drivers/ide/ide.c +0 -1
@@ -585,7 +585,6 @@ int generic_ide_ioctl(ide_drive_t *drivereturn ide_get_identity_ioctl (drive, cmd, arg);case HDIO_GET_NICE :return put_user (drive->dsc_overlap <<IDE_NICE_DSC_OVERLAP | - drive->atapi_overlap <<IDE_NICE_ATAPI_OVERLAP | drive->nice1 <<IDE_NICE_1 , (long __user *) arg);#ifdef CONFIG_IDE_TASK_IOCTL
include/linux/ide.h +0 -1
@@ -424,7 +424,6 @@ struct ide_drive_s { unsigned forced_geom : 1; /* 1 if hdx=c,h,s was given at boot */ unsigned no_unmask : 1; /* disallow setting unmask bit */ unsigned no_io_32bit : 1; /* disallow enabling 32bit I/O */ - unsigned atapi_overlap : 1; /* ATAPI overlap (not supported) */ unsigned doorlocking : 1; /* for removable only: door lock/unlock works */ unsigned nodma : 1; /* disallow DMA */ unsigned blocked : 1; /* 1=powermanagment told us not to do anything, so sleep nicely */
PATCH 4/5 ide: remove ->supports_dsc_overlap field from ide_driver_t
In reply to Bartlomiej Zolnierkiewicz* Use drive->media and drive->scsi to check if ->dsc_overlap can be set by HDIO_SET_NICE ioctl in generic_ide_ioctl().
* Remove unused ->supports_dsc_overlap field from ide_driver_t.
There should be no functional changes caused by this patch.
--- drivers/ide/ide-cd.c | 1 - drivers/ide/ide-disk.c | 1 - drivers/ide/ide-floppy.c | 1 - drivers/ide/ide-tape.c | 1 - drivers/ide/ide.c | 11 +++++------ drivers/scsi/ide-scsi.c | 1 - include/linux/ide.h | 1 - 7 files changed, 5 insertions(+), 12 deletions(-)
drivers/ide/ide-cd.c +0 -1
@@ -1961,7 +1961,6 @@ static ide_driver_t ide_cdrom_driver = { .remove = ide_cd_remove, .version = IDECD_VERSION, .media = ide_cdrom, - .supports_dsc_overlap = 1, .do_request = ide_cd_do_request, .end_request = ide_end_request, .error = __ide_error,
drivers/ide/ide-disk.c +0 -1
@@ -987,7 +987,6 @@ static ide_driver_t idedisk_driver = { .shutdown = ide_device_shutdown, .version = IDEDISK_VERSION, .media = ide_disk, - .supports_dsc_overlap = 0, .do_request = ide_do_rw_disk, .end_request = ide_end_request, .error = __ide_error,
drivers/ide/ide-floppy.c +0 -1
@@ -1129,7 +1129,6 @@ static ide_driver_t idefloppy_driver = { .remove = ide_floppy_remove, .version = IDEFLOPPY_VERSION, .media = ide_floppy, - .supports_dsc_overlap = 0, .do_request = idefloppy_do_request, .end_request = idefloppy_end_request, .error = __ide_error,
drivers/ide/ide-tape.c +0 -1
@@ -2605,7 +2605,6 @@ static ide_driver_t idetape_driver = { .remove = ide_tape_remove, .version = IDETAPE_VERSION, .media = ide_tape, - .supports_dsc_overlap = 1, .do_request = idetape_do_request, .end_request = idetape_end_request, .error = __ide_error,
drivers/ide/ide.c +5 -6
@@ -562,7 +562,6 @@ int generic_ide_ioctl(ide_drive_t *drive unsigned int cmd, unsigned long arg) {unsigned long flags; -ide_driver_t *drv;int err =0 , (*getfunc)(ide_drive_t *), (*setfunc)(ide_drive_t *,int );switch (cmd) {
@@ -612,12 +611,12 @@ int generic_ide_ioctl(ide_drive_t *driveif (!capable (CAP_SYS_ADMIN ))return -EACCES ;if (arg != (arg & ((1 <<IDE_NICE_DSC_OVERLAP ) | (1 <<IDE_NICE_1 ))))return -EPERM ; - drive->dsc_overlap = (arg >>IDE_NICE_DSC_OVERLAP ) &1 ; - drv = *(ide_driver_t **)bdev->bd_disk->private_data; -if (drive->dsc_overlap && !drv->supports_dsc_overlap) { - drive->dsc_overlap =0 ; +if (((arg >>IDE_NICE_DSC_OVERLAP ) &1 ) && + (drive->media == ide_disk || + drive->media == ide_floppy || + drive->scsi))return -EPERM ; - } + drive->dsc_overlap = (arg >>IDE_NICE_DSC_OVERLAP ) &1 ; drive->nice1 = (arg >>IDE_NICE_1 ) &1 ;return 0 ;case HDIO_DRIVE_RESET :
drivers/scsi/ide-scsi.c +0 -1
@@ -521,7 +521,6 @@ static ide_driver_t idescsi_driver = { .remove = ide_scsi_remove, .version = IDESCSI_VERSION, .media = ide_scsi, - .supports_dsc_overlap = 0, .do_request = idescsi_do_request, .end_request = idescsi_end_request, .error = idescsi_atapi_error,
include/linux/ide.h +0 -1
@@ -921,7 +921,6 @@ enum {struct ide_driver_s {const char *version;u8 media; -unsigned supports_dsc_overlap :1 ;ide_startstop_t (*do_request)(ide_drive_t *,struct request *,sector_t );int (*end_request)(ide_drive_t *,int ,int );ide_startstop_t (*error)(ide_drive_t *,struct request *rq,u8 ,u8 );
PATCH 5/5 ide: factor out HDIO_*_NICE ioctl handling to ide_*_nice_ioctl()
In reply to Bartlomiej ZolnierkiewiczFactor out HDIO_{GET,SET}_NICE ioctl handling from generic_ide_ioctl() to ide_{get,set}_nice_ioctl().
--- drivers/ide/ide.c | 40 ++++++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 14 deletions(-)
drivers/ide/ide.c +26 -14
@@ -558,6 +558,28 @@ out:return rc; } +static int ide_get_nice_ioctl (ide_drive_t *drive,unsigned long arg) +{ +return put_user ((drive->dsc_overlap <<IDE_NICE_DSC_OVERLAP ) | + (drive->nice1 <<IDE_NICE_1 ), (long __user *)arg); +} + +static int ide_set_nice_ioctl (ide_drive_t *drive,unsigned long arg) +{ +if (arg != (arg & ((1 <<IDE_NICE_DSC_OVERLAP ) | (1 <<IDE_NICE_1 )))) +return -EPERM ; + +if (((arg >>IDE_NICE_DSC_OVERLAP ) &1 ) && + (drive->media == ide_disk || drive->media == ide_floppy || + drive->scsi)) +return -EPERM ; + + drive->dsc_overlap = (arg >>IDE_NICE_DSC_OVERLAP ) &1 ; + drive->nice1 = (arg >>IDE_NICE_1 ) &1 ; + +return 0 ; +} +int generic_ide_ioctl (ide_drive_t *drive,struct file *file,struct block_device *bdev,unsigned int cmd,unsigned long arg) {
@@ -583,9 +605,7 @@ int generic_ide_ioctl(ide_drive_t *drivereturn -EINVAL ;return ide_get_identity_ioctl (drive, cmd, arg);case HDIO_GET_NICE : -return put_user (drive->dsc_overlap <<IDE_NICE_DSC_OVERLAP | - drive->nice1 <<IDE_NICE_1 , - (long __user *) arg); +return ide_get_nice_ioctl (drive, arg);#ifdef CONFIG_IDE_TASK_IOCTL case HDIO_DRIVE_TASKFILE :if (!capable (CAP_SYS_ADMIN ) || !capable (CAP_SYS_RAWIO ))
@@ -608,17 +628,9 @@ int generic_ide_ioctl(ide_drive_t *drivereturn -EACCES ;return ide_task_ioctl (drive, cmd, arg);case HDIO_SET_NICE : -if (!capable (CAP_SYS_ADMIN ))return -EACCES ; -if (arg != (arg & ((1 <<IDE_NICE_DSC_OVERLAP ) | (1 <<IDE_NICE_1 )))) -return -EPERM ; -if (((arg >>IDE_NICE_DSC_OVERLAP ) &1 ) && - (drive->media == ide_disk || - drive->media == ide_floppy || - drive->scsi)) -return -EPERM ; - drive->dsc_overlap = (arg >>IDE_NICE_DSC_OVERLAP ) &1 ; - drive->nice1 = (arg >>IDE_NICE_1 ) &1 ; -return 0 ; +if (!capable (CAP_SYS_ADMIN )) +return -EACCES ; +return ide_set_nice_ioctl (drive, arg);case HDIO_DRIVE_RESET :if (!capable (CAP_SYS_ADMIN ))return -EACCES ;