diff options
author | Mike Christie <mchristi@redhat.com> | 2018-06-22 17:40:21 -0400 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2018-06-26 12:27:06 -0400 |
commit | 06add777bd0aa764a2252e80c46ecc55ddc29dd1 (patch) | |
tree | 9790afbb7416a416998b05f26330c4ae1fa10868 /drivers/target/target_core_user.c | |
parent | 9de3a1ef032a5ad5d7b642d625b6bd362b1989d6 (diff) |
scsi: tcmu: misc nl code cleanup
Some misc cleanup of the nl rework patches.
1. Fix space instead of tabs use and extra newline
2. Drop initializing variables to 0 when not needed
3. Just pass the skb_buff and msg_header pointers to
tcmu_netlink_event_send.
Signed-off-by: Mike Christie <mchristi@redhat.com>
Tested-by: Xiubo Li <xiubli@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/target/target_core_user.c')
-rw-r--r-- | drivers/target/target_core_user.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c index 9835ea3c4dcc..2a2e9e4e7593 100644 --- a/drivers/target/target_core_user.c +++ b/drivers/target/target_core_user.c | |||
@@ -1628,11 +1628,9 @@ free_skb: | |||
1628 | 1628 | ||
1629 | static int tcmu_netlink_event_send(struct tcmu_dev *udev, | 1629 | static int tcmu_netlink_event_send(struct tcmu_dev *udev, |
1630 | enum tcmu_genl_cmd cmd, | 1630 | enum tcmu_genl_cmd cmd, |
1631 | struct sk_buff **buf, void **hdr) | 1631 | struct sk_buff *skb, void *msg_header) |
1632 | { | 1632 | { |
1633 | int ret = 0; | 1633 | int ret; |
1634 | struct sk_buff *skb = *buf; | ||
1635 | void *msg_header = *hdr; | ||
1636 | 1634 | ||
1637 | genlmsg_end(skb, msg_header); | 1635 | genlmsg_end(skb, msg_header); |
1638 | 1636 | ||
@@ -1644,7 +1642,7 @@ static int tcmu_netlink_event_send(struct tcmu_dev *udev, | |||
1644 | 1642 | ||
1645 | ret = genlmsg_multicast_allns(&tcmu_genl_family, skb, 0, | 1643 | ret = genlmsg_multicast_allns(&tcmu_genl_family, skb, 0, |
1646 | TCMU_MCGRP_CONFIG, GFP_KERNEL); | 1644 | TCMU_MCGRP_CONFIG, GFP_KERNEL); |
1647 | /* We don't care if no one is listening */ | 1645 | /* We don't care if no one is listening */ |
1648 | if (ret == -ESRCH) | 1646 | if (ret == -ESRCH) |
1649 | ret = 0; | 1647 | ret = 0; |
1650 | if (!ret) | 1648 | if (!ret) |
@@ -1662,9 +1660,8 @@ static int tcmu_send_dev_add_event(struct tcmu_dev *udev) | |||
1662 | &msg_header); | 1660 | &msg_header); |
1663 | if (ret < 0) | 1661 | if (ret < 0) |
1664 | return ret; | 1662 | return ret; |
1665 | return tcmu_netlink_event_send(udev, TCMU_CMD_ADDED_DEVICE, &skb, | 1663 | return tcmu_netlink_event_send(udev, TCMU_CMD_ADDED_DEVICE, skb, |
1666 | &msg_header); | 1664 | msg_header); |
1667 | |||
1668 | } | 1665 | } |
1669 | 1666 | ||
1670 | static int tcmu_send_dev_remove_event(struct tcmu_dev *udev) | 1667 | static int tcmu_send_dev_remove_event(struct tcmu_dev *udev) |
@@ -1678,7 +1675,7 @@ static int tcmu_send_dev_remove_event(struct tcmu_dev *udev) | |||
1678 | if (ret < 0) | 1675 | if (ret < 0) |
1679 | return ret; | 1676 | return ret; |
1680 | return tcmu_netlink_event_send(udev, TCMU_CMD_REMOVED_DEVICE, | 1677 | return tcmu_netlink_event_send(udev, TCMU_CMD_REMOVED_DEVICE, |
1681 | &skb, &msg_header); | 1678 | skb, msg_header); |
1682 | } | 1679 | } |
1683 | 1680 | ||
1684 | static int tcmu_update_uio_info(struct tcmu_dev *udev) | 1681 | static int tcmu_update_uio_info(struct tcmu_dev *udev) |
@@ -2197,7 +2194,7 @@ static int tcmu_send_dev_config_event(struct tcmu_dev *udev, | |||
2197 | return ret; | 2194 | return ret; |
2198 | } | 2195 | } |
2199 | return tcmu_netlink_event_send(udev, TCMU_CMD_RECONFIG_DEVICE, | 2196 | return tcmu_netlink_event_send(udev, TCMU_CMD_RECONFIG_DEVICE, |
2200 | &skb, &msg_header); | 2197 | skb, msg_header); |
2201 | } | 2198 | } |
2202 | 2199 | ||
2203 | 2200 | ||
@@ -2259,7 +2256,7 @@ static int tcmu_send_dev_size_event(struct tcmu_dev *udev, u64 size) | |||
2259 | return ret; | 2256 | return ret; |
2260 | } | 2257 | } |
2261 | return tcmu_netlink_event_send(udev, TCMU_CMD_RECONFIG_DEVICE, | 2258 | return tcmu_netlink_event_send(udev, TCMU_CMD_RECONFIG_DEVICE, |
2262 | &skb, &msg_header); | 2259 | skb, msg_header); |
2263 | } | 2260 | } |
2264 | 2261 | ||
2265 | static ssize_t tcmu_dev_size_store(struct config_item *item, const char *page, | 2262 | static ssize_t tcmu_dev_size_store(struct config_item *item, const char *page, |
@@ -2341,7 +2338,7 @@ static int tcmu_send_emulate_write_cache(struct tcmu_dev *udev, u8 val) | |||
2341 | return ret; | 2338 | return ret; |
2342 | } | 2339 | } |
2343 | return tcmu_netlink_event_send(udev, TCMU_CMD_RECONFIG_DEVICE, | 2340 | return tcmu_netlink_event_send(udev, TCMU_CMD_RECONFIG_DEVICE, |
2344 | &skb, &msg_header); | 2341 | skb, msg_header); |
2345 | } | 2342 | } |
2346 | 2343 | ||
2347 | static ssize_t tcmu_emulate_write_cache_store(struct config_item *item, | 2344 | static ssize_t tcmu_emulate_write_cache_store(struct config_item *item, |