diff --git a/sys/dev/acpi/pckbc_acpi.c b/sys/dev/acpi/pckbc_acpi.c
index ba9c42872e29..caacc2e3725f 100644
--- a/sys/dev/acpi/pckbc_acpi.c
+++ b/sys/dev/acpi/pckbc_acpi.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pckbc_acpi.c,v 1.33 2010/03/05 14:00:17 jruoho Exp $	*/
+/*	$NetBSD: pckbc_acpi.c,v 1.34 2013/10/17 21:19:03 christos Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbc_acpi.c,v 1.33 2010/03/05 14:00:17 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc_acpi.c,v 1.34 2013/10/17 21:19:03 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/callout.h>
@@ -130,7 +130,6 @@ pckbc_acpi_attach(device_t parent, device_t self, void *aux)
 	struct pckbc_internal *t;
 	struct acpi_attach_args *aa = aux;
 	bus_space_handle_t ioh_d, ioh_c;
-	pckbc_slot_t peer;
 	struct acpi_resources res;
 	struct acpi_io *io0, *io1, *ioswap;
 	struct acpi_irq *irq;
@@ -141,10 +140,8 @@ pckbc_acpi_attach(device_t parent, device_t self, void *aux)
 
 	if (acpi_match_hid(aa->aa_node->ad_devinfo, pckbc_acpi_ids_kbd)) {
 		psc->sc_slot = PCKBC_KBD_SLOT;
-		peer = PCKBC_AUX_SLOT;
 	} else if (acpi_match_hid(aa->aa_node->ad_devinfo, pckbc_acpi_ids_ms)) {
 		psc->sc_slot = PCKBC_AUX_SLOT;
-		peer = PCKBC_KBD_SLOT;
 	} else {
 		aprint_error(": unknown port!\n");
 		panic("pckbc_acpi_attach: impossible");
diff --git a/sys/dev/i2c/tvpll.c b/sys/dev/i2c/tvpll.c
index e5e44db47eb5..31d4d07c0cc5 100644
--- a/sys/dev/i2c/tvpll.c
+++ b/sys/dev/i2c/tvpll.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tvpll.c,v 1.4 2011/10/02 19:03:56 jmcneill Exp $ */
+/* $NetBSD: tvpll.c,v 1.5 2013/10/17 21:18:43 christos Exp $ */
 
 /*
  * Copyright (c) 2008, 2011 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tvpll.c,v 1.4 2011/10/02 19:03:56 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tvpll.c,v 1.5 2013/10/17 21:18:43 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -55,7 +55,6 @@ struct tvpll *
 tvpll_open(device_t parent, i2c_tag_t t, i2c_addr_t a, struct tvpll_data *p)
 {
 	struct tvpll *tvpll;
-	int rv;
 
 	tvpll = kmem_alloc(sizeof(struct tvpll), KM_SLEEP);
         if (tvpll == NULL)
@@ -68,7 +67,7 @@ tvpll_open(device_t parent, i2c_tag_t t, i2c_addr_t a, struct tvpll_data *p)
 
 	if (tvpll->pll->initdata) {
 		iic_acquire_bus(tvpll->tag, I2C_F_POLL);
-		rv = iic_exec(tvpll->tag, I2C_OP_WRITE_WITH_STOP, tvpll->addr,
+		(void)iic_exec(tvpll->tag, I2C_OP_WRITE_WITH_STOP, tvpll->addr,
 		    &tvpll->pll->initdata[1], tvpll->pll->initdata[0],
 		    NULL, 0, I2C_F_POLL);
 		iic_release_bus(tvpll->tag, I2C_F_POLL);