Skip to content

Commit

Permalink
sh: oprofile: Kill off bitrotted SH7750 driver.
Browse files Browse the repository at this point in the history
This kills off the old SH7750 oprofile driver, preferring perf instead.
As this driver has a number of bugs that no one seems to have noticed,
it's safe to kill this off now rather than providing an extended
transition period.

The old oprofile framework is still kept in place for now, primarily to
give out-of-tree drivers a chance to transition off. But this too will be
killed off in short order.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Paul Mundt committed Nov 5, 2009
1 parent 1d82332 commit 093aed1
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 289 deletions.
4 changes: 0 additions & 4 deletions arch/sh/oprofile/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,3 @@ DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \
timer_int.o )

oprofile-y := $(DRIVER_OBJS) common.o backtrace.o

oprofile-$(CONFIG_CPU_SUBTYPE_SH7750S) += op_model_sh7750.o
oprofile-$(CONFIG_CPU_SUBTYPE_SH7750) += op_model_sh7750.o
oprofile-$(CONFIG_CPU_SUBTYPE_SH7091) += op_model_sh7750.o
38 changes: 8 additions & 30 deletions arch/sh/oprofile/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@
#include <asm/processor.h>
#include "op_impl.h"

extern struct op_sh_model op_model_sh7750_ops __weak;
extern struct op_sh_model op_model_sh4a_ops __weak;

static struct op_sh_model *model;

static struct op_counter_config ctr[20];
Expand Down Expand Up @@ -94,33 +91,14 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
*/
ops->backtrace = sh_backtrace;

switch (current_cpu_data.type) {
/* SH-4 types */
case CPU_SH7750:
case CPU_SH7750S:
lmodel = &op_model_sh7750_ops;
break;

/* SH-4A types */
case CPU_SH7763:
case CPU_SH7770:
case CPU_SH7780:
case CPU_SH7781:
case CPU_SH7785:
case CPU_SH7786:
case CPU_SH7723:
case CPU_SH7724:
case CPU_SHX3:
lmodel = &op_model_sh4a_ops;
break;

/* SH4AL-DSP types */
case CPU_SH7343:
case CPU_SH7722:
case CPU_SH7366:
lmodel = &op_model_sh4a_ops;
break;
}
/*
* XXX
*
* All of the SH7750/SH-4A counters have been converted to perf,
* this infrastructure hook is left for other users until they've
* had a chance to convert over, at which point all of this
* will be deleted.
*/

if (!lmodel)
return -ENODEV;
Expand Down
255 changes: 0 additions & 255 deletions arch/sh/oprofile/op_model_sh7750.c

This file was deleted.

0 comments on commit 093aed1

Please sign in to comment.