Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[cascardo/linux.git] / drivers / net / ethernet / ibm / ibmvnic.c

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index b942108..bfe17d9 100644 (file)
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -1424,7 +1424,7 @@ static int init_sub_crq_irqs(struct ibmvnic_adapter *adapter)
                scrq = adapter->tx_scrq[i];
                scrq->irq = irq_create_mapping(NULL, scrq->hw_irq);
 
-               if (scrq->irq == NO_IRQ) {
+               if (!scrq->irq) {
                        rc = -EINVAL;
                        dev_err(dev, "Error mapping irq\n");
                        goto req_tx_irq_failed;
@@ -1444,7 +1444,7 @@ static int init_sub_crq_irqs(struct ibmvnic_adapter *adapter)
        for (i = 0; i < adapter->req_rx_queues; i++) {
                scrq = adapter->rx_scrq[i];
                scrq->irq = irq_create_mapping(NULL, scrq->hw_irq);
-               if (scrq->irq == NO_IRQ) {
+               if (!scrq->irq) {
                        rc = -EINVAL;
                        dev_err(dev, "Error mapping irq\n");
                        goto req_rx_irq_failed;
@@ -2779,12 +2779,6 @@ static void handle_control_ras_rsp(union ibmvnic_crq *crq,
        }
 }
 
-static int ibmvnic_fw_comp_open(struct inode *inode, struct file *file)
-{
-       file->private_data = inode->i_private;
-       return 0;
-}
-
 static ssize_t trace_read(struct file *file, char __user *user_buf, size_t len,
                          loff_t *ppos)
 {
@@ -2836,7 +2830,7 @@ static ssize_t trace_read(struct file *file, char __user *user_buf, size_t len,
 
 static const struct file_operations trace_ops = {
        .owner          = THIS_MODULE,
-       .open           = ibmvnic_fw_comp_open,
+       .open           = simple_open,
        .read           = trace_read,
 };
 
@@ -2886,7 +2880,7 @@ static ssize_t paused_write(struct file *file, const char __user *user_buf,
 
 static const struct file_operations paused_ops = {
        .owner          = THIS_MODULE,
-       .open           = ibmvnic_fw_comp_open,
+       .open           = simple_open,
        .read           = paused_read,
        .write          = paused_write,
 };
@@ -2934,7 +2928,7 @@ static ssize_t tracing_write(struct file *file, const char __user *user_buf,
 
 static const struct file_operations tracing_ops = {
        .owner          = THIS_MODULE,
-       .open           = ibmvnic_fw_comp_open,
+       .open           = simple_open,
        .read           = tracing_read,
        .write          = tracing_write,
 };
@@ -2987,7 +2981,7 @@ static ssize_t error_level_write(struct file *file, const char __user *user_buf,
 
 static const struct file_operations error_level_ops = {
        .owner          = THIS_MODULE,
-       .open           = ibmvnic_fw_comp_open,
+       .open           = simple_open,
        .read           = error_level_read,
        .write          = error_level_write,
 };
@@ -3038,7 +3032,7 @@ static ssize_t trace_level_write(struct file *file, const char __user *user_buf,
 
 static const struct file_operations trace_level_ops = {
        .owner          = THIS_MODULE,
-       .open           = ibmvnic_fw_comp_open,
+       .open           = simple_open,
        .read           = trace_level_read,
        .write          = trace_level_write,
 };
@@ -3091,7 +3085,7 @@ static ssize_t trace_buff_size_write(struct file *file,
 
 static const struct file_operations trace_size_ops = {
        .owner          = THIS_MODULE,
-       .open           = ibmvnic_fw_comp_open,
+       .open           = simple_open,
        .read           = trace_buff_size_read,
        .write          = trace_buff_size_write,
 };
@@ -3751,6 +3745,7 @@ static int ibmvnic_probe(struct vio_dev *dev, const struct vio_device_id *id)
        if (dma_mapping_error(&dev->dev, adapter->stats_token)) {
                if (!firmware_has_feature(FW_FEATURE_CMO))
                        dev_err(&dev->dev, "Couldn't map stats buffer\n");
+               rc = -ENOMEM;
                goto free_crq;
        }