diff --git a/device/dualsense/device.go b/device/dualsense/device.go
index 93d5b8e2..814329e0 100644
--- a/device/dualsense/device.go
+++ b/device/dualsense/device.go
@@ -471,7 +471,6 @@ func (d *DualSense) handleHapticsAudioOut(out []byte) {
 	}
 
 	processed, release := d.speakerAudioFeature.applyPCM(out, USBHapticsAudioChannels)
-	atomicAudioHapticsFunc := d.atomicAudioHapticsFunc
 	reports := d.consumeDualSenseV5AudioLocked(processed, receivedAt)
 	// The callback is deliberately completed under the device lock. This makes
 	// an alternate-setting or endpoint reset a hard generation barrier: once the
@@ -490,7 +489,7 @@ func (d *DualSense) handleHapticsAudioOut(out []byte) {
 
 		d.mtx.Lock()
 		outputFunc := d.outputFunc
-		atomicAudioHapticsFunc = d.atomicAudioHapticsFunc
+		atomicAudioHapticsFunc := d.atomicAudioHapticsFunc
 		if outputFunc != nil || atomicAudioHapticsFunc != nil {
 			feedback := pending.feedback
 			d.mtx.Unlock()
diff --git a/device/dualsense/native_audio_v5.go b/device/dualsense/native_audio_v5.go
index 5c692433..de7f79d3 100644
--- a/device/dualsense/native_audio_v5.go
+++ b/device/dualsense/native_audio_v5.go
@@ -26,7 +26,7 @@ func appendDualSenseV5Speaker(dst, src []byte) []byte {
 
 // copyDualSenseV5SpeakerChannels copies the front stereo pair from the native
 // four-channel USB endpoint. Rear channels remain on the haptics clock.
-func copyDualSenseV5SpeakerChannels(dst, src []byte) int {
+func copyDualSenseV5SpeakerChannels(dst, src []byte) {
 	frames := min(len(src)/USBHapticsAudioFrameSize,
 		len(dst)/dualSenseV5SpeakerFrameSize)
 	for frame := 0; frame < frames; frame++ {
@@ -35,5 +35,4 @@ func copyDualSenseV5SpeakerChannels(dst, src []byte) int {
 		copy(dst[destination:destination+dualSenseV5SpeakerFrameSize],
 			src[source:source+dualSenseV5SpeakerFrameSize])
 	}
-	return frames * dualSenseV5SpeakerFrameSize
 }
diff --git a/device/dualsense/output_writer_test.go b/device/dualsense/output_writer_test.go
index 850de5b1..ebb39260 100644
--- a/device/dualsense/output_writer_test.go
+++ b/device/dualsense/output_writer_test.go
@@ -153,12 +153,6 @@ func (c *deadlineTrackingConn) Close() error {
 	return err
 }
 
-func (c *deadlineTrackingConn) writeDeadlines() []time.Time {
-	c.deadlineLock.Lock()
-	defer c.deadlineLock.Unlock()
-	return append([]time.Time(nil), c.deadlines...)
-}
-
 func TestDualSenseV5WriterWriteFailureCannotRaceFinalDrain(t *testing.T) {
 	server, client := net.Pipe()
 	conn := &writeStartedConn{Conn: server, started: make(chan struct{})}