You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
74 lines
2.2 KiB
Diff
74 lines
2.2 KiB
Diff
From 8deead340379eeb09571476e0412ce50036c08d1 Mon Sep 17 00:00:00 2001
|
|
From: Takashi Iwai <tiwai@suse.de>
|
|
Date: Tue, 4 Sep 2018 17:58:52 +0200
|
|
Subject: [PATCH] staging: bcm2835-audio: Remove unnecessary header
|
|
file includes
|
|
|
|
commit 7e46fff5f19ce2b8a9891e4c08631c64d06e9e17 upstream.
|
|
|
|
Yet a few header files are included unnecessarily. Drop them.
|
|
|
|
Also remove trivial comments.
|
|
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
.../bcm2835-audio/bcm2835-vchiq.c | 19 -------------------
|
|
.../vc04_services/bcm2835-audio/bcm2835.h | 6 ------
|
|
2 files changed, 25 deletions(-)
|
|
|
|
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
|
|
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
|
|
@@ -1,31 +1,12 @@
|
|
// SPDX-License-Identifier: GPL-2.0
|
|
/* Copyright 2011 Broadcom Corporation. All rights reserved. */
|
|
|
|
-#include <linux/device.h>
|
|
-#include <sound/core.h>
|
|
-#include <sound/initval.h>
|
|
-#include <sound/pcm.h>
|
|
-#include <linux/io.h>
|
|
-#include <linux/interrupt.h>
|
|
-#include <linux/fs.h>
|
|
-#include <linux/file.h>
|
|
-#include <linux/mm.h>
|
|
-#include <linux/syscalls.h>
|
|
-#include <linux/uaccess.h>
|
|
#include <linux/slab.h>
|
|
-#include <linux/delay.h>
|
|
-#include <linux/atomic.h>
|
|
#include <linux/module.h>
|
|
#include <linux/completion.h>
|
|
-
|
|
#include "bcm2835.h"
|
|
-
|
|
-/* ---- Include Files -------------------------------------------------------- */
|
|
-
|
|
#include "vc_vchi_audioserv_defs.h"
|
|
|
|
-/* ---- Private Constants and Types ------------------------------------------ */
|
|
-
|
|
struct bcm2835_audio_instance {
|
|
struct device *dev;
|
|
VCHI_SERVICE_HANDLE_T vchi_handle;
|
|
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
|
|
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
|
|
@@ -5,16 +5,10 @@
|
|
#define __SOUND_ARM_BCM2835_H
|
|
|
|
#include <linux/device.h>
|
|
-#include <linux/list.h>
|
|
-#include <linux/interrupt.h>
|
|
#include <linux/wait.h>
|
|
#include <sound/core.h>
|
|
-#include <sound/initval.h>
|
|
#include <sound/pcm.h>
|
|
-#include <sound/pcm_params.h>
|
|
#include <sound/pcm-indirect.h>
|
|
-#include <linux/workqueue.h>
|
|
-
|
|
#include "interface/vchi/vchi.h"
|
|
|
|
#define MAX_SUBSTREAMS (8)
|