Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03fbdb15 authored by Alessandro Rubini's avatar Alessandro Rubini Committed by Russell King
Browse files

[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: default avatarAlessandro Rubini <rubini@unipv.it>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent a93ea9b3
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -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;
+1 −1
Original line number Original line Diff line number Diff line
@@ -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;
+1 −1
Original line number Original line Diff line number Diff line
@@ -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;
+1 −1
Original line number Original line Diff line number Diff line
@@ -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;
+1 −1
Original line number Original line Diff line number Diff line
@@ -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;
Loading