git.openwrt.org Git - openwrt/staging/zorun.git/blob

   1 From 89da38a4d977ebb4c0dfa86975d7bf4fea310b63 Mon Sep 17 00:00:00 2001
   2 From: Takashi Iwai <tiwai@suse.de>
   3 Date: Tue, 4 Sep 2018 17:58:52 +0200
   4 Subject: [PATCH 456/782] staging: bcm2835-audio: Remove unnecessary header
   5  file includes
   6
   7 commit 7e46fff5f19ce2b8a9891e4c08631c64d06e9e17 upstream.
   8
   9 Yet a few header files are included unnecessarily.  Drop them.
  10
  11 Also remove trivial comments.
  12
  13 Signed-off-by: Takashi Iwai <tiwai@suse.de>
  14 Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
  15 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  16 ---
  17  .../bcm2835-audio/bcm2835-vchiq.c             | 19 -------------------
  18  .../vc04_services/bcm2835-audio/bcm2835.h     |  6 ------
  19  2 files changed, 25 deletions(-)
  20
  21 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
  22 +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
  23 @@ -1,31 +1,12 @@
  24  // SPDX-License-Identifier: GPL-2.0
  25  /* Copyright 2011 Broadcom Corporation.  All rights reserved. */
  26
  27 -#include <linux/device.h>
  28 -#include <sound/core.h>
  29 -#include <sound/initval.h>
  30 -#include <sound/pcm.h>
  31 -#include <linux/io.h>
  32 -#include <linux/interrupt.h>
  33 -#include <linux/fs.h>
  34 -#include <linux/file.h>
  35 -#include <linux/mm.h>
  36 -#include <linux/syscalls.h>
  37 -#include <linux/uaccess.h>
  38  #include <linux/slab.h>
  39 -#include <linux/delay.h>
  40 -#include <linux/atomic.h>
  41  #include <linux/module.h>
  42  #include <linux/completion.h>
  43 -
  44  #include "bcm2835.h"
  45 -
  46 -/* ---- Include Files -------------------------------------------------------- */
  47 -
  48  #include "vc_vchi_audioserv_defs.h"
  49
  50 -/* ---- Private Constants and Types ------------------------------------------ */
  51 -
  52  struct bcm2835_audio_instance {
  53         struct device *dev;
  54         VCHI_SERVICE_HANDLE_T vchi_handle;
  55 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
  56 +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
  57 @@ -5,16 +5,10 @@
  58  #define __SOUND_ARM_BCM2835_H
  59
  60  #include <linux/device.h>
  61 -#include <linux/list.h>
  62 -#include <linux/interrupt.h>
  63  #include <linux/wait.h>
  64  #include <sound/core.h>
  65 -#include <sound/initval.h>
  66  #include <sound/pcm.h>
  67 -#include <sound/pcm_params.h>
  68  #include <sound/pcm-indirect.h>
  69 -#include <linux/workqueue.h>
  70 -
  71  #include "interface/vchi/vchi.h"
  72
  73  #define MAX_SUBSTREAMS   (8)