From 2c6b49f6affb5cd2f304ef1b0210d45d9da380db Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp Date: Fri, 21 Feb 2003 19:00:48 +0000 Subject: NO_GEOM cleanup: Retire the "d_dump_t" and use the "dumper_t" type instead. Dumper_t takes a void * as first arg which is more general than the dev_t taken by d_dump_t. (Remember: we could have net-dumpers if somebody wrote us one!) Define the convention for GEOM controlled disk devices to be that the first argument to the dumper function is the struct disk pointer. Change device drivers accordingly. --- sys/dev/ida/ida_disk.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'sys/dev/ida') diff --git a/sys/dev/ida/ida_disk.c b/sys/dev/ida/ida_disk.c index e93dce8ba7bfb..f4265c9960c91 100644 --- a/sys/dev/ida/ida_disk.c +++ b/sys/dev/ida/ida_disk.c @@ -61,7 +61,7 @@ static int idad_detach(device_t dev); static d_open_t idad_open; static d_close_t idad_close; static d_strategy_t idad_strategy; -static d_dump_t idad_dump; +static dumper_t idad_dump; #define IDAD_CDEV_MAJOR 109 @@ -180,13 +180,15 @@ bad: } static int -idad_dump(dev_t dev, void *virtual, vm_offset_t physical, off_t offset, size_t length) +idad_dump(void *arg, void *virtual, vm_offset_t physical, off_t offset, size_t length) { struct idad_softc *drv; int error = 0; + struct disk *dp; - drv = idad_getsoftc(dev); + dp = arg; + drv = idad_getsoftc(dp->d_dev); if (drv == NULL) return (ENXIO); -- cgit v1.3