@@ -2722,19 +2722,18 @@ static int ravb_setup_irq(struct ravb_private *priv, const char *irq_name,
2722
2722
struct platform_device * pdev = priv -> pdev ;
2723
2723
struct net_device * ndev = priv -> ndev ;
2724
2724
struct device * dev = & pdev -> dev ;
2725
- const char * dev_name ;
2725
+ const char * devname = dev_name ( dev ) ;
2726
2726
unsigned long flags ;
2727
2727
int error , irq_num ;
2728
2728
2729
2729
if (irq_name ) {
2730
- dev_name = devm_kasprintf (dev , GFP_KERNEL , "%s:%s" , ndev -> name , ch );
2731
- if (!dev_name )
2730
+ devname = devm_kasprintf (dev , GFP_KERNEL , "%s:%s" , devname , ch );
2731
+ if (!devname )
2732
2732
return - ENOMEM ;
2733
2733
2734
2734
irq_num = platform_get_irq_byname (pdev , irq_name );
2735
2735
flags = 0 ;
2736
2736
} else {
2737
- dev_name = ndev -> name ;
2738
2737
irq_num = platform_get_irq (pdev , 0 );
2739
2738
flags = IRQF_SHARED ;
2740
2739
}
@@ -2744,9 +2743,9 @@ static int ravb_setup_irq(struct ravb_private *priv, const char *irq_name,
2744
2743
if (irq )
2745
2744
* irq = irq_num ;
2746
2745
2747
- error = devm_request_irq (dev , irq_num , handler , flags , dev_name , ndev );
2746
+ error = devm_request_irq (dev , irq_num , handler , flags , devname , ndev );
2748
2747
if (error )
2749
- netdev_err (ndev , "cannot request IRQ %s\n" , dev_name );
2748
+ netdev_err (ndev , "cannot request IRQ %s\n" , devname );
2750
2749
2751
2750
return error ;
2752
2751
}
0 commit comments