diff options
| author | Quinn Jensen <quinn.jensen@freescale.com> | 2007-05-24 18:13:50 -0600 |
|---|---|---|
| committer | Quinn Jensen <quinn.jensen@freescale.com> | 2007-05-24 18:13:50 -0600 |
| commit | 4e6ff4e1020f03c470e8f61e4ffa70af1f6465b0 (patch) | |
| tree | dc06737e7278e3699a8444631ed934c80d5736fe | |
| parent | 057e4ecfe2eb6cf841e5c019cc2e498bb549bf14 (diff) | |
Sanitization of kernel source following import of GSO L2618-2 patches.
http://www.bitshrine.org/gpp/linux-2.6.19.2-mx-L2618-2_scrub.patch
| -rw-r--r-- | drivers/mxc/hmp4e/mxc_hmp4e.c | 4 | ||||
| -rw-r--r-- | drivers/usb/gadget/arcotg_udc.c | 2 | ||||
| -rw-r--r-- | drivers/w1/masters/mxc_w1.c | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/drivers/mxc/hmp4e/mxc_hmp4e.c b/drivers/mxc/hmp4e/mxc_hmp4e.c index bb2d43689d26..c33f9a8463c2 100644 --- a/drivers/mxc/hmp4e/mxc_hmp4e.c +++ b/drivers/mxc/hmp4e/mxc_hmp4e.c @@ -99,7 +99,7 @@ u32 io_regs[64]; static s32 hmp4e_map_buffer(struct file *filp, struct vm_area_struct *vma); static s32 hmp4e_map_hwregs(struct file *filp, struct vm_area_struct *vma); static void hmp4e_reset(hmp4e_t * dev); -irqreturn_t hmp4e_isr(s32 irq, void *dev_id, struct pt_regs *regs); +irqreturn_t hmp4e_isr(s32 irq, void *dev_id); /*! * This funtion is called to write h/w register. @@ -483,7 +483,7 @@ static s32 hmp4e_map_hwregs(struct file *filp, struct vm_area_struct *vma) * @return The return value is IRQ_HANDLED. * */ -irqreturn_t hmp4e_isr(s32 irq, void *dev_id, struct pt_regs * regs) +irqreturn_t hmp4e_isr(s32 irq, void *dev_id) { hmp4e_t *dev = (hmp4e_t *) dev_id; u32 offset = dev->intr_offset; diff --git a/drivers/usb/gadget/arcotg_udc.c b/drivers/usb/gadget/arcotg_udc.c index 06cd4549ea49..fa2867c76c89 100644 --- a/drivers/usb/gadget/arcotg_udc.c +++ b/drivers/usb/gadget/arcotg_udc.c @@ -1261,7 +1261,7 @@ static int arcotg_fifo_status(struct usb_ep *_ep) size = (d_qh->size_ioc_int_sts & DTD_PACKET_SIZE) >> DTD_LENGTH_BIT_POS; - pr_debug(ep->dev, "%s %u\n", __FUNCTION__, size); + pr_debug("%s %u\n", __FUNCTION__, size); return size; } diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c index 9ac5c646cfc0..462af54b48f5 100644 --- a/drivers/w1/masters/mxc_w1.c +++ b/drivers/w1/masters/mxc_w1.c @@ -185,8 +185,7 @@ static u8 mxc_w1_read_byte(void *data) reg_val = __raw_readb((dev->base_address + MXC_W1_TXRX)); return reg_val; } -static irqreturn_t w1_interrupt_handler(int irq, void *data, - struct pt_regs *regs) +static irqreturn_t w1_interrupt_handler(int irq, void *data) { u8 reg_val; irqreturn_t ret = IRQ_NONE; |