a4b770972b
This patch removes from drivers/net/ all the unnecessary
return; statements that precede the last closing brace of
void functions.
It does not remove the returns that are immediately
preceded by a label as gcc doesn't like that.
It also does not remove null void functions with return.
Done via:
$ grep -rP --include=*.[ch] -l "return;\n}" net/ | \
xargs perl -i -e 'local $/ ; while (<>) { s/\n[ \t\n]+return;\n}/\n}/g; print; }'
with some cleanups by hand.
Compile tested x86 allmodconfig only.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
134 lines
3.4 KiB
C
134 lines
3.4 KiB
C
/*******************************************************************************
|
|
STMMAC external timer support.
|
|
|
|
Copyright (C) 2007-2009 STMicroelectronics Ltd
|
|
|
|
This program is free software; you can redistribute it and/or modify it
|
|
under the terms and conditions of the GNU General Public License,
|
|
version 2, as published by the Free Software Foundation.
|
|
|
|
This program is distributed in the hope it will be useful, but WITHOUT
|
|
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
more details.
|
|
|
|
You should have received a copy of the GNU General Public License along with
|
|
this program; if not, write to the Free Software Foundation, Inc.,
|
|
51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
The full GNU General Public License is included in this distribution in
|
|
the file called "COPYING".
|
|
|
|
Author: Giuseppe Cavallaro <peppe.cavallaro@st.com>
|
|
*******************************************************************************/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/etherdevice.h>
|
|
#include "stmmac_timer.h"
|
|
|
|
static void stmmac_timer_handler(void *data)
|
|
{
|
|
struct net_device *dev = (struct net_device *)data;
|
|
|
|
stmmac_schedule(dev);
|
|
}
|
|
|
|
#define STMMAC_TIMER_MSG(timer, freq) \
|
|
printk(KERN_INFO "stmmac_timer: %s Timer ON (freq %dHz)\n", timer, freq);
|
|
|
|
#if defined(CONFIG_STMMAC_RTC_TIMER)
|
|
#include <linux/rtc.h>
|
|
static struct rtc_device *stmmac_rtc;
|
|
static rtc_task_t stmmac_task;
|
|
|
|
static void stmmac_rtc_start(unsigned int new_freq)
|
|
{
|
|
rtc_irq_set_freq(stmmac_rtc, &stmmac_task, new_freq);
|
|
rtc_irq_set_state(stmmac_rtc, &stmmac_task, 1);
|
|
}
|
|
|
|
static void stmmac_rtc_stop(void)
|
|
{
|
|
rtc_irq_set_state(stmmac_rtc, &stmmac_task, 0);
|
|
}
|
|
|
|
int stmmac_open_ext_timer(struct net_device *dev, struct stmmac_timer *tm)
|
|
{
|
|
stmmac_task.private_data = dev;
|
|
stmmac_task.func = stmmac_timer_handler;
|
|
|
|
stmmac_rtc = rtc_class_open(CONFIG_RTC_HCTOSYS_DEVICE);
|
|
if (stmmac_rtc == NULL) {
|
|
pr_err("open rtc device failed\n");
|
|
return -ENODEV;
|
|
}
|
|
|
|
rtc_irq_register(stmmac_rtc, &stmmac_task);
|
|
|
|
/* Periodic mode is not supported */
|
|
if ((rtc_irq_set_freq(stmmac_rtc, &stmmac_task, tm->freq) < 0)) {
|
|
pr_err("set periodic failed\n");
|
|
rtc_irq_unregister(stmmac_rtc, &stmmac_task);
|
|
rtc_class_close(stmmac_rtc);
|
|
return -1;
|
|
}
|
|
|
|
STMMAC_TIMER_MSG(CONFIG_RTC_HCTOSYS_DEVICE, tm->freq);
|
|
|
|
tm->timer_start = stmmac_rtc_start;
|
|
tm->timer_stop = stmmac_rtc_stop;
|
|
|
|
return 0;
|
|
}
|
|
|
|
int stmmac_close_ext_timer(void)
|
|
{
|
|
rtc_irq_set_state(stmmac_rtc, &stmmac_task, 0);
|
|
rtc_irq_unregister(stmmac_rtc, &stmmac_task);
|
|
rtc_class_close(stmmac_rtc);
|
|
return 0;
|
|
}
|
|
|
|
#elif defined(CONFIG_STMMAC_TMU_TIMER)
|
|
#include <linux/clk.h>
|
|
#define TMU_CHANNEL "tmu2_clk"
|
|
static struct clk *timer_clock;
|
|
|
|
static void stmmac_tmu_start(unsigned int new_freq)
|
|
{
|
|
clk_set_rate(timer_clock, new_freq);
|
|
clk_enable(timer_clock);
|
|
}
|
|
|
|
static void stmmac_tmu_stop(void)
|
|
{
|
|
clk_disable(timer_clock);
|
|
}
|
|
|
|
int stmmac_open_ext_timer(struct net_device *dev, struct stmmac_timer *tm)
|
|
{
|
|
timer_clock = clk_get(NULL, TMU_CHANNEL);
|
|
|
|
if (timer_clock == NULL)
|
|
return -1;
|
|
|
|
if (tmu2_register_user(stmmac_timer_handler, (void *)dev) < 0) {
|
|
timer_clock = NULL;
|
|
return -1;
|
|
}
|
|
|
|
STMMAC_TIMER_MSG("TMU2", tm->freq);
|
|
tm->timer_start = stmmac_tmu_start;
|
|
tm->timer_stop = stmmac_tmu_stop;
|
|
|
|
return 0;
|
|
}
|
|
|
|
int stmmac_close_ext_timer(void)
|
|
{
|
|
clk_disable(timer_clock);
|
|
tmu2_unregister_user();
|
|
clk_put(timer_clock);
|
|
return 0;
|
|
}
|
|
#endif
|