From: Andrew Morton Signed-off-by: Andrew Morton --- drivers/infiniband/hw/amso1100/c2_provider.c | 8 ++++---- drivers/infiniband/hw/cxgb3/iwch_provider.c | 8 ++++---- drivers/infiniband/hw/nes/nes_verbs.c | 3 --- 3 files changed, 8 insertions(+), 11 deletions(-) diff -puN drivers/infiniband/hw/amso1100/c2_provider.c~git-infiniband-vs-gregkh-driver-ib-convert-struct-class_device-to-struct-device drivers/infiniband/hw/amso1100/c2_provider.c --- a/drivers/infiniband/hw/amso1100/c2_provider.c~git-infiniband-vs-gregkh-driver-ib-convert-struct-class_device-to-struct-device +++ a/drivers/infiniband/hw/amso1100/c2_provider.c @@ -527,7 +527,7 @@ static ssize_t show_rev(struct device *d char *buf) { struct c2_dev *c2dev = container_of(dev, struct c2_dev, ibdev.dev); - pr_debug("%s:%u\n", __FUNCTION__, __LINE__); + pr_debug("%s:%u\n", __func__, __LINE__); return sprintf(buf, "%x\n", c2dev->props.hw_ver); } @@ -535,7 +535,7 @@ static ssize_t show_fw_ver(struct device char *buf) { struct c2_dev *c2dev = container_of(dev, struct c2_dev, ibdev.dev); - pr_debug("%s:%u\n", __FUNCTION__, __LINE__); + pr_debug("%s:%u\n", __func__, __LINE__); return sprintf(buf, "%x.%x.%x\n", (int) (c2dev->props.fw_ver >> 32), (int) (c2dev->props.fw_ver >> 16) & 0xffff, @@ -545,14 +545,14 @@ static ssize_t show_fw_ver(struct device static ssize_t show_hca(struct device *dev, struct device_attribute *attr, char *buf) { - pr_debug("%s:%u\n", __FUNCTION__, __LINE__); + pr_debug("%s:%u\n", __func__, __LINE__); return sprintf(buf, "AMSO1100\n"); } static ssize_t show_board(struct device *dev, struct device_attribute *attr, char *buf) { - pr_debug("%s:%u\n", __FUNCTION__, __LINE__); + pr_debug("%s:%u\n", __func__, __LINE__); return sprintf(buf, "%.*s\n", 32, "AMSO1100 Board ID"); } diff -puN drivers/infiniband/hw/cxgb3/iwch_provider.c~git-infiniband-vs-gregkh-driver-ib-convert-struct-class_device-to-struct-device drivers/infiniband/hw/cxgb3/iwch_provider.c --- a/drivers/infiniband/hw/cxgb3/iwch_provider.c~git-infiniband-vs-gregkh-driver-ib-convert-struct-class_device-to-struct-device +++ a/drivers/infiniband/hw/cxgb3/iwch_provider.c @@ -1046,7 +1046,7 @@ static ssize_t show_rev(struct device *d { struct iwch_dev *iwch_dev = container_of(dev, struct iwch_dev, ibdev.dev); - PDBG("%s dev 0x%p\n", __FUNCTION__, dev); + PDBG("%s dev 0x%p\n", __func__, dev); return sprintf(buf, "%d\n", iwch_dev->rdev.t3cdev_p->type); } @@ -1057,7 +1057,7 @@ static ssize_t show_fw_ver(struct device struct ethtool_drvinfo info; struct net_device *lldev = iwch_dev->rdev.t3cdev_p->lldev; - PDBG("%s dev 0x%p\n", __FUNCTION__, dev); + PDBG("%s dev 0x%p\n", __func__, dev); lldev->ethtool_ops->get_drvinfo(lldev, &info); return sprintf(buf, "%s\n", info.fw_version); } @@ -1070,7 +1070,7 @@ static ssize_t show_hca(struct device *d struct ethtool_drvinfo info; struct net_device *lldev = iwch_dev->rdev.t3cdev_p->lldev; - PDBG("%s dev 0x%p\n", __FUNCTION__, dev); + PDBG("%s dev 0x%p\n", __func__, dev); lldev->ethtool_ops->get_drvinfo(lldev, &info); return sprintf(buf, "%s\n", info.driver); } @@ -1080,7 +1080,7 @@ static ssize_t show_board(struct device { struct iwch_dev *iwch_dev = container_of(dev, struct iwch_dev, ibdev.dev); - PDBG("%s dev 0x%p\n", __FUNCTION__, dev); + PDBG("%s dev 0x%p\n", __func__, dev); return sprintf(buf, "%x.%x\n", iwch_dev->rdev.rnic_info.pdev->vendor, iwch_dev->rdev.rnic_info.pdev->device); } diff -puN drivers/infiniband/hw/nes/nes_verbs.c~git-infiniband-vs-gregkh-driver-ib-convert-struct-class_device-to-struct-device drivers/infiniband/hw/nes/nes_verbs.c --- a/drivers/infiniband/hw/nes/nes_verbs.c~git-infiniband-vs-gregkh-driver-ib-convert-struct-class_device-to-struct-device +++ a/drivers/infiniband/hw/nes/nes_verbs.c @@ -3908,9 +3908,6 @@ void nes_unregister_ofa_device(struct ne struct nes_vnic *nesvnic = nesibdev->nesvnic; int i; - if (nesibdev == NULL) - return; - for (i = 0; i < ARRAY_SIZE(nes_dev_attributes); ++i) { device_remove_file(&nesibdev->ibdev.dev, nes_dev_attributes[i]); } _