1d27e3e225
Drop the arguments from the macro and adjust all callers with the
following script:
perl -pi -e 's/DEFINE_TIMER\((.*), 0, 0\);/DEFINE_TIMER($1);/g;' \
$(git grep DEFINE_TIMER | cut -d: -f1 | sort -u | grep -v timer.h)
Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> # for m68k parts
Acked-by: Guenter Roeck <linux@roeck-us.net> # for watchdog parts
Acked-by: David S. Miller <davem@davemloft.net> # for networking parts
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Kalle Valo <kvalo@codeaurora.org> # for wireless parts
Acked-by: Arnd Bergmann <arnd@arndb.de>
Cc: linux-mips@linux-mips.org
Cc: Petr Mladek <pmladek@suse.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Lai Jiangshan <jiangshanlai@gmail.com>
Cc: Sebastian Reichel <sre@kernel.org>
Cc: Kalle Valo <kvalo@qca.qualcomm.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: linux1394-devel@lists.sourceforge.net
Cc: Chris Metcalf <cmetcalf@mellanox.com>
Cc: linux-s390@vger.kernel.org
Cc: linux-wireless@vger.kernel.org
Cc: "James E.J. Bottomley" <jejb@linux.vnet.ibm.com>
Cc: Wim Van Sebroeck <wim@iguana.be>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Ursula Braun <ubraun@linux.vnet.ibm.com>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Harish Patil <harish.patil@cavium.com>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Cc: Michael Reed <mdr@sgi.com>
Cc: Manish Chopra <manish.chopra@cavium.com>
Cc: Len Brown <len.brown@intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: linux-pm@vger.kernel.org
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Julian Wiedmann <jwi@linux.vnet.ibm.com>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Mark Gross <mark.gross@intel.com>
Cc: linux-watchdog@vger.kernel.org
Cc: linux-scsi@vger.kernel.org
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Stefan Richter <stefanr@s5r6.in-berlin.de>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: netdev@vger.kernel.org
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: linuxppc-dev@lists.ozlabs.org
Cc: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Link: https://lkml.kernel.org/r/1507159627-127660-11-git-send-email-keescook@chromium.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
117 lines
2.7 KiB
C
117 lines
2.7 KiB
C
/*
|
|
* linux/arch/m68k/amiga/amisound.c
|
|
*
|
|
* amiga sound driver for Linux/m68k
|
|
*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file COPYING in the main directory of this archive
|
|
* for more details.
|
|
*/
|
|
|
|
#include <linux/jiffies.h>
|
|
#include <linux/timer.h>
|
|
#include <linux/init.h>
|
|
#include <linux/string.h>
|
|
#include <linux/module.h>
|
|
|
|
#include <asm/amigahw.h>
|
|
|
|
static unsigned short *snd_data;
|
|
static const signed char sine_data[] = {
|
|
0, 39, 75, 103, 121, 127, 121, 103, 75, 39,
|
|
0, -39, -75, -103, -121, -127, -121, -103, -75, -39
|
|
};
|
|
#define DATA_SIZE ARRAY_SIZE(sine_data)
|
|
|
|
#define custom amiga_custom
|
|
|
|
/*
|
|
* The minimum period for audio may be modified by the frame buffer
|
|
* device since it depends on htotal (for OCS/ECS/AGA)
|
|
*/
|
|
|
|
volatile unsigned short amiga_audio_min_period = 124; /* Default for pre-OCS */
|
|
EXPORT_SYMBOL(amiga_audio_min_period);
|
|
|
|
#define MAX_PERIOD (65535)
|
|
|
|
|
|
/*
|
|
* Current period (set by dmasound.c)
|
|
*/
|
|
|
|
unsigned short amiga_audio_period = MAX_PERIOD;
|
|
EXPORT_SYMBOL(amiga_audio_period);
|
|
|
|
static unsigned long clock_constant;
|
|
|
|
void __init amiga_init_sound(void)
|
|
{
|
|
static struct resource beep_res = { .name = "Beep" };
|
|
|
|
snd_data = amiga_chip_alloc_res(sizeof(sine_data), &beep_res);
|
|
if (!snd_data) {
|
|
pr_crit("amiga init_sound: failed to allocate chipmem\n");
|
|
return;
|
|
}
|
|
memcpy (snd_data, sine_data, sizeof(sine_data));
|
|
|
|
/* setup divisor */
|
|
clock_constant = (amiga_colorclock+DATA_SIZE/2)/DATA_SIZE;
|
|
|
|
/* without amifb, turn video off and enable high quality sound */
|
|
#ifndef CONFIG_FB_AMIGA
|
|
amifb_video_off();
|
|
#endif
|
|
}
|
|
|
|
static void nosound( unsigned long ignored );
|
|
static DEFINE_TIMER(sound_timer, nosound);
|
|
|
|
void amiga_mksound( unsigned int hz, unsigned int ticks )
|
|
{
|
|
unsigned long flags;
|
|
|
|
if (!snd_data)
|
|
return;
|
|
|
|
local_irq_save(flags);
|
|
del_timer( &sound_timer );
|
|
|
|
if (hz > 20 && hz < 32767) {
|
|
unsigned long period = (clock_constant / hz);
|
|
|
|
if (period < amiga_audio_min_period)
|
|
period = amiga_audio_min_period;
|
|
if (period > MAX_PERIOD)
|
|
period = MAX_PERIOD;
|
|
|
|
/* setup pointer to data, period, length and volume */
|
|
custom.aud[2].audlc = snd_data;
|
|
custom.aud[2].audlen = sizeof(sine_data)/2;
|
|
custom.aud[2].audper = (unsigned short)period;
|
|
custom.aud[2].audvol = 32; /* 50% of maxvol */
|
|
|
|
if (ticks) {
|
|
sound_timer.expires = jiffies + ticks;
|
|
add_timer( &sound_timer );
|
|
}
|
|
|
|
/* turn on DMA for audio channel 2 */
|
|
custom.dmacon = DMAF_SETCLR | DMAF_AUD2;
|
|
|
|
} else
|
|
nosound( 0 );
|
|
|
|
local_irq_restore(flags);
|
|
}
|
|
|
|
|
|
static void nosound( unsigned long ignored )
|
|
{
|
|
/* turn off DMA for audio channel 2 */
|
|
custom.dmacon = DMAF_AUD2;
|
|
/* restore period to previous value after beeping */
|
|
custom.aud[2].audper = amiga_audio_period;
|
|
}
|