2 files changed, 10 insertions, 25 deletions

diff --git a/usr/src/uts/sun/io/dada/targets/dad.c b/usr/src/uts/sun/io/dada/targets/dad.c
index b3be5f3ea5..c9e8b393b6 100644
--- a/usr/src/uts/sun/io/dada/targets/dad.c
+++ b/usr/src/uts/sun/io/dada/targets/dad.c
@@ -315,7 +315,7 @@ static struct cb_ops dcd_cb_ops = {
 	0,			/* streamtab  */
 	D_64BIT | D_MP | D_NEW,	/* Driver compatibility flag */
 	CB_REV,			/* cb_rev */
-	dcdaread, 		/* async I/O read entry point */
+	dcdaread,		/* async I/O read entry point */
 	dcdawrite		/* async I/O write entry point */
 };
 
@@ -2255,7 +2255,7 @@ make_dcd_cmd(struct dcd_disk *un, struct buf *bp, int (*func)())
 		    &p_lblksrt,
 		    NULL,
 		    NULL,
-		    0) != NULL) {
+		    0) != 0) {
 			lblocks = 0;
 			p_lblksrt = 0;
 		}
@@ -3041,7 +3041,7 @@ dcddump(dev_t dev, caddr_t addr, daddr_t blkno, int nblk)
 /* ARGSUSED3 */
 static int
 dcdioctl(dev_t dev, int cmd, intptr_t arg, int flag,
-	cred_t *cred_p, int *rval_p)
+    cred_t *cred_p, int *rval_p)
 {
 	auto int32_t data[512 / (sizeof (int32_t))];
 	struct dk_cinfo *info;
@@ -3882,7 +3882,7 @@ static int
 dcd_write_deviceid(struct dcd_disk *un)
 {
 
-	int 	status;
+	int	status;
 	diskaddr_t blk;
 	struct udcd_cmd ucmd;
 	struct dcd_cmd cdb;
@@ -4177,7 +4177,7 @@ dcd_validate_model_serial(char *str, int *retlen, int totallen)
 #ifndef lint
 void
 clean_print(dev_info_t *dev, char *label, uint_t level,
-	char *title, char *data, int len)
+    char *title, char *data, int len)
 {
 	int	i;
 	char	buf[256];
diff --git a/usr/src/uts/sun/io/sbusmem.c b/usr/src/uts/sun/io/sbusmem.c
index c747c93dfc..1f0934707c 100644
--- a/usr/src/uts/sun/io/sbusmem.c
+++ b/usr/src/uts/sun/io/sbusmem.c
@@ -111,10 +111,6 @@ static struct modlinkage modlinkage = {
 
 static int sbmem_rw(dev_t, struct uio *, enum uio_rw, cred_t *);
 
-#if !defined(lint)
-static char sbusmem_initmsg[] = "sbusmem _init: sbusmem.c\t1.28\t08/19/2008\n";
-#endif
-
 int
 _init(void)
 {
@@ -206,7 +202,7 @@ sbmem_attach(dev_info_t *devi, ddi_attach_cmd_t cmd)
 		}
 
 		if (ddi_create_minor_node(devi, ident, S_IFCHR, instance,
-		    DDI_PSEUDO, NULL) == DDI_FAILURE) {
+		    DDI_PSEUDO, 0) == DDI_FAILURE) {
 			kmem_free(ident, ilen);
 			ddi_remove_minor_node(devi, NULL);
 			ddi_soft_state_free(sbusmem_state_head, instance);
@@ -279,15 +275,12 @@ sbmem_close(dev_t dev, int flag, int otyp, struct cred *cred)
 }
 
 static int
-sbmem_info(dev_info_t *dip, ddi_info_cmd_t infocmd, void *arg, void **result)
+sbmem_info(dev_info_t *dip __unused, ddi_info_cmd_t infocmd, void *arg,
+    void **result)
 {
 	int instance, error = DDI_FAILURE;
 	struct sbusmem_unit *un;
 
-#if defined(lint) || defined(__lint)
-	dip = dip;
-#endif /* lint || __lint */
-
 	switch (infocmd) {
 	case DDI_INFO_DEVT2DEVINFO:
 		instance = getminor((dev_t)arg);
@@ -328,7 +321,7 @@ sbmem_write(dev_t dev, struct uio *uio, cred_t *cred)
 }
 
 static int
-sbmem_rw(dev_t dev, struct uio *uio, enum uio_rw rw, cred_t *cred)
+sbmem_rw(dev_t dev, struct uio *uio, enum uio_rw rw, cred_t *cred __unused)
 {
 	uint_t c;
 	struct iovec *iov;
@@ -338,10 +331,6 @@ sbmem_rw(dev_t dev, struct uio *uio, enum uio_rw rw, cred_t *cred)
 	dev_info_t *dip;
 	caddr_t reg;
 
-#if defined(lint) || defined(__lint)
-	cred = cred;
-#endif /* lint || __lint */
-
 	instance = getminor(dev);
 	if ((un = ddi_get_soft_state(sbusmem_state_head, instance)) == NULL) {
 		return (ENXIO);
@@ -383,15 +372,11 @@ sbmem_rw(dev_t dev, struct uio *uio, enum uio_rw rw, cred_t *cred)
 
 static int
 sbmem_devmap(dev_t dev, devmap_cookie_t dhp, offset_t off, size_t len,
-	size_t *maplen, uint_t model)
+    size_t *maplen, uint_t model __unused)
 {
 	struct sbusmem_unit *un;
 	int instance, error;
 
-#if defined(lint) || defined(__lint)
-	model = model;
-#endif /* lint || __lint */
-
 	instance = getminor(dev);
 	if ((un = ddi_get_soft_state(sbusmem_state_head, instance)) == NULL) {
 		return (ENXIO);