PCI: switchtec: Trivial cleanups
Subsystems (2)
v3 cover PCI: switchtec: Trivial cleanups
From: Bjorn Helgaas <[email protected]>
Simplify switchtec_dma_mrpc_isr() slightly and return the right copy_to_user() error code from switchtec_dev_read().
Bjorn Helgaas (2):
PCI: switchtec: Simplify switchtec_dma_mrpc_isr()
PCI: switchtec: Return -EFAULT for copy_to_user() errors
drivers/pci/switch/switchtec.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
Changes between v2 and v3:
- Remove unused label "out".
Changes between v1 and v2:
- Return -EFAULT for copy_to_user() errors.
Signature · 1 line
2.25.1
PATCH v3 1/2 PCI: switchtec: Simplify switchtec_dma_mrpc_isr()
From: Bjorn Helgaas <[email protected]>
The "ret" variable in switchtec_dma_mrpc_isr() is superfluous. Remove it and just return the value. No functional change intended.
--- drivers/pci/switch/switchtec.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/pci/switch/switchtec.c +1 -3
@@ -1480,15 +1480,13 @@ static irqreturn_t switchtec_event_isr(int irq, void *dev)static irqreturn_t switchtec_dma_mrpc_isr (int irq,void *dev) {struct switchtec_dev *stdev = dev; -irqreturn_t ret =IRQ_NONE ;iowrite32 (SWITCHTEC_EVENT_CLEAR |SWITCHTEC_EVENT_EN_IRQ , &stdev->mmio_part_cfg->mrpc_comp_hdr);schedule_work (&stdev->mrpc_work); - ret =IRQ_HANDLED ; -return ret; +return IRQ_HANDLED ; }static int switchtec_init_isr (struct switchtec_dev *stdev)
Signature · 1 line
2.25.1
PATCH v3 2/2 PCI: switchtec: Return -EFAULT for copy_to_user() errors
In reply to Bjorn HelgaasFrom: Bjorn Helgaas <[email protected]>
switchtec_dev_read() didn't handle copy_to_user() errors correctly: it assigned "rc = -EFAULT", but actually returned either "size", -ENXIO, or -EBADMSG instead.
Update the failure cases to unlock mrpc_mutex and return -EFAULT directly.
--- drivers/pci/switch/switchtec.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/pci/switch/switchtec.c +4 -5
@@ -606,21 +606,20 @@ static ssize_t switchtec_dev_read(struct file *filp, char __user *data, rc =copy_to_user (data, &stuser->return_code,sizeof (stuser->return_code));if (rc) { - rc = -EFAULT ; - goto out; +mutex_unlock (&stdev->mrpc_mutex); +return -EFAULT ; } data +=sizeof (stuser->return_code); rc =copy_to_user (data, &stuser->data, size -sizeof (stuser->return_code));if (rc) { - rc = -EFAULT ; - goto out; +mutex_unlock (&stdev->mrpc_mutex); +return -EFAULT ; }stuser_set_state (stuser,MRPC_IDLE ); -out:mutex_unlock (&stdev->mrpc_mutex); if (stuser->status == SWITCHTEC_MRPC_STATUS_DONE ||
Signature · 1 line
2.25.1