[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>
This commit is contained in:
parent
a93ea9b357
commit
03fbdb15c1
|
@ -107,7 +107,7 @@ static void amba_kmi_close(struct serio *io)
|
||||||
clk_disable(kmi->clk);
|
clk_disable(kmi->clk);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int amba_kmi_probe(struct amba_device *dev, void *id)
|
static int amba_kmi_probe(struct amba_device *dev, struct amba_id *id)
|
||||||
{
|
{
|
||||||
struct amba_kmi_port *kmi;
|
struct amba_kmi_port *kmi;
|
||||||
struct serio *io;
|
struct serio *io;
|
||||||
|
|
|
@ -490,7 +490,7 @@ static void mmci_check_status(unsigned long data)
|
||||||
mod_timer(&host->timer, jiffies + HZ);
|
mod_timer(&host->timer, jiffies + HZ);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __devinit mmci_probe(struct amba_device *dev, void *id)
|
static int __devinit mmci_probe(struct amba_device *dev, struct amba_id *id)
|
||||||
{
|
{
|
||||||
struct mmc_platform_data *plat = dev->dev.platform_data;
|
struct mmc_platform_data *plat = dev->dev.platform_data;
|
||||||
struct mmci_host *host;
|
struct mmci_host *host;
|
||||||
|
|
|
@ -102,7 +102,7 @@ static const struct rtc_class_ops pl030_ops = {
|
||||||
.set_alarm = pl030_set_alarm,
|
.set_alarm = pl030_set_alarm,
|
||||||
};
|
};
|
||||||
|
|
||||||
static int pl030_probe(struct amba_device *dev, void *id)
|
static int pl030_probe(struct amba_device *dev, struct amba_id *id)
|
||||||
{
|
{
|
||||||
struct pl030_rtc *rtc;
|
struct pl030_rtc *rtc;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
|
@ -127,7 +127,7 @@ static int pl031_remove(struct amba_device *adev)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int pl031_probe(struct amba_device *adev, void *id)
|
static int pl031_probe(struct amba_device *adev, struct amba_id *id)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
struct pl031_local *ldata;
|
struct pl031_local *ldata;
|
||||||
|
|
|
@ -665,7 +665,7 @@ static struct uart_driver amba_reg = {
|
||||||
.cons = AMBA_CONSOLE,
|
.cons = AMBA_CONSOLE,
|
||||||
};
|
};
|
||||||
|
|
||||||
static int pl010_probe(struct amba_device *dev, void *id)
|
static int pl010_probe(struct amba_device *dev, struct amba_id *id)
|
||||||
{
|
{
|
||||||
struct uart_amba_port *uap;
|
struct uart_amba_port *uap;
|
||||||
void __iomem *base;
|
void __iomem *base;
|
||||||
|
|
|
@ -729,7 +729,7 @@ static struct uart_driver amba_reg = {
|
||||||
.cons = AMBA_CONSOLE,
|
.cons = AMBA_CONSOLE,
|
||||||
};
|
};
|
||||||
|
|
||||||
static int pl011_probe(struct amba_device *dev, void *id)
|
static int pl011_probe(struct amba_device *dev, struct amba_id *id)
|
||||||
{
|
{
|
||||||
struct uart_amba_port *uap;
|
struct uart_amba_port *uap;
|
||||||
void __iomem *base;
|
void __iomem *base;
|
||||||
|
|
|
@ -437,7 +437,7 @@ static int clcdfb_register(struct clcd_fb *fb)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int clcdfb_probe(struct amba_device *dev, void *id)
|
static int clcdfb_probe(struct amba_device *dev, struct amba_id *id)
|
||||||
{
|
{
|
||||||
struct clcd_board *board = dev->dev.platform_data;
|
struct clcd_board *board = dev->dev.platform_data;
|
||||||
struct clcd_fb *fb;
|
struct clcd_fb *fb;
|
||||||
|
|
|
@ -28,7 +28,7 @@ struct amba_id {
|
||||||
|
|
||||||
struct amba_driver {
|
struct amba_driver {
|
||||||
struct device_driver drv;
|
struct device_driver drv;
|
||||||
int (*probe)(struct amba_device *, void *);
|
int (*probe)(struct amba_device *, struct amba_id *);
|
||||||
int (*remove)(struct amba_device *);
|
int (*remove)(struct amba_device *);
|
||||||
void (*shutdown)(struct amba_device *);
|
void (*shutdown)(struct amba_device *);
|
||||||
int (*suspend)(struct amba_device *, pm_message_t);
|
int (*suspend)(struct amba_device *, pm_message_t);
|
||||||
|
|
|
@ -1074,7 +1074,7 @@ static unsigned int __devinit aaci_size_fifo(struct aaci *aaci)
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __devinit aaci_probe(struct amba_device *dev, void *id)
|
static int __devinit aaci_probe(struct amba_device *dev, struct amba_id *id)
|
||||||
{
|
{
|
||||||
struct aaci *aaci;
|
struct aaci *aaci;
|
||||||
int ret, i;
|
int ret, i;
|
||||||
|
|
Loading…
Reference in a new issue