summaryrefslogtreecommitdiff
path: root/usr/src/uts/sun4u/ngdr
diff options
context:
space:
mode:
authorJohn Levon <john.levon@joyent.com>2020-05-26 13:57:13 +0000
committerJohn Levon <john.levon@joyent.com>2020-05-26 13:57:13 +0000
commit5b2acc0949194447bba6e45a0fa44d0b5f42f208 (patch)
tree7ea9eb87bc68fee386dd39035ce715e87a0e673c /usr/src/uts/sun4u/ngdr
parent8ca018083101bf1cb175869679bc123187fb1bab (diff)
parent2a1277d3064386cd5c4e372301007aa330bf1d5e (diff)
downloadillumos-joyent-gcc9.tar.gz
mergegcc9
Diffstat (limited to 'usr/src/uts/sun4u/ngdr')
-rw-r--r--usr/src/uts/sun4u/ngdr/io/dr.c29
1 files changed, 15 insertions, 14 deletions
diff --git a/usr/src/uts/sun4u/ngdr/io/dr.c b/usr/src/uts/sun4u/ngdr/io/dr.c
index e89ea0b05e..73b1528c7e 100644
--- a/usr/src/uts/sun4u/ngdr/io/dr.c
+++ b/usr/src/uts/sun4u/ngdr/io/dr.c
@@ -556,7 +556,7 @@ int dr_enable = 1;
/*ARGSUSED3*/
static int
dr_ioctl(dev_t dev, int cmd, intptr_t arg, int mode,
- cred_t *cred_p, int *rval_p)
+ cred_t *cred_p, int *rval_p)
{
int rv = 0;
int instance;
@@ -706,7 +706,7 @@ dr_attach(dev_info_t *dip, ddi_attach_cmd_t cmd)
{
int rv, rv2;
int bd;
- int instance;
+ int instance;
sbd_error_t *err;
dr_softstate_t *softsp;
@@ -768,7 +768,7 @@ dr_attach(dev_info_t *dip, ddi_attach_cmd_t cmd)
minor_num = DR_MAKE_MINOR(instance, bd);
rv = ddi_create_minor_node(dip, name, S_IFCHR,
- minor_num, DDI_NT_SBD_ATTACHMENT_POINT, NULL);
+ minor_num, DDI_NT_SBD_ATTACHMENT_POINT, 0);
if (rv != DDI_SUCCESS)
rv = DDI_FAILURE;
}
@@ -806,7 +806,7 @@ dr_attach(dev_info_t *dip, ddi_attach_cmd_t cmd)
static int
dr_detach(dev_info_t *dip, ddi_detach_cmd_t cmd)
{
- int instance;
+ int instance;
dr_softstate_t *softsp;
switch (cmd) {
@@ -1293,7 +1293,8 @@ dr_test_board(dr_handle_t *hp)
* devlists for the board have been initialized.
*/
static void
-dr_make_comp_nodes(dr_board_t *bp) {
+dr_make_comp_nodes(dr_board_t *bp)
+{
int i;
@@ -1580,7 +1581,7 @@ dr_dev_is_target(dr_dev_unit_t *dp, int present_only, uint_t uset)
static void
dr_dev_make_list(dr_handle_t *hp, sbd_comp_type_t type, int present_only,
- dr_common_unit_t ***devlist, int *devnum)
+ dr_common_unit_t ***devlist, int *devnum)
{
dr_board_t *bp = hp->h_bd;
int unum;
@@ -1702,10 +1703,10 @@ dr_dev_clean_up(dr_handle_t *hp, dr_common_unit_t **list, int devnum)
static int
dr_dev_walk(dr_handle_t *hp, sbd_comp_type_t type, int present_only,
- int (*pre_op)(dr_handle_t *, dr_common_unit_t **, int),
- void (*op)(dr_handle_t *, dr_common_unit_t *),
- int (*post_op)(dr_handle_t *, dr_common_unit_t **, int),
- void (*board_op)(dr_handle_t *, dr_common_unit_t **, int))
+ int (*pre_op)(dr_handle_t *, dr_common_unit_t **, int),
+ void (*op)(dr_handle_t *, dr_common_unit_t *),
+ int (*post_op)(dr_handle_t *, dr_common_unit_t **, int),
+ void (*board_op)(dr_handle_t *, dr_common_unit_t **, int))
{
int devnum, rv;
dr_common_unit_t **devlist;
@@ -1740,7 +1741,7 @@ dr_dev_noop(dr_handle_t *hp, dr_common_unit_t **devlist, int devnum)
static void
dr_attach_update_state(dr_handle_t *hp,
- dr_common_unit_t **devlist, int devnum)
+ dr_common_unit_t **devlist, int devnum)
{
dr_board_t *bp = hp->h_bd;
int i;
@@ -1841,7 +1842,7 @@ dr_dev_configure(dr_handle_t *hp)
static void
dr_release_update_state(dr_handle_t *hp,
- dr_common_unit_t **devlist, int devnum)
+ dr_common_unit_t **devlist, int devnum)
{
_NOTE(ARGUNUSED(devlist))
_NOTE(ARGUNUSED(devnum))
@@ -1965,7 +1966,7 @@ dr_dev_release(dr_handle_t *hp)
static void
dr_detach_update_state(dr_handle_t *hp,
- dr_common_unit_t **devlist, int devnum)
+ dr_common_unit_t **devlist, int devnum)
{
dr_board_t *bp = hp->h_bd;
int i;
@@ -2686,7 +2687,7 @@ dr_nt_to_dev_type(int nt)
*/
static int
dr_check_transition(dr_board_t *bp, dr_devset_t *devsetp,
- struct dr_state_trans *transp, int cmd)
+ struct dr_state_trans *transp, int cmd)
{
int s, ut;
int state_err = 0;