Merge branch 'ptebits' into devel

[linux-2.6-omap-h63xx.git] / drivers / scsi / scsi_netlink.c

diff --git a/drivers/scsi/scsi_netlink.c b/drivers/scsi/scsi_netlink.c
index 3e15918281719b5faddd5186314ab85ba8b52b05..ae7ed9a226623db41e1354a12c6f97d5d83bc324 100644 (file)
--- a/drivers/scsi/scsi_netlink.c
+++ b/drivers/scsi/scsi_netlink.c
@@ -55,7 +55,7 @@ scsi_nl_rcv_msg(struct sk_buff *skb)
                if ((nlh->nlmsg_len < (sizeof(*nlh) + sizeof(*hdr))) ||
                    (skb->len < nlh->nlmsg_len)) {
                        printk(KERN_WARNING "%s: discarding partial skb\n",
-                                __FUNCTION__);
+                                __func__);
                        return;
                }
 
@@ -82,7 +82,7 @@ scsi_nl_rcv_msg(struct sk_buff *skb)
 
                if (nlh->nlmsg_len < (sizeof(*nlh) + hdr->msglen)) {
                        printk(KERN_WARNING "%s: discarding partial message\n",
-                                __FUNCTION__);
+                                __func__);
                        return;
                }
 
@@ -139,7 +139,7 @@ scsi_netlink_init(void)
        error = netlink_register_notifier(&scsi_netlink_notifier);
        if (error) {
                printk(KERN_ERR "%s: register of event handler failed - %d\n",
-                               __FUNCTION__, error);
+                               __func__, error);
                return;
        }
 
@@ -148,7 +148,7 @@ scsi_netlink_init(void)
                                THIS_MODULE);
        if (!scsi_nl_sock) {
                printk(KERN_ERR "%s: register of recieve handler failed\n",
-                               __FUNCTION__);
+                               __func__);
                netlink_unregister_notifier(&scsi_netlink_notifier);
        }
 
@@ -164,7 +164,7 @@ void
 scsi_netlink_exit(void)
 {
        if (scsi_nl_sock) {
-               sock_release(scsi_nl_sock->sk_socket);
+               netlink_kernel_release(scsi_nl_sock);
                netlink_unregister_notifier(&scsi_netlink_notifier);
        }