Minor cleanups, no functional changes

This commit is contained in:
Søren Schmidt 2005-10-13 08:05:21 +00:00
parent db38abe649
commit ca107a4b1e

View File

@ -69,7 +69,6 @@ static int ata_raid_adaptec_read_meta(device_t dev, struct ar_softc **raidp);
static int ata_raid_hptv2_read_meta(device_t dev, struct ar_softc **raidp);
static int ata_raid_hptv2_write_meta(struct ar_softc *rdp);
static int ata_raid_hptv3_read_meta(device_t dev, struct ar_softc **raidp);
//static int ata_raid_hptv3_write_meta(struct ar_softc *rdp);
static int ata_raid_intel_read_meta(device_t dev, struct ar_softc **raidp);
static int ata_raid_ite_read_meta(device_t dev, struct ar_softc **raidp);
static int ata_raid_lsiv2_read_meta(device_t dev, struct ar_softc **raidp);
@ -116,7 +115,6 @@ ata_raid_attach(struct ar_softc *rdp, int writeback)
char buffer[32];
int disk;
buffer[0] = '\0';
mtx_init(&rdp->lock, "ATA PseudoRAID metadata lock", NULL, MTX_DEF);
ata_raid_config_changed(rdp, writeback);
@ -128,6 +126,8 @@ ata_raid_attach(struct ar_softc *rdp, int writeback)
sprintf(buffer, " (stripe %d KB)",
(rdp->interleave * DEV_BSIZE) / 1024);
}
else
buffer[0] = '\0';
rdp->disk = disk_alloc();
rdp->disk->d_strategy = ata_raid_strategy;
//rdp->disk->d_dump = ata_raid_dump;
@ -1804,21 +1804,6 @@ ata_raid_hptv3_read_meta(device_t dev, struct ar_softc **raidp)
free(meta, M_AR);
return retval;
}
#if 0
static int
ata_raid_hptv3_write_meta(struct ar_softc *rdp)
{
struct hptv3_raid_conf *meta;
int error = 0;
if (!(meta = (struct hptv3_raid_conf *)
malloc(sizeof(struct hptv3_raid_conf), M_AR, M_NOWAIT | M_ZERO))) {
printf("ar%d: failed to allocate metadata storage\n", rdp->lun);
return ENOMEM;
}
return error;
}
#endif
/* Intel MatrixRAID Metadata */
static int