summaryrefslogtreecommitdiff
path: root/usr/src/uts/sun4u/opl
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/uts/sun4u/opl')
-rw-r--r--usr/src/uts/sun4u/opl/io/dm2s.c6
-rw-r--r--usr/src/uts/sun4u/opl/io/drmach.c36
-rw-r--r--usr/src/uts/sun4u/opl/io/mc-opl.c10
-rw-r--r--usr/src/uts/sun4u/opl/io/oplkmdrv.c2
-rw-r--r--usr/src/uts/sun4u/opl/io/oplmsu/oplmsu.c2
-rw-r--r--usr/src/uts/sun4u/opl/io/pcicmu/pcmu_counters.c12
6 files changed, 33 insertions, 35 deletions
diff --git a/usr/src/uts/sun4u/opl/io/dm2s.c b/usr/src/uts/sun4u/opl/io/dm2s.c
index 92735d9981..1e6a1f9fc0 100644
--- a/usr/src/uts/sun4u/opl/io/dm2s.c
+++ b/usr/src/uts/sun4u/opl/io/dm2s.c
@@ -177,8 +177,8 @@ struct streamtab dm2s_streamtab = {
NULL
};
-DDI_DEFINE_STREAM_OPS(dm2s_ops, nulldev, nulldev, dm2s_attach, \
- dm2s_detach, nodev, dm2s_info, D_NEW | D_MP | D_MTPERMOD, \
+DDI_DEFINE_STREAM_OPS(dm2s_ops, nulldev, nulldev, dm2s_attach,
+ dm2s_detach, nodev, dm2s_info, D_NEW | D_MP | D_MTPERMOD,
&dm2s_streamtab, ddi_quiesce_not_supported);
@@ -296,7 +296,7 @@ dm2s_attach(dev_info_t *dip, ddi_attach_cmd_t cmd)
(void) sprintf(name, "%s%d", DM2S_MODNAME, instance);
if (ddi_create_minor_node(dip, name, S_IFCHR, instance,
- DDI_PSEUDO, NULL) == DDI_FAILURE) {
+ DDI_PSEUDO, 0) == DDI_FAILURE) {
ddi_remove_minor_node(dip, NULL);
cmn_err(CE_WARN, "Device node creation failed.");
goto error;
diff --git a/usr/src/uts/sun4u/opl/io/drmach.c b/usr/src/uts/sun4u/opl/io/drmach.c
index 0999f18e15..651b60d8ba 100644
--- a/usr/src/uts/sun4u/opl/io/drmach.c
+++ b/usr/src/uts/sun4u/opl/io/drmach.c
@@ -218,14 +218,14 @@ static int drmach_node_ddi_get_prop(drmach_node_t *np,
static int drmach_node_ddi_get_proplen(drmach_node_t *np,
char *name, int *len);
-static int drmach_get_portid(drmach_node_t *);
+static int drmach_get_portid(drmach_node_t *);
static sbd_error_t *drmach_i_status(drmachid_t, drmach_status_t *);
static int opl_check_dr_status();
static void drmach_io_dispose(drmachid_t);
static sbd_error_t *drmach_io_release(drmachid_t);
static sbd_error_t *drmach_io_status(drmachid_t, drmach_status_t *);
-static int drmach_init(void);
-static void drmach_fini(void);
+static int drmach_init(void);
+static void drmach_fini(void);
static void drmach_swap_pa(drmach_mem_t *, drmach_mem_t *);
static drmach_board_t *drmach_get_board_by_bnum(int);
@@ -457,7 +457,7 @@ struct drmach_hotcpu {
drmach_board_t *bp;
int bnum;
int core_id;
- int rv;
+ int rv;
int option;
};
@@ -652,7 +652,7 @@ drmach_setup_core_info(drmach_board_t *obj)
typedef struct {
drmach_node_walk_args_t *nwargs;
- int (*cb)(drmach_node_walk_args_t *args);
+ int (*cb)(drmach_node_walk_args_t *args);
int err;
} drmach_node_ddi_walk_args_t;
@@ -686,7 +686,7 @@ drmach_node_ddi_walk_cb(dev_info_t *dip, void *arg)
static int
drmach_node_ddi_walk(drmach_node_t *np, void *data,
- int (*cb)(drmach_node_walk_args_t *args))
+ int (*cb)(drmach_node_walk_args_t *args))
{
drmach_node_walk_args_t args;
drmach_node_ddi_walk_args_t nargs;
@@ -735,7 +735,7 @@ drmach_node_ddi_get_parent(drmach_node_t *np, drmach_node_t *pp)
static pnode_t
drmach_node_ddi_get_dnode(drmach_node_t *np)
{
- return ((pnode_t)NULL);
+ return (0);
}
static drmach_node_t *
@@ -769,7 +769,7 @@ drmach_node_ddi_get_dip(drmach_node_t *np)
static int
drmach_node_walk(drmach_node_t *np, void *param,
- int (*cb)(drmach_node_walk_args_t *args))
+ int (*cb)(drmach_node_walk_args_t *args))
{
return (np->walk(np, param, cb));
}
@@ -977,7 +977,7 @@ drmach_configure(drmachid_t id, int flags)
static sbd_error_t *
drmach_device_new(drmach_node_t *node,
- drmach_board_t *bp, int portid, drmachid_t *idp)
+ drmach_board_t *bp, int portid, drmachid_t *idp)
{
int i;
int rv;
@@ -1541,7 +1541,7 @@ drmach_get_portid(drmach_node_t *np)
static int
drmach_name2type_idx(char *name)
{
- int index, ntypes;
+ int index, ntypes;
if (name == NULL)
return (-1);
@@ -1656,7 +1656,7 @@ drmach_board_find_devices_cb(drmach_node_walk_args_t *args)
sbd_error_t *
drmach_board_find_devices(drmachid_t id, void *a,
- sbd_error_t *(*found)(void *a, const char *, int, drmachid_t))
+ sbd_error_t *(*found)(void *a, const char *, int, drmachid_t))
{
drmach_board_t *bp = (drmach_board_t *)id;
sbd_error_t *err;
@@ -2782,7 +2782,7 @@ drmach_cpu_poweron(struct cpu *cp)
int
drmach_cpu_poweroff(struct cpu *cp)
{
- int rv = 0;
+ int rv = 0;
processorid_t cpuid = cp->cpu_id;
DRMACH_PR("drmach_cpu_poweroff: stopping cpuid %d\n", cp->cpu_id);
@@ -2957,7 +2957,7 @@ opl_check_dr_status()
static struct memlist *
drmach_memlist_add_span(drmach_copy_rename_program_t *p,
- struct memlist *mlist, uint64_t base, uint64_t len)
+ struct memlist *mlist, uint64_t base, uint64_t len)
{
struct memlist *ml, *tl, *nl;
@@ -3072,7 +3072,7 @@ static int fmem_timeout = 17;
/*
* The empirical data on some OPL system shows that
* we can copy 250 MB per second. We set it to
- * 80 MB to be conservative. In normal case,
+ * 80 MB to be conservative. In normal case,
* this timeout does not affect anything.
*/
@@ -3113,7 +3113,7 @@ static int drmach_copy_rename_timeout = 500;
static int
drmach_copy_rename_prog__relocatable(drmach_copy_rename_program_t *prog,
- int cpuid)
+ int cpuid)
{
struct memlist *ml;
register int rtn;
@@ -3412,7 +3412,7 @@ drmach_unlock_critical(caddr_t va)
sbd_error_t *
drmach_copy_rename_init(drmachid_t t_id, drmachid_t s_id,
- struct memlist *c_ml, drmachid_t *pgm_id)
+ struct memlist *c_ml, drmachid_t *pgm_id)
{
drmach_mem_t *s_mem;
drmach_mem_t *t_mem;
@@ -3690,7 +3690,7 @@ drmach_copy_rename_init(drmachid_t t_id, drmachid_t s_id,
/*
* max_elms - max number of memlist structures that
- * may be allocated for the CPU memory list.
+ * may be allocated for the CPU memory list.
* If there are too many memory span (because
* of fragmentation) than number of memlist
* available, we should return error.
@@ -4042,7 +4042,7 @@ drmach_copy_rename(drmachid_t id)
prog->critical->scf_reg_base = (*prog->data->scf_get_base_addr)();
if (prog->critical->scf_reg_base == (uint64_t)-1 ||
- prog->critical->scf_reg_base == NULL) {
+ prog->critical->scf_reg_base == 0) {
prog->data->fmem_status.error = EOPL_FMEM_SCF_ERR;
drmach_unlock_critical((caddr_t)prog);
return;
diff --git a/usr/src/uts/sun4u/opl/io/mc-opl.c b/usr/src/uts/sun4u/opl/io/mc-opl.c
index 7d267110da..2ed14e6d22 100644
--- a/usr/src/uts/sun4u/opl/io/mc-opl.c
+++ b/usr/src/uts/sun4u/opl/io/mc-opl.c
@@ -607,12 +607,12 @@ mc_close(dev_t devp, int flag, int otyp, cred_t *credp)
/* ARGSUSED */
static int
mc_ioctl(dev_t dev, int cmd, intptr_t arg, int mode, cred_t *credp,
- int *rvalp)
+ int *rvalp)
{
mc_flt_page_t flt_page;
if (cmd == MCIOC_FAULT_PAGE) {
- if (arg == NULL)
+ if (arg == (intptr_t)NULL)
return (EINVAL);
if (ddi_copyin((const void *)arg, (void *)&flt_page,
@@ -1986,7 +1986,7 @@ mc_error_handler_mir(mc_opl_t *mcp, int bank, mc_rsaddr_info_t *rsaddr)
}
static int
mc_process_error(mc_opl_t *mcp, int bank, mc_aflt_t *mc_aflt,
- mc_flt_stat_t *flt_stat)
+ mc_flt_stat_t *flt_stat)
{
int ptrl_error = mc_aflt->mflt_is_ptrl;
int rv = 0;
@@ -2981,7 +2981,7 @@ mc_opl_get_physical_board(int sb)
/* ARGSUSED */
int
mc_get_mem_unum(int synd_code, uint64_t flt_addr, char *buf, int buflen,
- int *lenp)
+ int *lenp)
{
int i;
int j;
@@ -4019,7 +4019,7 @@ mc_dump_dimm_info(board_dimm_info_t *bd_dimmp)
/* ARGSUSED */
static int
mc_ioctl_debug(dev_t dev, int cmd, intptr_t arg, int mode, cred_t *credp,
- int *rvalp)
+ int *rvalp)
{
caddr_t buf, kbuf;
uint64_t pa;
diff --git a/usr/src/uts/sun4u/opl/io/oplkmdrv.c b/usr/src/uts/sun4u/opl/io/oplkmdrv.c
index be026a7c80..c2dfee332c 100644
--- a/usr/src/uts/sun4u/opl/io/oplkmdrv.c
+++ b/usr/src/uts/sun4u/opl/io/oplkmdrv.c
@@ -241,7 +241,7 @@ okm_attach(dev_info_t *dip, ddi_attach_cmd_t cmd)
*/
okmsp->km_clean |= OKM_CLEAN_NODE;
if (ddi_create_minor_node(dip, OKM_NODENAME, S_IFCHR,
- instance, NULL, NULL) == DDI_FAILURE) {
+ instance, NULL, 0) == DDI_FAILURE) {
cmn_err(CE_WARN, "Device node creation failed");
okm_cleanup(okmsp);
return (DDI_FAILURE);
diff --git a/usr/src/uts/sun4u/opl/io/oplmsu/oplmsu.c b/usr/src/uts/sun4u/opl/io/oplmsu/oplmsu.c
index 4037644c39..dd1ed50fdb 100644
--- a/usr/src/uts/sun4u/opl/io/oplmsu/oplmsu.c
+++ b/usr/src/uts/sun4u/opl/io/oplmsu/oplmsu.c
@@ -660,7 +660,7 @@ oplmsu_close(queue_t *urq, int flag, cred_t *cred_p)
cmn_err(CE_WARN, "oplmsu: close: node_flag = 0x%lx", node_flag);
}
- ctrl->minor = NULL;
+ ctrl->minor = 0;
ctrl->queue = NULL;
wbuf_id = ctrl->wbuf_id;
wtout_id = ctrl->wtout_id;
diff --git a/usr/src/uts/sun4u/opl/io/pcicmu/pcmu_counters.c b/usr/src/uts/sun4u/opl/io/pcicmu/pcmu_counters.c
index baa214a87e..edc92c1228 100644
--- a/usr/src/uts/sun4u/opl/io/pcicmu/pcmu_counters.c
+++ b/usr/src/uts/sun4u/opl/io/pcicmu/pcmu_counters.c
@@ -23,8 +23,6 @@
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include <sys/types.h>
#include <sys/async.h>
#include <sys/sunddi.h>
@@ -56,7 +54,7 @@ pcmu_create_name_kstat(char *name, pcmu_ksinfo_t *pp, pcmu_kev_mask_t *ev)
for (i = 0; i < NUM_OF_PICS; i++) {
pp->pic_name_ksp[i] = pcmu_create_picN_kstat(name,
- i, pp->pic_shift[i], pp->pic_no_evs, ev);
+ i, pp->pic_shift[i], pp->pic_no_evs, ev);
if (pp->pic_name_ksp[i] == NULL) {
cmn_err(CE_WARN, "pci: unable to create name kstat");
@@ -85,7 +83,7 @@ pcmu_delete_name_kstat(pcmu_ksinfo_t *pp)
*/
static kstat_t *
pcmu_create_picN_kstat(char *mod_name, int pic, int pic_shift,
- int num_ev, pcmu_kev_mask_t *ev_array)
+ int num_ev, pcmu_kev_mask_t *ev_array)
{
struct kstat_named *pic_named_data;
int inst = 0;
@@ -95,9 +93,9 @@ pcmu_create_picN_kstat(char *mod_name, int pic, int pic_shift,
(void) sprintf(pic_name, "pic%d", pic);
if ((picN_ksp = kstat_create(mod_name, inst, pic_name,
- "bus", KSTAT_TYPE_NAMED, num_ev, NULL)) == NULL) {
+ "bus", KSTAT_TYPE_NAMED, num_ev, 0)) == NULL) {
cmn_err(CE_WARN, "%s %s : kstat create failed",
- mod_name, pic_name);
+ mod_name, pic_name);
/*
* It is up to the calling function to delete any kstats
@@ -158,7 +156,7 @@ kstat_t *pcmu_create_cntr_kstat(pcmu_t *pcmu_p, char *name,
"counters", "bus", KSTAT_TYPE_NAMED, num_pics + 1,
KSTAT_FLAG_WRITABLE)) == NULL) {
cmn_err(CE_WARN, "%s%d counters kstat_create failed",
- drv_name, drv_instance);
+ drv_name, drv_instance);
return (NULL);
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-28 01:54:15 +0000