Skip to content

Commit

Permalink
dac960: Convert to bdops->check_events()
Browse files Browse the repository at this point in the history
Convert from ->media_changed() to ->check_events().

DAC960 media change notification seems to be one way (once set, never
cleared) and will generate spurious events when polled once the
condition triggers.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Kay Sievers <kay.sievers@vrfy.org>
  • Loading branch information
Tejun Heo committed Mar 9, 2011
1 parent b1b56b9 commit 507daea
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions drivers/block/DAC960.c
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,14 @@ static int DAC960_getgeo(struct block_device *bdev, struct hd_geometry *geo)
return 0;
}

static int DAC960_media_changed(struct gendisk *disk)
static unsigned int DAC960_check_events(struct gendisk *disk,
unsigned int clearing)
{
DAC960_Controller_T *p = disk->queue->queuedata;
int drive_nr = (long)disk->private_data;

if (!p->LogicalDriveInitiallyAccessible[drive_nr])
return 1;
return DISK_EVENT_MEDIA_CHANGE;
return 0;
}

Expand All @@ -163,7 +164,7 @@ static const struct block_device_operations DAC960_BlockDeviceOperations = {
.owner = THIS_MODULE,
.open = DAC960_open,
.getgeo = DAC960_getgeo,
.media_changed = DAC960_media_changed,
.check_events = DAC960_check_events,
.revalidate_disk = DAC960_revalidate_disk,
};

Expand Down Expand Up @@ -2546,6 +2547,7 @@ static bool DAC960_RegisterBlockDevice(DAC960_Controller_T *Controller)
disk->major = MajorNumber;
disk->first_minor = n << DAC960_MaxPartitionsBits;
disk->fops = &DAC960_BlockDeviceOperations;
disk->events = DISK_EVENT_MEDIA_CHANGE;
}
/*
Indicate the Block Device Registration completed successfully,
Expand Down

0 comments on commit 507daea

Please sign in to comment.