[illumos-gate merge]

commit b4aa415ef0fccf334b7c434a7b01585969f50a9a
    10795 cpr: NULL pointer errors
commit 152f805526ab714ed4b76c4ff672f34c8dda62ea
    10759 cardbus: NULL pointer errors

2 files changed, 42 insertions, 47 deletions

diff --git a/usr/src/uts/common/cpr/cpr_stat.c b/usr/src/uts/common/cpr/cpr_stat.c
index caca9ea777..829eb99e9e 100644
--- a/usr/src/uts/common/cpr/cpr_stat.c
+++ b/usr/src/uts/common/cpr/cpr_stat.c
@@ -134,7 +134,7 @@ cpr_stat_cleanup()
 
 	for (cep = cp->cs_event_head; cep; cep = cep->ce_next) {
 		if ((cep->ce_ntests & CE_START_MASK) &&
-		    strcmp(cep->ce_name, "POST CPR DELAY") != NULL) {
+		    strcmp(cep->ce_name, "POST CPR DELAY") != 0) {
 			cpr_stat_event_end(cep->ce_name, 0);
 			cep->ce_ntests &= ~CE_START_MASK;
 		}
@@ -184,10 +184,10 @@ cpr_stat_event_print()
 			tabs = "\t\t";
 		else
 			tabs = "\t";
-		if (strcmp(cep->ce_name, "Suspend Total") == NULL ||
-		    strcmp(cep->ce_name, "Resume Total") == NULL ||
-		    strcmp(cep->ce_name, "POST CPR DELAY") == NULL ||
-		    strcmp(cep->ce_name, "WHOLE CYCLE") == NULL)
+		if (strcmp(cep->ce_name, "Suspend Total") == 0 ||
+		    strcmp(cep->ce_name, "Resume Total") == 0 ||
+		    strcmp(cep->ce_name, "POST CPR DELAY") == 0 ||
+		    strcmp(cep->ce_name, "WHOLE CYCLE") == 0)
 			fmt = "%s%s%d\t\t%3d.%1d\t\t%3d.%1d\n";
 		else
 			fmt = "%s%s%d\t\t  %3d.%1d\t\t  %3d.%1d\n";
@@ -231,12 +231,12 @@ cpr_find_event(char *name, int new)
 	int i;
 
 	for (cep = cp->cs_event_head; cep; cep = cep->ce_next) {
-		if (strcmp(name, cep->ce_name) == NULL)
+		if (strcmp(name, cep->ce_name) == 0)
 			return (cep);
 	}
 
 	/* if not begin not end either */
-	if (new == NULL)
+	if (new == 0)
 		return (NULL);
 
 	for (i = 0; i < CPR_E_MAX_EVENTNUM; i++) {
diff --git a/usr/src/uts/common/io/cardbus/cardbus.c b/usr/src/uts/common/io/cardbus/cardbus.c
index c0ea430f2f..b0bb0a7099 100644
--- a/usr/src/uts/common/io/cardbus/cardbus.c
+++ b/usr/src/uts/common/io/cardbus/cardbus.c
@@ -29,8 +29,6 @@
  * From "@(#)pcicfg.c   1.31    99/06/18 SMI"
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * Cardbus module
  */
@@ -315,7 +313,7 @@ cardbus_claim_pci_busnum(dev_info_t *dip, void *arg)
 
 static void
 cardbus_walk_node_child(dev_info_t *parent,
-	int (*f)(dev_info_t *, void *), void *arg)
+    int (*f)(dev_info_t *, void *), void *arg)
 {
 	dev_info_t *dip;
 	int ret;
@@ -743,10 +741,8 @@ is_32bit_pccard(dev_info_t *dip)
 
 	len = sizeof (bus_type);
 	if (ddi_prop_op(DDI_DEV_T_ANY, ddi_get_parent(dip),
-		PROP_LEN_AND_VAL_BUF,
-		DDI_PROP_CANSLEEP | DDI_PROP_DONTPASS,
-		"device_type",
-		(caddr_t)&bus_type, &len) != DDI_SUCCESS)
+	    PROP_LEN_AND_VAL_BUF, DDI_PROP_CANSLEEP | DDI_PROP_DONTPASS,
+	    "device_type", (caddr_t)&bus_type, &len) != DDI_SUCCESS)
 		return (B_FALSE);
 
 	if ((strcmp(bus_type, "pci") != 0) &&
@@ -900,8 +896,8 @@ cardbus_revert_properties(dev_info_t *dip)
 
 static int
 cardbus_prop_op(dev_t dev, dev_info_t *dip, dev_info_t *ch_dip,
-		ddi_prop_op_t prop_op, int mod_flags,
-		char *name, caddr_t valuep, int *lengthp)
+    ddi_prop_op_t prop_op, int mod_flags,
+    char *name, caddr_t valuep, int *lengthp)
 {
 #if defined(CARDBUS_DEBUG)
 	if ((ch_dip != dip) || (cardbus_debug >= 9))
@@ -915,7 +911,7 @@ cardbus_prop_op(dev_t dev, dev_info_t *dip, dev_info_t *ch_dip,
 
 static int
 cardbus_ctlops(dev_info_t *dip, dev_info_t *rdip,
-	ddi_ctl_enum_t ctlop, void *arg, void *result)
+    ddi_ctl_enum_t ctlop, void *arg, void *result)
 {
 	pci_regspec_t *regs;
 	int	totreg, reglen;
@@ -1207,7 +1203,7 @@ cardbus_init_child_regs(dev_info_t *child)
 
 static int
 cardbus_initchild(dev_info_t *rdip, dev_info_t *dip, dev_info_t *child,
-		void *result)
+    void *result)
 {
 	char	name[MAXNAMELEN];
 	const char	*dname = ddi_driver_name(dip);
@@ -1443,7 +1439,7 @@ find_token(char **cp, int *l, char *endc)
 	}
 
 	*endc = **cp;
-	**cp = NULL;
+	**cp = '\0';
 
 	return (cpp);
 }
@@ -1526,7 +1522,7 @@ token_to_dec(char *token, unsigned *val, int len)
 
 static void
 cardbus_add_prop(struct cb_deviceset_props *cdsp, int type, char *name,
-		caddr_t vp, int len)
+    caddr_t vp, int len)
 {
 	ddi_prop_t *propp;
 	int	pnlen = strlen(name) + 1;
@@ -1543,7 +1539,7 @@ cardbus_add_prop(struct cb_deviceset_props *cdsp, int type, char *name,
 
 static void
 cardbus_add_stringprop(struct cb_deviceset_props *cdsp, char *name,
-		char *vp, int len)
+    char *vp, int len)
 {
 	char	*nstr = kmem_zalloc(len + 1, KM_SLEEP);
 
@@ -1595,7 +1591,7 @@ cardbus_devprops_free(struct cb_deviceset_props *cbdp)
  * after the semi-colon is a setting equate.
  *
  * "binding_name=xXxXxX VendorID=NNNN DeviceID=NNNN; nodename=NewName
- * 					Prop=PropVal"
+ *					Prop=PropVal"
  *
  */
 static int
@@ -1605,11 +1601,10 @@ cardbus_parse_devprop(cbus_t *cbp, char *cp)
 	int	length;
 	char	*token = "beginning of line";
 	char	*ptoken = NULL, *quote;
-	char	eq = NULL;
+	char	eq = '\0';
 	struct cb_deviceset_props *cdsp;
 
-	cdsp = (struct cb_deviceset_props *)kmem_zalloc(sizeof (*cdsp),
-	    KM_SLEEP);
+	cdsp = kmem_zalloc(sizeof (*cdsp), KM_SLEEP);
 	length = strlen(cp);
 
 	while ((*cp) && (l < length)) {
@@ -1634,7 +1629,7 @@ cardbus_parse_devprop(cbus_t *cbp, char *cp)
 
 			l++;
 
-			*cpp = NULL;
+			*cpp = '\0';
 		} /* PARSE_ESCAPE */
 
 		/*
@@ -1645,7 +1640,7 @@ cardbus_parse_devprop(cbus_t *cbp, char *cp)
 			if (qm) {
 				quote = cp + 1;
 			} else {
-				*cp = NULL;
+				*cp = '\0';
 				if (state == PT_STATE_CHECK) {
 					if (strcmp(token, cb_nnamestr) == 0) {
 						cdsp->nodename = kmem_alloc(
@@ -1852,7 +1847,7 @@ cardbus_device_props(cbus_t *cbp)
 
 static int
 cardbus_bus_map(dev_info_t *dip, dev_info_t *rdip, ddi_map_req_t *mp,
-		off_t offset, off_t len, caddr_t *vaddrp)
+    off_t offset, off_t len, caddr_t *vaddrp)
 {
 	register dev_info_t *pdip = (dev_info_t *)DEVI(dip)->devi_parent;
 	int	rc;
@@ -1904,8 +1899,8 @@ pcirp2rp(const pci_regspec_t *pci_rp, struct regspec *rp)
 
 static int
 cardbus_dma_allochdl(dev_info_t *dip, dev_info_t *rdip, ddi_dma_attr_t *attr,
-		int (*waitfp)(caddr_t), caddr_t arg,
-		ddi_dma_handle_t *handlep)
+    int (*waitfp)(caddr_t), caddr_t arg,
+    ddi_dma_handle_t *handlep)
 {
 	dev_info_t *pdip = ddi_get_parent(dip);
 
@@ -1926,7 +1921,7 @@ cardbus_dma_allochdl(dev_info_t *dip, dev_info_t *rdip, ddi_dma_attr_t *attr,
 
 static int
 cardbus_dma_freehdl(dev_info_t *dip, dev_info_t *rdip,
-		ddi_dma_handle_t handle)
+    ddi_dma_handle_t handle)
 {
 	dev_info_t *pdip = ddi_get_parent(dip);
 
@@ -1947,8 +1942,8 @@ cardbus_dma_freehdl(dev_info_t *dip, dev_info_t *rdip,
 
 static int
 cardbus_dma_bindhdl(dev_info_t *dip, dev_info_t *rdip,
-		ddi_dma_handle_t handle, struct ddi_dma_req *dmareq,
-		ddi_dma_cookie_t *cp, uint_t *ccountp)
+    ddi_dma_handle_t handle, struct ddi_dma_req *dmareq,
+    ddi_dma_cookie_t *cp, uint_t *ccountp)
 {
 	dev_info_t *pdip = ddi_get_parent(dip);
 
@@ -1970,7 +1965,7 @@ cardbus_dma_bindhdl(dev_info_t *dip, dev_info_t *rdip,
 
 static int
 cardbus_dma_unbindhdl(dev_info_t *dip, dev_info_t *rdip,
-		ddi_dma_handle_t handle)
+    ddi_dma_handle_t handle)
 {
 	dev_info_t *pdip = ddi_get_parent(dip);
 
@@ -1992,8 +1987,8 @@ cardbus_dma_unbindhdl(dev_info_t *dip, dev_info_t *rdip,
 
 static int
 cardbus_dma_flush(dev_info_t *dip, dev_info_t *rdip,
-		ddi_dma_handle_t handle, off_t off, size_t len,
-		uint_t cache_flags)
+    ddi_dma_handle_t handle, off_t off, size_t len,
+    uint_t cache_flags)
 {
 	dev_info_t *pdip = ddi_get_parent(dip);
 
@@ -2015,8 +2010,8 @@ cardbus_dma_flush(dev_info_t *dip, dev_info_t *rdip,
 
 static int
 cardbus_dma_win(dev_info_t *dip, dev_info_t *rdip,
-		ddi_dma_handle_t handle, uint_t win, off_t *offp,
-		size_t *lenp, ddi_dma_cookie_t *cookiep, uint_t *ccountp)
+    ddi_dma_handle_t handle, uint_t win, off_t *offp,
+    size_t *lenp, ddi_dma_cookie_t *cookiep, uint_t *ccountp)
 {
 	dev_info_t *pdip = ddi_get_parent(dip);
 	cardbus_err(dip, 6,
@@ -2037,7 +2032,7 @@ cardbus_dma_win(dev_info_t *dip, dev_info_t *rdip,
 
 static int
 cardbus_dma_map(dev_info_t *dip, dev_info_t *rdip,
-		struct ddi_dma_req *dmareqp, ddi_dma_handle_t *handlep)
+    struct ddi_dma_req *dmareqp, ddi_dma_handle_t *handlep)
 {
 	dev_info_t *pdip = ddi_get_parent(dip);
 
@@ -2059,7 +2054,7 @@ cardbus_dma_map(dev_info_t *dip, dev_info_t *rdip,
 
 static int
 cardbus_get_eventcookie(dev_info_t *dip, dev_info_t *rdip,
-		char *eventname, ddi_eventcookie_t *cookiep)
+    char *eventname, ddi_eventcookie_t *cookiep)
 {
 	cbus_t *cbp;
 	int	cb_instance;
@@ -2105,9 +2100,9 @@ cardbus_get_eventcookie(dev_info_t *dip, dev_info_t *rdip,
 
 static int
 cardbus_add_eventcall(dev_info_t *dip, dev_info_t *rdip,
-		ddi_eventcookie_t cookie, void (*callback)(dev_info_t *dip,
-		ddi_eventcookie_t cookie, void *arg, void *bus_impldata),
-		void *arg, ddi_callback_id_t *cb_id)
+    ddi_eventcookie_t cookie, void (*callback)(dev_info_t *dip,
+    ddi_eventcookie_t cookie, void *arg, void *bus_impldata),
+    void *arg, ddi_callback_id_t *cb_id)
 {
 	cbus_t *cbp;
 	int	cb_instance;
@@ -2189,7 +2184,7 @@ cardbus_remove_eventcall(dev_info_t *dip, ddi_callback_id_t cb_id)
 
 static int
 cardbus_post_event(dev_info_t *dip, dev_info_t *rdip,
-		ddi_eventcookie_t cookie, void *bus_impldata)
+    ddi_eventcookie_t cookie, void *bus_impldata)
 {
 	_NOTE(ARGUNUSED(rdip, cookie, bus_impldata))
 	cardbus_err(dip, 1, "cardbus_post_event()\n");
@@ -2214,7 +2209,7 @@ cardbus_get_pil(dev_info_t *dip)
 
 static int
 cardbus_intr_ops(dev_info_t *dip, dev_info_t *rdip, ddi_intr_op_t intr_op,
-	ddi_intr_handle_impl_t *hdlp, void *result)
+    ddi_intr_handle_impl_t *hdlp, void *result)
 {
 	int ret = DDI_SUCCESS;
 
@@ -2271,7 +2266,7 @@ cardbus_intr_ops(dev_info_t *dip, dev_info_t *rdip, ddi_intr_op_t intr_op,
 
 static int
 cardbus_enable_intr_impl(dev_info_t *dip, dev_info_t *rdip,
-		ddi_intr_handle_impl_t *hdlp)
+    ddi_intr_handle_impl_t *hdlp)
 {
 	anp_t *anp = (anp_t *)ddi_get_driver_private(dip);
 	set_irq_handler_t sih;
@@ -2307,7 +2302,7 @@ cardbus_enable_intr_impl(dev_info_t *dip, dev_info_t *rdip,
 
 static int
 cardbus_disable_intr_impl(dev_info_t *dip, dev_info_t *rdip,
-		ddi_intr_handle_impl_t *hdlp)
+    ddi_intr_handle_impl_t *hdlp)
 {
 	anp_t *anp = (anp_t *)ddi_get_driver_private(dip);
 	clear_irq_handler_t cih;