lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xsysace: make it 'struct hd_driveid'-free

Browse Source 
* Change cf_id field in struct ace_device from 'struct hd_driveid *id'
  to 'u16 *id' and update driver accordingly.

* Include <linux/ata.h> directly instead of through <linux/hdreg.h>.

While at it:

* Use ata_id_u32() macro.

There should be no functional changes caused by this patch.

Cc: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz
2009-04-01 21:42:22 +02:00
parent 73855e13b2
commit 4aaf2fec71
1 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/block/xsysace.c
View File

@@ -89,6 +89,7 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/blkdev.h> #include <linux/blkdev.h>
#include <linux/ata.h>
#include <linux/hdreg.h> #include <linux/hdreg.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#if defined(CONFIG_OF) #if defined(CONFIG_OF)
@@ -208,7 +209,7 @@ struct ace_device {
struct gendisk *gd; struct gendisk *gd;
/* Inserted CF card parameters */ /* Inserted CF card parameters */
struct hd_driveid cf_id; u16 cf_id[ATA_ID_WORDS];
}; };
static int ace_major; static int ace_major;
@@ -402,21 +403,14 @@ static void ace_dump_regs(struct ace_device *ace)
ace_in32(ace, ACE_CFGLBA), ace_in(ace, ACE_FATSTAT)); ace_in32(ace, ACE_CFGLBA), ace_in(ace, ACE_FATSTAT));
} }
void ace_fix_driveid(struct hd_driveid *id) void ace_fix_driveid(u16 *id)
{ {
#if defined(__BIG_ENDIAN) #if defined(__BIG_ENDIAN)
u16 *buf = (void *)id;
int i; int i;
/* All half words have wrong byte order; swap the bytes */ /* All half words have wrong byte order; swap the bytes */
for (i = 0; i < sizeof(struct hd_driveid); i += 2, buf++) for (i = 0; i < ATA_ID_WORDS; i++, id++)
*buf = le16_to_cpu(*buf); *id = le16_to_cpu(*id);
/* Some of the data values are 32bit; swap the half words */
id->lba_capacity = ((id->lba_capacity >> 16) & 0x0000FFFF) |
((id->lba_capacity << 16) & 0xFFFF0000);
id->spg = ((id->spg >> 16) & 0x0000FFFF) |
((id->spg << 16) & 0xFFFF0000);
#endif #endif
} }
@@ -614,7 +608,7 @@ static void ace_fsm_dostate(struct ace_device *ace)
break; break;
case ACE_FSM_STATE_IDENTIFY_COMPLETE: case ACE_FSM_STATE_IDENTIFY_COMPLETE:
ace_fix_driveid(&ace->cf_id); ace_fix_driveid(&ace->cf_id[0]);
ace_dump_mem(&ace->cf_id, 512); /* Debug: Dump out disk ID */ ace_dump_mem(&ace->cf_id, 512); /* Debug: Dump out disk ID */
if (ace->data_result) { if (ace->data_result) {
@@ -627,9 +621,10 @@ static void ace_fsm_dostate(struct ace_device *ace)
ace->media_change = 0; ace->media_change = 0;
/* Record disk parameters */ /* Record disk parameters */
set_capacity(ace->gd, ace->cf_id.lba_capacity); set_capacity(ace->gd,
ata_id_u32(&ace->cf_id, ATA_ID_LBA_CAPACITY));
dev_info(ace->dev, "capacity: %i sectors\n", dev_info(ace->dev, "capacity: %i sectors\n",
ace->cf_id.lba_capacity); ata_id_u32(&ace->cf_id, ATA_ID_LBA_CAPACITY));
} }
/* We're done, drop to IDLE state and notify waiters */ /* We're done, drop to IDLE state and notify waiters */
@@ -928,12 +923,13 @@ static int ace_release(struct gendisk *disk, fmode_t mode)
static int ace_getgeo(struct block_device *bdev, struct hd_geometry *geo) static int ace_getgeo(struct block_device *bdev, struct hd_geometry *geo)
{ {
struct ace_device *ace = bdev->bd_disk->private_data; struct ace_device *ace = bdev->bd_disk->private_data;
u16 *cf_id = &ace->cf_id[0];
dev_dbg(ace->dev, "ace_getgeo()\n"); dev_dbg(ace->dev, "ace_getgeo()\n");
geo->heads = ace->cf_id.heads; geo->heads = cf_id[ATA_ID_HEADS];
geo->sectors = ace->cf_id.sectors; geo->sectors = cf_id[ATA_ID_SECTORS];
geo->cylinders = ace->cf_id.cyls; geo->cylinders = cf_id[ATA_ID_CYLS];
return 0; return 0;
} }