@@ -3029,9 +3029,8 @@ static int emac_probe(struct platform_device *ofdev)
30293029 if (err )
30303030 goto err_gone ;
30313031
3032- /* Get interrupts. EMAC irq is mandatory, WOL irq is optional */
3032+ /* Get interrupts. EMAC irq is mandatory */
30333033 dev -> emac_irq = irq_of_parse_and_map (np , 0 );
3034- dev -> wol_irq = irq_of_parse_and_map (np , 1 );
30353034 if (!dev -> emac_irq ) {
30363035 printk (KERN_ERR "%pOF: Can't map main interrupt\n" , np );
30373036 err = - ENODEV ;
@@ -3055,13 +3054,13 @@ static int emac_probe(struct platform_device *ofdev)
30553054 if (!dev -> emacp ) {
30563055 dev_err (& ofdev -> dev , "can't map device registers" );
30573056 err = - ENOMEM ;
3058- goto err_irq_unmap ;
3057+ goto err_gone ;
30593058 }
30603059
30613060 /* Wait for dependent devices */
30623061 err = emac_wait_deps (dev );
30633062 if (err )
3064- goto err_irq_unmap ;
3063+ goto err_gone ;
30653064 dev -> mal = platform_get_drvdata (dev -> mal_dev );
30663065 if (dev -> mdio_dev != NULL )
30673066 dev -> mdio_instance = platform_get_drvdata (dev -> mdio_dev );
@@ -3189,9 +3188,6 @@ static int emac_probe(struct platform_device *ofdev)
31893188 mal_unregister_commac (dev -> mal , & dev -> commac );
31903189 err_rel_deps :
31913190 emac_put_deps (dev );
3192- err_irq_unmap :
3193- if (dev -> wol_irq )
3194- irq_dispose_mapping (dev -> wol_irq );
31953191 err_gone :
31963192 if (blist )
31973193 * blist = NULL ;
@@ -3218,9 +3214,6 @@ static void emac_remove(struct platform_device *ofdev)
32183214
32193215 mal_unregister_commac (dev -> mal , & dev -> commac );
32203216 emac_put_deps (dev );
3221-
3222- if (dev -> wol_irq )
3223- irq_dispose_mapping (dev -> wol_irq );
32243217}
32253218
32263219/* XXX Features in here should be replaced by properties... */
0 commit comments