[SCSI] fcoe: fix incorrect use of struct module
This structure may not be defined if CONFIG_MODULE=n, so never deref it. Change uses of module->name to module_name(module) and corrects some dyslexic printks and docbook comments. Reported-by: Randy Dunlap <randy.dunlap@oracle.com> Cc: Robert Love <robert.w.love@intel.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
parent
73c3367403
commit
56b854bb31
|
@ -166,7 +166,7 @@ static int fcoe_cpu_callback(struct notifier_block *nfb, unsigned long action,
|
||||||
#endif /* CONFIG_HOTPLUG_CPU */
|
#endif /* CONFIG_HOTPLUG_CPU */
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* foce_rcv - this is the fcoe receive function called by NET_RX_SOFTIRQ
|
* fcoe_rcv - this is the fcoe receive function called by NET_RX_SOFTIRQ
|
||||||
* @skb: the receive skb
|
* @skb: the receive skb
|
||||||
* @dev: associated net device
|
* @dev: associated net device
|
||||||
* @ptype: context
|
* @ptype: context
|
||||||
|
@ -991,8 +991,8 @@ static int fcoe_ethdrv_get(const struct net_device *netdev)
|
||||||
|
|
||||||
owner = fcoe_netdev_to_module_owner(netdev);
|
owner = fcoe_netdev_to_module_owner(netdev);
|
||||||
if (owner) {
|
if (owner) {
|
||||||
printk(KERN_DEBUG "foce:hold driver module %s for %s\n",
|
printk(KERN_DEBUG "fcoe:hold driver module %s for %s\n",
|
||||||
owner->name, netdev->name);
|
module_name(owner), netdev->name);
|
||||||
return try_module_get(owner);
|
return try_module_get(owner);
|
||||||
}
|
}
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
@ -1011,8 +1011,8 @@ static int fcoe_ethdrv_put(const struct net_device *netdev)
|
||||||
|
|
||||||
owner = fcoe_netdev_to_module_owner(netdev);
|
owner = fcoe_netdev_to_module_owner(netdev);
|
||||||
if (owner) {
|
if (owner) {
|
||||||
printk(KERN_DEBUG "foce:release driver module %s for %s\n",
|
printk(KERN_DEBUG "fcoe:release driver module %s for %s\n",
|
||||||
owner->name, netdev->name);
|
module_name(owner), netdev->name);
|
||||||
module_put(owner);
|
module_put(owner);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue