Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39e3eb72 authored by Al Viro's avatar Al Viro Committed by Paul Mackerras
Browse files

[POWERPC] ARCH=ppc pt_regs fixes 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 8de242e6

arch/ppc/4xx_io/serial_sicc.c

+4 −4
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ static void siccuart_event(struct SICC_info *info, int event) 
}



static void

siccuart_rx_chars(struct SICC_info *info, struct pt_regs *regs)

siccuart_rx_chars(struct SICC_info *info)

{

    struct tty_struct *tty = info->tty;

    unsigned int status, ch, rsr, flg, ignored = 0;
@@ -553,15 +553,15 @@ static void siccuart_tx_chars(struct SICC_info *info) 
}





static irqreturn_t siccuart_int_rx(int irq, void *dev_id, struct pt_regs *regs)

static irqreturn_t siccuart_int_rx(int irq, void *dev_id)

{

    struct SICC_info *info = dev_id;

    siccuart_rx_chars(info, regs);

    siccuart_rx_chars(info)

    return IRQ_HANDLED;

}





static irqreturn_t siccuart_int_tx(int irq, void *dev_id, struct pt_regs *regs)

static irqreturn_t siccuart_int_tx(int irq, void *dev_id)

{

    struct SICC_info *info = dev_id;

    siccuart_tx_chars(info);

arch/ppc/8260_io/enet.c

+2 −2
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ struct scc_enet_private { 
static int scc_enet_open(struct net_device *dev);

static int scc_enet_start_xmit(struct sk_buff *skb, struct net_device *dev);

static int scc_enet_rx(struct net_device *dev);

static irqreturn_t scc_enet_interrupt(int irq, void *dev_id, struct pt_regs *);

static irqreturn_t scc_enet_interrupt(int irq, void *dev_id);

static int scc_enet_close(struct net_device *dev);

static struct net_device_stats *scc_enet_get_stats(struct net_device *dev);

static void set_multicast_list(struct net_device *dev);
@@ -273,7 +273,7 @@ scc_enet_timeout(struct net_device *dev) 
 * This is called from the CPM handler, not the MPC core interrupt.

 */

static irqreturn_t

scc_enet_interrupt(int irq, void * dev_id, struct pt_regs * regs)

scc_enet_interrupt(int irq, void * dev_id)

{

	struct	net_device *dev = dev_id;

	volatile struct	scc_enet_private *cep;

arch/ppc/8260_io/fcc_enet.c

+3 −3
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ typedef struct { 
static int fcc_enet_open(struct net_device *dev);

static int fcc_enet_start_xmit(struct sk_buff *skb, struct net_device *dev);

static int fcc_enet_rx(struct net_device *dev);

static irqreturn_t fcc_enet_interrupt(int irq, void *dev_id, struct pt_regs *);

static irqreturn_t fcc_enet_interrupt(int irq, void *dev_id);

static int fcc_enet_close(struct net_device *dev);

static struct net_device_stats *fcc_enet_get_stats(struct net_device *dev);

/* static void set_multicast_list(struct net_device *dev); */
@@ -524,7 +524,7 @@ fcc_enet_timeout(struct net_device *dev) 


/* The interrupt handler. */

static irqreturn_t

fcc_enet_interrupt(int irq, void * dev_id, struct pt_regs * regs)

fcc_enet_interrupt(int irq, void * dev_id)

{

	struct	net_device *dev = dev_id;

	volatile struct	fcc_enet_private *cep;
@@ -1563,7 +1563,7 @@ mii_discover_phy(uint mii_reg, struct net_device *dev) 
#ifdef PHY_INTERRUPT

/* This interrupt occurs when the PHY detects a link change. */

static irqreturn_t

mii_link_interrupt(int irq, void * dev_id, struct pt_regs * regs)

mii_link_interrupt(int irq, void * dev_id)

{

	struct	net_device *dev = dev_id;

	struct fcc_enet_private *fep = dev->priv;

arch/ppc/8xx_io/commproc.c

+9 −10
Original line number Diff line number Diff line
@@ -47,12 +47,12 @@ cpm8xx_t *cpmp; /* Pointer to comm processor space */ 
/* CPM interrupt vector functions.

*/

struct	cpm_action {

	void	(*handler)(void *, struct pt_regs * regs);

	void	(*handler)(void *);

	void	*dev_id;

};

static	struct	cpm_action cpm_vecs[CPMVEC_NR];

static	irqreturn_t cpm_interrupt(int irq, void * dev, struct pt_regs * regs);

static	irqreturn_t cpm_error_interrupt(int irq, void *dev, struct pt_regs * regs);

static	irqreturn_t cpm_interrupt(int irq, void * dev);

static	irqreturn_t cpm_error_interrupt(int irq, void *dev);

static	void	alloc_host_memory(void);

/* Define a table of names to identify CPM interrupt handlers in

 * /proc/interrupts.
@@ -205,7 +205,7 @@ cpm_interrupt_init(void) 
 * Get the CPM interrupt vector.

 */

int

cpm_get_irq(struct pt_regs *regs)

cpm_get_irq(void)

{

	int cpm_vec;
@@ -222,7 +222,7 @@ cpm_get_irq(struct pt_regs *regs) 
/* CPM interrupt controller cascade interrupt.

*/

static	irqreturn_t

cpm_interrupt(int irq, void * dev, struct pt_regs * regs)

cpm_interrupt(int irq, void * dev)

{

	/* This interrupt handler never actually gets called.  It is

	 * installed only to unmask the CPM cascade interrupt in the SIU
@@ -237,7 +237,7 @@ cpm_interrupt(int irq, void * dev, struct pt_regs * regs) 
 * tests in the interrupt handler.

 */

static	irqreturn_t

cpm_error_interrupt(int irq, void *dev, struct pt_regs *regs)

cpm_error_interrupt(int irq, void *dev)

{

	return IRQ_HANDLED;

}
@@ -246,11 +246,11 @@ cpm_error_interrupt(int irq, void *dev, struct pt_regs *regs) 
 * request_irq() to the handler prototype required by cpm_install_handler().

 */

static irqreturn_t

cpm_handler_helper(int irq, void *dev_id, struct pt_regs *regs)

cpm_handler_helper(int irq, void *dev_id)

{

	int cpm_vec = irq - CPM_IRQ_OFFSET;



	(*cpm_vecs[cpm_vec].handler)(dev_id, regs);

	(*cpm_vecs[cpm_vec].handler)(dev_id);



	return IRQ_HANDLED;

}
@@ -267,8 +267,7 @@ cpm_handler_helper(int irq, void *dev_id, struct pt_regs *regs) 
 * request_irq() or cpm_install_handler().

 */

void

cpm_install_handler(int cpm_vec, void (*handler)(void *, struct pt_regs *regs),

		    void *dev_id)

cpm_install_handler(int cpm_vec, void (*handler)(void *), void *dev_id)

{

	int err;

arch/ppc/8xx_io/cs4218_tdm.c

+2 −2
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ static int CS_SetFormat(int format); 
static int CS_SetVolume(int volume);

static void cs4218_tdm_tx_intr(void *devid);

static void cs4218_tdm_rx_intr(void *devid);

static void cs4218_intr(void *devid, struct pt_regs *regs);

static void cs4218_intr(void *devid);

static int cs_get_volume(uint reg);

static int cs_volume_setter(int volume, int mute);

static int cs_get_gain(uint reg);
@@ -2646,7 +2646,7 @@ int __init tdm8xx_sound_init(void) 
 * full duplex operation.

 */

static void

cs4218_intr(void *dev_id, struct pt_regs *regs)

cs4218_intr(void *dev_id)

{

	volatile smc_t	*sp;

	volatile cpm8xx_t	*cp;