Sun Mar 28 19:53:09 2021 UTC ()
Correct names of arguments passed to rescan function.


(thorpej)
diff -r1.43.4.2 -r1.43.4.3 src/sys/dev/ata/ata_raid.c
cvs diff -r1.43.4.2 -r1.43.4.3 src/sys/dev/ata/ata_raid.c (expand / switch to unified diff)

--- src/sys/dev/ata/ata_raid.c 2021/03/22 16:23:44 1.43.4.2
+++ src/sys/dev/ata/ata_raid.c 2021/03/28 19:53:09 1.43.4.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: ata_raid.c,v 1.43.4.2 2021/03/22 16:23:44 thorpej Exp $ */ 1/* $NetBSD: ata_raid.c,v 1.43.4.3 2021/03/28 19:53:09 thorpej Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2003 Wasabi Systems, Inc. 4 * Copyright (c) 2003 Wasabi Systems, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Written by Jason R. Thorpe for Wasabi Systems, Inc. 7 * Written by Jason R. Thorpe for Wasabi Systems, Inc.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -30,27 +30,27 @@ @@ -30,27 +30,27 @@
30 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 30 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
31 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 31 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
32 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 32 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
33 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 33 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
34 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 34 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
35 * POSSIBILITY OF SUCH DAMAGE. 35 * POSSIBILITY OF SUCH DAMAGE.
36 */ 36 */
37 37
38/* 38/*
39 * Support for autoconfiguration of RAID sets on ATA RAID controllers. 39 * Support for autoconfiguration of RAID sets on ATA RAID controllers.
40 */ 40 */
41 41
42#include <sys/cdefs.h> 42#include <sys/cdefs.h>
43__KERNEL_RCSID(0, "$NetBSD: ata_raid.c,v 1.43.4.2 2021/03/22 16:23:44 thorpej Exp $"); 43__KERNEL_RCSID(0, "$NetBSD: ata_raid.c,v 1.43.4.3 2021/03/28 19:53:09 thorpej Exp $");
44 44
45#include <sys/param.h> 45#include <sys/param.h>
46#include <sys/buf.h> 46#include <sys/buf.h>
47#include <sys/bufq.h> 47#include <sys/bufq.h>
48#include <sys/conf.h> 48#include <sys/conf.h>
49#include <sys/device.h> 49#include <sys/device.h>
50#include <sys/disk.h> 50#include <sys/disk.h>
51#include <sys/disklabel.h> 51#include <sys/disklabel.h>
52#include <sys/fcntl.h> 52#include <sys/fcntl.h>
53#include <sys/vnode.h> 53#include <sys/vnode.h>
54#include <sys/proc.h> 54#include <sys/proc.h>
55#include <sys/module.h> 55#include <sys/module.h>
56 56
@@ -104,27 +104,27 @@ ataraidattach(int count) @@ -104,27 +104,27 @@ ataraidattach(int count)
104 finalize_done = 0; 104 finalize_done = 0;
105 if (config_finalize_register(NULL, ata_raid_finalize) != 0) 105 if (config_finalize_register(NULL, ata_raid_finalize) != 0)
106 aprint_normal("WARNING: " 106 aprint_normal("WARNING: "
107 "unable to register ATA RAID finalizer\n"); 107 "unable to register ATA RAID finalizer\n");
108} 108}
109 109
110/* 110/*
111 * Use the config_finalizer to rescan for new devices, since the 111 * Use the config_finalizer to rescan for new devices, since the
112 * ld_ataraid driver might not be immediately available. 112 * ld_ataraid driver might not be immediately available.
113 */ 113 */
114 114
115/* ARGSUSED */ 115/* ARGSUSED */
116static int 116static int
117ataraid_rescan(device_t self, const char *attr, const int *flags) 117ataraid_rescan(device_t self, const char *ifattr, const int *locs)
118{ 118{
119 119
120 finalize_done = 0; 120 finalize_done = 0;
121 (void)ata_raid_finalize(self); 121 (void)ata_raid_finalize(self);
122 122
123 return 0; 123 return 0;
124} 124}
125 125
126/* 126/*
127 * ata_raid_type_name: 127 * ata_raid_type_name:
128 * 128 *
129 * Return the type of ATA RAID. 129 * Return the type of ATA RAID.
130 */ 130 */