@@ -3029,9 +3029,8 @@ static int emac_probe(struct platform_device *ofdev)
3029
3029
if (err )
3030
3030
goto err_gone ;
3031
3031
3032
- /* Get interrupts. EMAC irq is mandatory, WOL irq is optional */
3032
+ /* Get interrupts. EMAC irq is mandatory */
3033
3033
dev -> emac_irq = irq_of_parse_and_map (np , 0 );
3034
- dev -> wol_irq = irq_of_parse_and_map (np , 1 );
3035
3034
if (!dev -> emac_irq ) {
3036
3035
printk (KERN_ERR "%pOF: Can't map main interrupt\n" , np );
3037
3036
err = - ENODEV ;
@@ -3055,13 +3054,13 @@ static int emac_probe(struct platform_device *ofdev)
3055
3054
if (!dev -> emacp ) {
3056
3055
dev_err (& ofdev -> dev , "can't map device registers" );
3057
3056
err = - ENOMEM ;
3058
- goto err_irq_unmap ;
3057
+ goto err_gone ;
3059
3058
}
3060
3059
3061
3060
/* Wait for dependent devices */
3062
3061
err = emac_wait_deps (dev );
3063
3062
if (err )
3064
- goto err_irq_unmap ;
3063
+ goto err_gone ;
3065
3064
dev -> mal = platform_get_drvdata (dev -> mal_dev );
3066
3065
if (dev -> mdio_dev != NULL )
3067
3066
dev -> mdio_instance = platform_get_drvdata (dev -> mdio_dev );
@@ -3189,9 +3188,6 @@ static int emac_probe(struct platform_device *ofdev)
3189
3188
mal_unregister_commac (dev -> mal , & dev -> commac );
3190
3189
err_rel_deps :
3191
3190
emac_put_deps (dev );
3192
- err_irq_unmap :
3193
- if (dev -> wol_irq )
3194
- irq_dispose_mapping (dev -> wol_irq );
3195
3191
err_gone :
3196
3192
if (blist )
3197
3193
* blist = NULL ;
@@ -3218,9 +3214,6 @@ static void emac_remove(struct platform_device *ofdev)
3218
3214
3219
3215
mal_unregister_commac (dev -> mal , & dev -> commac );
3220
3216
emac_put_deps (dev );
3221
-
3222
- if (dev -> wol_irq )
3223
- irq_dispose_mapping (dev -> wol_irq );
3224
3217
}
3225
3218
3226
3219
/* XXX Features in here should be replaced by properties... */
0 commit comments