Skip to content

Commit

Permalink
ARM: S3C24XX: remove plat/irq.h in plat-samsung
Browse files Browse the repository at this point in the history
plat-samsung/irq.h did only contain functions for handling the spread out
subirqs on s3c24xx arches, which are not needed anymore.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
[kgene.kim@samsung.com: fixed build error on bast-irq.c]
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
  • Loading branch information
Heiko Stuebner authored and Kukjin Kim committed Mar 5, 2013
1 parent 4d512a9 commit dc1a353
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 124 deletions.
2 changes: 0 additions & 2 deletions arch/arm/mach-s3c24xx/bast-irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@
#include <mach/hardware.h>
#include <mach/regs-irq.h>

#include <plat/irq.h>

#include "bast.h"

#define irqdbf(x...)
Expand Down
7 changes: 6 additions & 1 deletion arch/arm/mach-s3c24xx/irq-pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,15 @@
#include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/syscore_ops.h>
#include <linux/io.h>

#include <plat/cpu.h>
#include <plat/pm.h>
#include <plat/irq.h>
#include <plat/map-base.h>
#include <plat/map-s3c.h>

#include <mach/regs-irq.h>
#include <mach/regs-gpio.h>

#include <asm/irq.h>

Expand Down
8 changes: 3 additions & 5 deletions arch/arm/mach-s3c24xx/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
#include <plat/cpu.h>
#include <plat/regs-irqtype.h>
#include <plat/pm.h>
#include <plat/irq.h>

#define S3C_IRQTYPE_NONE 0
#define S3C_IRQTYPE_EINT 1
Expand Down Expand Up @@ -175,8 +174,7 @@ static int s3c_irqext_type_set(void __iomem *gpcon_reg,
return 0;
}

/* FIXME: make static when it's out of plat-samsung/irq.h */
int s3c_irqext_type(struct irq_data *data, unsigned int type)
static int s3c_irqext_type(struct irq_data *data, unsigned int type)
{
void __iomem *extint_reg;
void __iomem *gpcon_reg;
Expand Down Expand Up @@ -224,15 +222,15 @@ static int s3c_irqext0_type(struct irq_data *data, unsigned int type)
extint_offset, type);
}

struct irq_chip s3c_irq_chip = {
static struct irq_chip s3c_irq_chip = {
.name = "s3c",
.irq_ack = s3c_irq_ack,
.irq_mask = s3c_irq_mask,
.irq_unmask = s3c_irq_unmask,
.irq_set_wake = s3c_irq_wake
};

struct irq_chip s3c_irq_level_chip = {
static struct irq_chip s3c_irq_level_chip = {
.name = "s3c-level",
.irq_mask = s3c_irq_mask,
.irq_unmask = s3c_irq_unmask,
Expand Down
116 changes: 0 additions & 116 deletions arch/arm/plat-samsung/include/plat/irq.h

This file was deleted.

0 comments on commit dc1a353

Please sign in to comment.