redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

ide: remove SECTOR_WORDS define

Browse source 
Just use SECTOR_SIZE instead.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2008-10-10 22:39:28 +02:00
parent 8185d5aa93
commit 151a670186
6 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/ide/ide-disk.c
View file

@ -539,13 +539,14 @@ static int proc_idedisk_read_smart(char *page, char **start, off_t off,
if (get_smart_data(drive, page, sub_cmd) == 0) { if (get_smart_data(drive, page, sub_cmd) == 0) {
unsigned short *val = (unsigned short *) page; unsigned short *val = (unsigned short *) page;
char *out = ((char *)val) + (SECTOR_WORDS * 4); char *out = (char *)val + SECTOR_SIZE;
page = out; page = out;
do { do {
out += sprintf(out, "%04x%c", le16_to_cpu(*val), out += sprintf(out, "%04x%c", le16_to_cpu(*val),
(++i & 7) ? ' ' : '\n'); (++i & 7) ? ' ' : '\n');
val += 1; val += 1;
} while (i < (SECTOR_WORDS * 2)); } while (i < SECTOR_SIZE / 2);
len = out - page; len = out - page;
} }

2
drivers/ide/ide-iops.c
View file

@ -693,7 +693,7 @@ int ide_driveid_update(ide_drive_t *drive)
} }
local_irq_save(flags); local_irq_save(flags);
SELECT_MASK(drive, 0); SELECT_MASK(drive, 0);
id = kmalloc(SECTOR_WORDS*4, GFP_ATOMIC); id = kmalloc(SECTOR_SIZE, GFP_ATOMIC);
if (!id) { if (!id) {
local_irq_restore(flags); local_irq_restore(flags);
return 0; return 0;

2
drivers/ide/ide-probe.c
View file

@ -561,7 +561,7 @@ static inline u8 probe_for_drive (ide_drive_t *drive)
* Also note that 0 everywhere means "can't do X" * 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; drive->id_read = 0;
if(drive->id == NULL) if(drive->id == NULL)
{ {

5
drivers/ide/ide-proc.c
View file

@ -100,13 +100,14 @@ static int proc_ide_read_identify
err = taskfile_lib_get_identify(drive, page); err = taskfile_lib_get_identify(drive, page);
if (!err) { if (!err) {
char *out = ((char *)page) + (SECTOR_WORDS * 4); char *out = (char *)page + SECTOR_SIZE;
page = out; page = out;
do { do {
out += sprintf(out, "%04x%c", out += sprintf(out, "%04x%c",
le16_to_cpup(val), (++i & 7) ? ' ' : '\n'); le16_to_cpup(val), (++i & 7) ? ' ' : '\n');
val += 1; val += 1;
} while (i < (SECTOR_WORDS * 2)); } while (i < SECTOR_SIZE / 2);
len = out - page; len = out - page;
} }
} }

2
drivers/ide/ide-taskfile.c
View file

@ -768,7 +768,7 @@ int ide_cmd_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
if (args[3]) { if (args[3]) {
tfargs.tf_flags |= IDE_TFLAG_IO_16BIT; tfargs.tf_flags |= IDE_TFLAG_IO_16BIT;
bufsize = SECTOR_WORDS * 4 * args[3]; bufsize = SECTOR_SIZE * args[3];
buf = kzalloc(bufsize, GFP_KERNEL); buf = kzalloc(bufsize, GFP_KERNEL);
if (buf == NULL) if (buf == NULL)
return -ENOMEM; return -ENOMEM;

2
include/linux/ide.h
View file

@ -126,7 +126,7 @@ struct ide_io_ports {
#define PARTN_BITS 6 /* number of minor dev bits for partitions */ #define PARTN_BITS 6 /* number of minor dev bits for partitions */
#define MAX_DRIVES 2 /* per interface; 2 assumed by lots of code */ #define MAX_DRIVES 2 /* per interface; 2 assumed by lots of code */
#define SECTOR_SIZE 512 #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))) #define IDE_LARGE_SEEK(b1,b2,t) (((b1) > (b2) + (t)) || ((b2) > (b1) + (t)))
/* /*