tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[ARM] 5519/1: amba probe: pass "struct amba_id *" instead of void *

The second argument of the probe method points to the amba_id
structure, so it's better passed with the correct type. None of the
current in-tree drivers uses the pointer, so they have only been
checked for a clean compile.

Change suggested by Russell King.

Signed-off-by: Alessandro Rubini <rubini@unipv.it>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

authored by Alessandro Rubini and committed by Russell King 03fbdb15 a93ea9b3

+9 -9
unified split
+1 -1
drivers/input/serio/ambakmi.c
··· 107 clk_disable(kmi->clk); 108 } 109 110 - static int amba_kmi_probe(struct amba_device *dev, void *id) 111 { 112 struct amba_kmi_port *kmi; 113 struct serio *io;
··· 107 clk_disable(kmi->clk); 108 } 109 110 + static int amba_kmi_probe(struct amba_device *dev, struct amba_id *id) 111 { 112 struct amba_kmi_port *kmi; 113 struct serio *io;
+1 -1
drivers/mmc/host/mmci.c
··· 490 mod_timer(&host->timer, jiffies + HZ); 491 } 492 493 - static int __devinit mmci_probe(struct amba_device *dev, void *id) 494 { 495 struct mmc_platform_data *plat = dev->dev.platform_data; 496 struct mmci_host *host;
··· 490 mod_timer(&host->timer, jiffies + HZ); 491 } 492 493 + static int __devinit mmci_probe(struct amba_device *dev, struct amba_id *id) 494 { 495 struct mmc_platform_data *plat = dev->dev.platform_data; 496 struct mmci_host *host;
+1 -1
drivers/rtc/rtc-pl030.c
··· 102 .set_alarm = pl030_set_alarm, 103 }; 104 105 - static int pl030_probe(struct amba_device *dev, void *id) 106 { 107 struct pl030_rtc *rtc; 108 int ret;
··· 102 .set_alarm = pl030_set_alarm, 103 }; 104 105 + static int pl030_probe(struct amba_device *dev, struct amba_id *id) 106 { 107 struct pl030_rtc *rtc; 108 int ret;
+1 -1
drivers/rtc/rtc-pl031.c
··· 127 return 0; 128 } 129 130 - static int pl031_probe(struct amba_device *adev, void *id) 131 { 132 int ret; 133 struct pl031_local *ldata;
··· 127 return 0; 128 } 129 130 + static int pl031_probe(struct amba_device *adev, struct amba_id *id) 131 { 132 int ret; 133 struct pl031_local *ldata;
+1 -1
drivers/serial/amba-pl010.c
··· 665 .cons = AMBA_CONSOLE, 666 }; 667 668 - static int pl010_probe(struct amba_device *dev, void *id) 669 { 670 struct uart_amba_port *uap; 671 void __iomem *base;
··· 665 .cons = AMBA_CONSOLE, 666 }; 667 668 + static int pl010_probe(struct amba_device *dev, struct amba_id *id) 669 { 670 struct uart_amba_port *uap; 671 void __iomem *base;
+1 -1
drivers/serial/amba-pl011.c
··· 729 .cons = AMBA_CONSOLE, 730 }; 731 732 - static int pl011_probe(struct amba_device *dev, void *id) 733 { 734 struct uart_amba_port *uap; 735 void __iomem *base;
··· 729 .cons = AMBA_CONSOLE, 730 }; 731 732 + static int pl011_probe(struct amba_device *dev, struct amba_id *id) 733 { 734 struct uart_amba_port *uap; 735 void __iomem *base;
+1 -1
drivers/video/amba-clcd.c
··· 437 return ret; 438 } 439 440 - static int clcdfb_probe(struct amba_device *dev, void *id) 441 { 442 struct clcd_board *board = dev->dev.platform_data; 443 struct clcd_fb *fb;
··· 437 return ret; 438 } 439 440 + static int clcdfb_probe(struct amba_device *dev, struct amba_id *id) 441 { 442 struct clcd_board *board = dev->dev.platform_data; 443 struct clcd_fb *fb;
+1 -1
include/linux/amba/bus.h
··· 28 29 struct amba_driver { 30 struct device_driver drv; 31 - int (*probe)(struct amba_device *, void *); 32 int (*remove)(struct amba_device *); 33 void (*shutdown)(struct amba_device *); 34 int (*suspend)(struct amba_device *, pm_message_t);
··· 28 29 struct amba_driver { 30 struct device_driver drv; 31 + int (*probe)(struct amba_device *, struct amba_id *); 32 int (*remove)(struct amba_device *); 33 void (*shutdown)(struct amba_device *); 34 int (*suspend)(struct amba_device *, pm_message_t);
+1 -1
sound/arm/aaci.c
··· 1074 return i; 1075 } 1076 1077 - static int __devinit aaci_probe(struct amba_device *dev, void *id) 1078 { 1079 struct aaci *aaci; 1080 int ret, i;
··· 1074 return i; 1075 } 1076 1077 + static int __devinit aaci_probe(struct amba_device *dev, struct amba_id *id) 1078 { 1079 struct aaci *aaci; 1080 int ret, i;