|
@@ -66,11 +66,6 @@ struct port_table_attribute {
|
|
int index;
|
|
int index;
|
|
};
|
|
};
|
|
|
|
|
|
-static inline int ibdev_is_alive(const struct ib_device *dev)
|
|
|
|
-{
|
|
|
|
- return dev->reg_state == IB_DEV_REGISTERED;
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
static ssize_t port_attr_show(struct kobject *kobj,
|
|
static ssize_t port_attr_show(struct kobject *kobj,
|
|
struct attribute *attr, char *buf)
|
|
struct attribute *attr, char *buf)
|
|
{
|
|
{
|
|
@@ -80,8 +75,6 @@ static ssize_t port_attr_show(struct kobject *kobj,
|
|
|
|
|
|
if (!port_attr->show)
|
|
if (!port_attr->show)
|
|
return -EIO;
|
|
return -EIO;
|
|
- if (!ibdev_is_alive(p->ibdev))
|
|
|
|
- return -ENODEV;
|
|
|
|
|
|
|
|
return port_attr->show(p, port_attr, buf);
|
|
return port_attr->show(p, port_attr, buf);
|
|
}
|
|
}
|
|
@@ -562,9 +555,6 @@ static ssize_t show_node_type(struct device *device,
|
|
{
|
|
{
|
|
struct ib_device *dev = container_of(device, struct ib_device, dev);
|
|
struct ib_device *dev = container_of(device, struct ib_device, dev);
|
|
|
|
|
|
- if (!ibdev_is_alive(dev))
|
|
|
|
- return -ENODEV;
|
|
|
|
-
|
|
|
|
switch (dev->node_type) {
|
|
switch (dev->node_type) {
|
|
case RDMA_NODE_IB_CA: return sprintf(buf, "%d: CA\n", dev->node_type);
|
|
case RDMA_NODE_IB_CA: return sprintf(buf, "%d: CA\n", dev->node_type);
|
|
case RDMA_NODE_RNIC: return sprintf(buf, "%d: RNIC\n", dev->node_type);
|
|
case RDMA_NODE_RNIC: return sprintf(buf, "%d: RNIC\n", dev->node_type);
|
|
@@ -581,9 +571,6 @@ static ssize_t show_sys_image_guid(struct device *device,
|
|
struct ib_device_attr attr;
|
|
struct ib_device_attr attr;
|
|
ssize_t ret;
|
|
ssize_t ret;
|
|
|
|
|
|
- if (!ibdev_is_alive(dev))
|
|
|
|
- return -ENODEV;
|
|
|
|
-
|
|
|
|
ret = ib_query_device(dev, &attr);
|
|
ret = ib_query_device(dev, &attr);
|
|
if (ret)
|
|
if (ret)
|
|
return ret;
|
|
return ret;
|
|
@@ -600,9 +587,6 @@ static ssize_t show_node_guid(struct device *device,
|
|
{
|
|
{
|
|
struct ib_device *dev = container_of(device, struct ib_device, dev);
|
|
struct ib_device *dev = container_of(device, struct ib_device, dev);
|
|
|
|
|
|
- if (!ibdev_is_alive(dev))
|
|
|
|
- return -ENODEV;
|
|
|
|
-
|
|
|
|
return sprintf(buf, "%04x:%04x:%04x:%04x\n",
|
|
return sprintf(buf, "%04x:%04x:%04x:%04x\n",
|
|
be16_to_cpu(((__be16 *) &dev->node_guid)[0]),
|
|
be16_to_cpu(((__be16 *) &dev->node_guid)[0]),
|
|
be16_to_cpu(((__be16 *) &dev->node_guid)[1]),
|
|
be16_to_cpu(((__be16 *) &dev->node_guid)[1]),
|