ARM: amba: make probe() functions take const id tables

Russell King · Russell King · commit aa25afad2ca6 · 2011-02-23T16:24:14.000Z
Make Primecell driver probe functions take a const pointer to their
ID tables.  Drivers should never modify their ID tables in their
probe handler.

Signed-off-by: Russell King &lt;rmk+kernel@arm.linux.org.uk&gt;
diff --git a/arch/arm/kernel/etm.c b/arch/arm/kernel/etm.c
@@ -338,7 +338,7 @@ static struct miscdevice etb_miscdev = {
 	.fops = &etb_fops,
 };
 
-static int __init etb_probe(struct amba_device *dev, struct amba_id *id)
+static int __init etb_probe(struct amba_device *dev, const struct amba_id *id)
 {
 	struct tracectx *t = &tracer;
 	int ret = 0;
@@ -530,7 +530,7 @@ static ssize_t trace_mode_store(struct kobject *kobj,
 static struct kobj_attribute trace_mode_attr =
 	__ATTR(trace_mode, 0644, trace_mode_show, trace_mode_store);
 
-static int __init etm_probe(struct amba_device *dev, struct amba_id *id)
+static int __init etm_probe(struct amba_device *dev, const struct amba_id *id)
 {
 	struct tracectx *t = &tracer;
 	int ret = 0;
diff --git a/drivers/char/hw_random/nomadik-rng.c b/drivers/char/hw_random/nomadik-rng.c
@@ -39,7 +39,7 @@ static struct hwrng nmk_rng = {
 	.read		= nmk_rng_read,
 };
 
-static int nmk_rng_probe(struct amba_device *dev, struct amba_id *id)
+static int nmk_rng_probe(struct amba_device *dev, const struct amba_id *id)
 {
 	void __iomem *base;
 	int ret;
diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c
@@ -1845,7 +1845,7 @@ static inline void init_pl08x_debugfs(struct pl08x_driver_data *pl08x)
 }
 #endif
 
-static int pl08x_probe(struct amba_device *adev, struct amba_id *id)
+static int pl08x_probe(struct amba_device *adev, const struct amba_id *id)
 {
 	struct pl08x_driver_data *pl08x;
 	const struct vendor_data *vd = id->data;
diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
@@ -657,7 +657,7 @@ static irqreturn_t pl330_irq_handler(int irq, void *data)
 }
 
 static int __devinit
-pl330_probe(struct amba_device *adev, struct amba_id *id)
+pl330_probe(struct amba_device *adev, const struct amba_id *id)
 {
 	struct dma_pl330_platdata *pdat;
 	struct dma_pl330_dmac *pdmac;
diff --git a/drivers/gpio/pl061.c b/drivers/gpio/pl061.c
@@ -232,7 +232,7 @@ static void pl061_irq_handler(unsigned irq, struct irq_desc *desc)
 	desc->irq_data.chip->irq_unmask(&desc->irq_data);
 }
 
-static int pl061_probe(struct amba_device *dev, struct amba_id *id)
+static int pl061_probe(struct amba_device *dev, const struct amba_id *id)
 {
 	struct pl061_platform_data *pdata;
 	struct pl061_gpio *chip;
diff --git a/drivers/input/serio/ambakmi.c b/drivers/input/serio/ambakmi.c
@@ -107,7 +107,8 @@ static void amba_kmi_close(struct serio *io)
 	clk_disable(kmi->clk);
 }
 
-static int __devinit amba_kmi_probe(struct amba_device *dev, struct amba_id *id)
+static int __devinit amba_kmi_probe(struct amba_device *dev,
+	const struct amba_id *id)
 {
 	struct amba_kmi_port *kmi;
 	struct serio *io;
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
@@ -713,7 +713,8 @@ static const struct mmc_host_ops mmci_ops = {
 	.get_cd		= mmci_get_cd,
 };
 
-static int __devinit mmci_probe(struct amba_device *dev, struct amba_id *id)
+static int __devinit mmci_probe(struct amba_device *dev,
+	const struct amba_id *id)
 {
 	struct mmci_platform_data *plat = dev->dev.platform_data;
 	struct variant_data *variant = id->data;
diff --git a/drivers/rtc/rtc-pl030.c b/drivers/rtc/rtc-pl030.c
@@ -103,7 +103,7 @@ static const struct rtc_class_ops pl030_ops = {
 	.set_alarm	= pl030_set_alarm,
 };
 
-static int pl030_probe(struct amba_device *dev, struct amba_id *id)
+static int pl030_probe(struct amba_device *dev, const struct amba_id *id)
 {
 	struct pl030_rtc *rtc;
 	int ret;
diff --git a/drivers/rtc/rtc-pl031.c b/drivers/rtc/rtc-pl031.c
@@ -358,7 +358,7 @@ static int pl031_remove(struct amba_device *adev)
 	return 0;
 }
 
-static int pl031_probe(struct amba_device *adev, struct amba_id *id)
+static int pl031_probe(struct amba_device *adev, const struct amba_id *id)
 {
 	int ret;
 	struct pl031_local *ldata;
diff --git a/drivers/spi/amba-pl022.c b/drivers/spi/amba-pl022.c
@@ -2021,7 +2021,7 @@ static void pl022_cleanup(struct spi_device *spi)
 
 
 static int __devinit
-pl022_probe(struct amba_device *adev, struct amba_id *id)
+pl022_probe(struct amba_device *adev, const struct amba_id *id)
 {
 	struct device *dev = &adev->dev;
 	struct pl022_ssp_controller *platform_info = adev->dev.platform_data;
diff --git a/drivers/tty/serial/amba-pl010.c b/drivers/tty/serial/amba-pl010.c
@@ -676,7 +676,7 @@ static struct uart_driver amba_reg = {
 	.cons			= AMBA_CONSOLE,
 };
 
-static int pl010_probe(struct amba_device *dev, struct amba_id *id)
+static int pl010_probe(struct amba_device *dev, const struct amba_id *id)
 {
 	struct uart_amba_port *uap;
 	void __iomem *base;
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
@@ -1349,7 +1349,7 @@ static struct uart_driver amba_reg = {
 	.cons			= AMBA_CONSOLE,
 };
 
-static int pl011_probe(struct amba_device *dev, struct amba_id *id)
+static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
 {
 	struct uart_amba_port *uap;
 	struct vendor_data *vendor = id->data;
diff --git a/drivers/video/amba-clcd.c b/drivers/video/amba-clcd.c
@@ -461,7 +461,7 @@ static int clcdfb_register(struct clcd_fb *fb)
 	return ret;
 }
 
-static int clcdfb_probe(struct amba_device *dev, struct amba_id *id)
+static int clcdfb_probe(struct amba_device *dev, const struct amba_id *id)
 {
 	struct clcd_board *board = dev->dev.platform_data;
 	struct clcd_fb *fb;
diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c
@@ -278,7 +278,7 @@ static struct miscdevice sp805_wdt_miscdev = {
 };
 
 static int __devinit
-sp805_wdt_probe(struct amba_device *adev, struct amba_id *id)
+sp805_wdt_probe(struct amba_device *adev, const struct amba_id *id)
 {
 	int ret = 0;
 
diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h
@@ -43,7 +43,7 @@ struct amba_id {
 
 struct amba_driver {
 	struct device_driver	drv;
-	int			(*probe)(struct amba_device *, struct amba_id *);
+	int			(*probe)(struct amba_device *, const struct amba_id *);
 	int			(*remove)(struct amba_device *);
 	void			(*shutdown)(struct amba_device *);
 	int			(*suspend)(struct amba_device *, pm_message_t);
diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c
@@ -1011,7 +1011,8 @@ static unsigned int __devinit aaci_size_fifo(struct aaci *aaci)
 	return i;
 }
 
-static int __devinit aaci_probe(struct amba_device *dev, struct amba_id *id)
+static int __devinit aaci_probe(struct amba_device *dev,
+	const struct amba_id *id)
 {
 	struct aaci *aaci;
 	int ret, i;

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ static struct hwrng nmk_rng = {`
`39`	`39`	`.read = nmk_rng_read,`
`40`	`40`	`};`
`41`	`41`
`42`		`-static int nmk_rng_probe(struct amba_device dev, struct amba_id id)`
	`42`	`+static int nmk_rng_probe(struct amba_device dev, const struct amba_id id)`
`43`	`43`	`{`
`44`	`44`	`void __iomem *base;`
`45`	`45`	`int ret;`
Original file line number	Diff line number	Diff line change
`@@ -1845,7 +1845,7 @@ static inline void init_pl08x_debugfs(struct pl08x_driver_data *pl08x)`
`1845`	`1845`	`}`
`1846`	`1846`	`#endif`
`1847`	`1847`
`1848`		`-static int pl08x_probe(struct amba_device adev, struct amba_id id)`
	`1848`	`+static int pl08x_probe(struct amba_device adev, const struct amba_id id)`
`1849`	`1849`	`{`
`1850`	`1850`	`struct pl08x_driver_data *pl08x;`
`1851`	`1851`	`const struct vendor_data *vd = id->data;`
Original file line number	Diff line number	Diff line change
`@@ -657,7 +657,7 @@ static irqreturn_t pl330_irq_handler(int irq, void *data)`
`657`	`657`	`}`
`658`	`658`
`659`	`659`	`static int __devinit`
`660`		`-pl330_probe(struct amba_device adev, struct amba_id id)`
	`660`	`+pl330_probe(struct amba_device adev, const struct amba_id id)`
`661`	`661`	`{`
`662`	`662`	`struct dma_pl330_platdata *pdat;`
`663`	`663`	`struct dma_pl330_dmac *pdmac;`
Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ static void pl061_irq_handler(unsigned irq, struct irq_desc *desc)`
`232`	`232`	`desc->irq_data.chip->irq_unmask(&desc->irq_data);`
`233`	`233`	`}`
`234`	`234`
`235`		`-static int pl061_probe(struct amba_device dev, struct amba_id id)`
	`235`	`+static int pl061_probe(struct amba_device dev, const struct amba_id id)`
`236`	`236`	`{`
`237`	`237`	`struct pl061_platform_data *pdata;`
`238`	`238`	`struct pl061_gpio *chip;`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,8 @@ static void amba_kmi_close(struct serio *io)`
`107`	`107`	`clk_disable(kmi->clk);`
`108`	`108`	`}`
`109`	`109`
`110`		`-static int __devinit amba_kmi_probe(struct amba_device dev, struct amba_id id)`
	`110`	`+static int __devinit amba_kmi_probe(struct amba_device *dev,`
	`111`	`+ const struct amba_id *id)`
`111`	`112`	`{`
`112`	`113`	`struct amba_kmi_port *kmi;`
`113`	`114`	`struct serio *io;`
Original file line number	Diff line number	Diff line change
`@@ -713,7 +713,8 @@ static const struct mmc_host_ops mmci_ops = {`
`713`	`713`	`.get_cd = mmci_get_cd,`
`714`	`714`	`};`
`715`	`715`
`716`		`-static int __devinit mmci_probe(struct amba_device dev, struct amba_id id)`
	`716`	`+static int __devinit mmci_probe(struct amba_device *dev,`
	`717`	`+ const struct amba_id *id)`
`717`	`718`	`{`
`718`	`719`	`struct mmci_platform_data *plat = dev->dev.platform_data;`
`719`	`720`	`struct variant_data *variant = id->data;`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ static const struct rtc_class_ops pl030_ops = {`
`103`	`103`	`.set_alarm = pl030_set_alarm,`
`104`	`104`	`};`
`105`	`105`
`106`		`-static int pl030_probe(struct amba_device dev, struct amba_id id)`
	`106`	`+static int pl030_probe(struct amba_device dev, const struct amba_id id)`
`107`	`107`	`{`
`108`	`108`	`struct pl030_rtc *rtc;`
`109`	`109`	`int ret;`
Original file line number	Diff line number	Diff line change
`@@ -358,7 +358,7 @@ static int pl031_remove(struct amba_device *adev)`
`358`	`358`	`return 0;`
`359`	`359`	`}`
`360`	`360`
`361`		`-static int pl031_probe(struct amba_device adev, struct amba_id id)`
	`361`	`+static int pl031_probe(struct amba_device adev, const struct amba_id id)`
`362`	`362`	`{`
`363`	`363`	`int ret;`
`364`	`364`	`struct pl031_local *ldata;`
Original file line number	Diff line number	Diff line change
`@@ -2021,7 +2021,7 @@ static void pl022_cleanup(struct spi_device *spi)`
`2021`	`2021`
`2022`	`2022`
`2023`	`2023`	`static int __devinit`
`2024`		`-pl022_probe(struct amba_device adev, struct amba_id id)`
	`2024`	`+pl022_probe(struct amba_device adev, const struct amba_id id)`
`2025`	`2025`	`{`
`2026`	`2026`	`struct device *dev = &adev->dev;`
`2027`	`2027`	`struct pl022_ssp_controller *platform_info = adev->dev.platform_data;`