diff options
| -rw-r--r-- | arch/arm/mach-pxa/ssp.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2410/usb-simtec.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-omap/mailbox.c | 2 | ||||
| -rw-r--r-- | sound/oss/waveartist.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-pxa/ssp.c b/arch/arm/mach-pxa/ssp.c index 422afee88169..b2eb38543d1c 100644 --- a/arch/arm/mach-pxa/ssp.c +++ b/arch/arm/mach-pxa/ssp.c | |||
| @@ -67,7 +67,7 @@ static int use_count[PXA_SSP_PORTS] = {0, 0, 0}; | |||
| 67 | 67 | ||
| 68 | static irqreturn_t ssp_interrupt(int irq, void *dev_id) | 68 | static irqreturn_t ssp_interrupt(int irq, void *dev_id) |
| 69 | { | 69 | { |
| 70 | struct ssp_dev *dev = (struct ssp_dev*) dev_id; | 70 | struct ssp_dev *dev = dev_id; |
| 71 | unsigned int status = SSSR_P(dev->port); | 71 | unsigned int status = SSSR_P(dev->port); |
| 72 | 72 | ||
| 73 | SSSR_P(dev->port) = status; /* clear status bits */ | 73 | SSSR_P(dev->port) = status; /* clear status bits */ |
diff --git a/arch/arm/mach-s3c2410/usb-simtec.c b/arch/arm/mach-s3c2410/usb-simtec.c index bcd562ac1d3d..6aec86a5da56 100644 --- a/arch/arm/mach-s3c2410/usb-simtec.c +++ b/arch/arm/mach-s3c2410/usb-simtec.c | |||
| @@ -60,7 +60,7 @@ usb_simtec_powercontrol(int port, int to) | |||
| 60 | static irqreturn_t | 60 | static irqreturn_t |
| 61 | usb_simtec_ocirq(int irq, void *pw) | 61 | usb_simtec_ocirq(int irq, void *pw) |
| 62 | { | 62 | { |
| 63 | struct s3c2410_hcd_info *info = (struct s3c2410_hcd_info *)pw; | 63 | struct s3c2410_hcd_info *info = pw; |
| 64 | 64 | ||
| 65 | if (s3c2410_gpio_getpin(S3C2410_GPG10) == 0) { | 65 | if (s3c2410_gpio_getpin(S3C2410_GPG10) == 0) { |
| 66 | pr_debug("usb_simtec: over-current irq (oc detected)\n"); | 66 | pr_debug("usb_simtec: over-current irq (oc detected)\n"); |
diff --git a/arch/arm/plat-omap/mailbox.c b/arch/arm/plat-omap/mailbox.c index 0360b1f14d11..45a77df668f1 100644 --- a/arch/arm/plat-omap/mailbox.c +++ b/arch/arm/plat-omap/mailbox.c | |||
| @@ -212,7 +212,7 @@ static void __mbox_rx_interrupt(struct omap_mbox *mbox) | |||
| 212 | 212 | ||
| 213 | static irqreturn_t mbox_interrupt(int irq, void *p) | 213 | static irqreturn_t mbox_interrupt(int irq, void *p) |
| 214 | { | 214 | { |
| 215 | struct omap_mbox *mbox = (struct omap_mbox *)p; | 215 | struct omap_mbox *mbox = p; |
| 216 | 216 | ||
| 217 | if (is_mbox_irq(mbox, IRQ_TX)) | 217 | if (is_mbox_irq(mbox, IRQ_TX)) |
| 218 | __mbox_tx_interrupt(mbox); | 218 | __mbox_tx_interrupt(mbox); |
diff --git a/sound/oss/waveartist.c b/sound/oss/waveartist.c index b48c72923a13..88490418f932 100644 --- a/sound/oss/waveartist.c +++ b/sound/oss/waveartist.c | |||
| @@ -835,7 +835,7 @@ static struct audio_driver waveartist_audio_driver = { | |||
| 835 | static irqreturn_t | 835 | static irqreturn_t |
| 836 | waveartist_intr(int irq, void *dev_id) | 836 | waveartist_intr(int irq, void *dev_id) |
| 837 | { | 837 | { |
| 838 | wavnc_info *devc = (wavnc_info *)dev_id; | 838 | wavnc_info *devc = dev_id; |
| 839 | int irqstatus, status; | 839 | int irqstatus, status; |
| 840 | 840 | ||
| 841 | spin_lock(&waveartist_lock); | 841 | spin_lock(&waveartist_lock); |
