Hello. On 23-02-2012 20:01, John Crispin wrote:
ltq_gpio_request() now uses devres to manage the gpios. We need to pass a struct device pointer to make it work.
Signed-off-by: John Crispin<blogic@xxxxxxxxxxx> Cc: netdev@xxxxxxxxxxxxxxx --- drivers/net/ethernet/lantiq_etop.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c index 66ec54a..e5ec8b1 100644 --- a/drivers/net/ethernet/lantiq_etop.c +++ b/drivers/net/ethernet/lantiq_etop.c @@ -292,9 +292,6 @@ ltq_etop_gbit_init(void) { ltq_pmu_enable(PMU_SWITCH); - ltq_gpio_request(42, 2, 1, "MDIO"); - ltq_gpio_request(43, 2, 1, "MDC"); - ltq_gbit_w32_mask(0, GCTL0_SE, LTQ_GBIT_GCTL0); /** Disable MDIO auto polling mode */ ltq_gbit_w32_mask(0, PX_CTL_DMDIO, LTQ_GBIT_P0_CTL); @@ -873,6 +870,12 @@ ltq_etop_probe(struct platform_device *pdev) err = -ENOMEM; goto err_out; } + if (ltq_gpio_request(&pdev->dev, 42, 2, 1, "MDIO") || + ltq_gpio_request(&pdev->dev, 43, 2, 1, "MDC")) {
This needs to be merged with patch 1 to keep the git tree bisectable WBR, Sergei