<linux/hdreg.h> cleanups
Subsystems (5)
Hi,
I still have some leftover (non-IDE & non-libata) patches from the last summer converting all struct hd_driveid & co. users to use <linux/ata.h> explicitly and cleaning <linux/hdreg.h> accordingly.
Original patches still apply just fine to the current Linus' tree (I also made sure that there are no potential conflicts/breakages caused by new users of <linux/hdreg.h>) and the whole patchset is now available in the form of git tree here:
http://git.kernel.org/?p=linux/kernel/git/bart/linux-hdreg-h-cleanup.git
I haven't heard a single complaint about them so it seems like everybody is happy with them and thus it would be nice to get them merged. :)
Linus, please consider pulling from:
master.kernel.org:/pub/scm/linux/kernel/git/bart/linux-hdreg-h-cleanup.git/
to receive the following updates:
arch/um/drivers/ubd_kern.c | 12 +- drivers/block/aoe/aoecmd.c | 23 ++-- drivers/block/hd.c | 2 + drivers/block/xsysace.c | 30 +++--- drivers/usb/storage/isd200.c | 239 ++++++++++++++---------------------------- include/linux/hdreg.h | 66 +----------- 6 files changed, 117 insertions(+), 255 deletions(-)
Bartlomiej Zolnierkiewicz (10):
isd200: make it 'struct hd_driveid'-free
ubd_kern: make it 'struct hd_driveid'-free
xsysace: make it 'struct hd_driveid'-free
include/linux/hdreg.h: cover struct hd_driveid with #ifndef/#endif __KERNEL__
isd200: WIN_* -> ATA_CMD_*
aoe: WIN_* -> ATA_CMD_*
include/linux/hdreg.h: cover WIN_* and friends with #ifndef/#endif __KERNEL__
isd200: use ATA_* defines instead of *_STAT and *_ERR ones include/linux/hdreg.h: remove unused defines
remove <linux/ata.h> include from <linux/hdreg.h>
arch/um/drivers/ubd_kern.c +6 -6
@@ -22,6 +22,7 @@#include "linux/kernel.h" #include "linux/module.h" #include "linux/blkdev.h" +#include "linux/ata.h" #include "linux/hdreg.h" #include "linux/init.h" #include "linux/cdrom.h"
@@ -1308,16 +1309,15 @@ static int ubd_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd, unsigned long arg) {struct ubd *ubd_dev = bdev->bd_disk->private_data; -struct hd_driveid ubd_id = { - .cyls =0 , - .heads =128 , - .sectors =32 , - }; +u16 ubd_id[ATA_ID_WORDS ];switch (cmd) {struct cdrom_volctrl volume;case HDIO_GET_IDENTITY : - ubd_id.cyls = ubd_dev->size / (128 *32 *512 ); +memset (&ubd_id,0 ,ATA_ID_WORDS *2 ); + ubd_id[ATA_ID_CYLS ] = ubd_dev->size / (128 *32 *512 ); + ubd_id[ATA_ID_HEADS ] =128 ; + ubd_id[ATA_ID_SECTORS ] =32 ;if (copy_to_user ((char __user *) arg, (char *) &ubd_id,sizeof (ubd_id)))return -EFAULT ;
drivers/block/aoe/aoecmd.c +12 -11
@@ -4,6 +4,7 @@* Filesystem request handling methods */ +#include <linux/ata.h> #include <linux/hdreg.h> #include <linux/blkdev.h> #include <linux/skbuff.h>
@@ -267,7 +268,7 @@ aoecmd_ata_rw(struct aoedev *d) writebit =0 ; } - ah->cmdstat =WIN_READ | writebit | extbit; + ah->cmdstat =ATA_CMD_PIO_READ | writebit | extbit;/* mark all tracking fields and load out */ buf->nframesout +=1 ;
@@ -362,10 +363,10 @@ resend(struct aoedev *d, struct aoetgt *t, struct frame *f)switch (ah->cmdstat) {default :break ; -case WIN_READ : -case WIN_READ_EXT : -case WIN_WRITE : -case WIN_WRITE_EXT : +case ATA_CMD_PIO_READ : +case ATA_CMD_PIO_READ_EXT : +case ATA_CMD_PIO_WRITE : +case ATA_CMD_PIO_WRITE_EXT :put_lba (ah, f->lba); n = f->bcnt;
@@ -812,8 +813,8 @@ aoecmd_ata_rsp(struct sk_buff *skb) d->htgt =NULL ; n = ahout->scnt <<9 ;switch (ahout->cmdstat) { -case WIN_READ : -case WIN_READ_EXT : +case ATA_CMD_PIO_READ : +case ATA_CMD_PIO_READ_EXT :if (skb->len -sizeof *hin -sizeof *ahin < n) { printk(KERN_ERR "aoe: %s. skb->len=%d need=%ld\n",
@@ -823,8 +824,8 @@ aoecmd_ata_rsp(struct sk_buff *skb)return ; }memcpy (f->bufaddr, ahin+1 , n); -case WIN_WRITE : -case WIN_WRITE_EXT : +case ATA_CMD_PIO_WRITE : +case ATA_CMD_PIO_WRITE_EXT : ifp =getif (t, skb->dev);if (ifp) { ifp->lost =0 ;
@@ -838,7 +839,7 @@ aoecmd_ata_rsp(struct sk_buff *skb) goto xmit; }break ; -case WIN_IDENTIFY : +case ATA_CMD_ID_ATA :if (skb->len -sizeof *hin -sizeof *ahin <512 ) { printk(KERN_INFO "aoe: runt data size in ataid. skb->len=%d\n",
@@ -914,7 +915,7 @@ aoecmd_ata_id(struct aoedev *d)/* set up ata header */ ah->scnt =1 ; - ah->cmdstat =WIN_IDENTIFY ; + ah->cmdstat =ATA_CMD_ID_ATA ; ah->lba3 =0xa0 ; skb->dev = t->ifp->nd;
drivers/block/hd.c +2 -0
@@ -42,6 +42,8 @@#include <linux/ata.h> #include <linux/hdreg.h> +#define HD_IRQ 14 +#define REALLY_SLOW_IO #include <asm/system.h> #include <asm/io.h>
drivers/block/xsysace.c +13 -17
@@ -89,6 +89,7 @@#include <linux/delay.h> #include <linux/slab.h> #include <linux/blkdev.h> +#include <linux/ata.h> #include <linux/hdreg.h> #include <linux/platform_device.h> #if defined(CONFIG_OF )
@@ -208,7 +209,7 @@ struct ace_device {struct gendisk *gd;/* Inserted CF card parameters */ -struct hd_driveid cf_id; +u16 cf_id[ATA_ID_WORDS ]; };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)); } -void ace_fix_driveid (struct hd_driveid *id) +void ace_fix_driveid (u16 *id) {#if defined(__BIG_ENDIAN) -u16 *buf = (void *)id;int i;/* All half words have wrong byte order; swap the bytes */ -for (i =0 ; i <sizeof (struct hd_driveid ); i +=2 , buf++) - *buf =le16_to_cpu (*buf); - -/* 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 ); +for (i =0 ; i <ATA_ID_WORDS ; i++, id++) + *id =le16_to_cpu (*id);#endif }
@@ -614,7 +608,7 @@ static void ace_fsm_dostate(struct ace_device *ace)break ;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 */ if (ace->data_result) {
@@ -627,9 +621,10 @@ static void ace_fsm_dostate(struct ace_device *ace) ace->media_change =0 ;/* 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" , - 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 */
@@ -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) {struct ace_device *ace = bdev->bd_disk->private_data; +u16 *cf_id = &ace->cf_id[0 ];dev_dbg (ace->dev,"ace_getgeo()\n" ); - geo->heads = ace->cf_id.heads; - geo->sectors = ace->cf_id.sectors; - geo->cylinders = ace->cf_id.cyls; + geo->heads = cf_id[ATA_ID_HEADS ]; + geo->sectors = cf_id[ATA_ID_SECTORS ]; + geo->cylinders = cf_id[ATA_ID_CYLS ];return 0 ; }
drivers/usb/storage/isd200.c +80 -159
412 lines not on this page · raw message
include/linux/hdreg.h +4 -62
96 lines not on this page · raw message