dmaengine: hsu: Finish conversion to managed resources
Subsystems (2)
PATCH 1/4 dmaengine: hsu: Finish conversion to managed resources
With help of devm_add_action_or_reset() we may finish conversion the driver to use managed resources.
--- drivers/dma/hsu/pci.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-)
drivers/dma/hsu/pci.c +12 -15
@@ -47,8 +47,14 @@ static irqreturn_t hsu_pci_irq(int irq, void *dev)return IRQ_RETVAL (ret); } +static void hsu_pci_dma_remove (void *chip) +{ +hsu_dma_remove (chip); +} +static int hsu_pci_probe (struct pci_dev *pdev,const struct pci_device_id *id) { +struct device *dev = &pdev->dev;struct hsu_dma_chip *chip;int ret;
@@ -87,9 +93,13 @@ static int hsu_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)if (ret)return ret; - ret =request_irq (chip->irq, hsu_pci_irq,0 ,"hsu_dma_pci" , chip); + ret =devm_add_action_or_reset (dev, hsu_pci_dma_remove, chip);if (ret) - goto err_register_irq; +return ret; + + ret =devm_request_irq (dev, chip->irq, hsu_pci_irq,0 ,"hsu_dma_pci" , chip); +if (ret) +return ret;/* * On Intel Tangier B0 and Anniedale the interrupt line, disregarding
@@ -105,18 +115,6 @@ static int hsu_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)pci_set_drvdata (pdev, chip);return 0 ; - -err_register_irq: -hsu_dma_remove (chip); -return ret; -} - -static void hsu_pci_remove (struct pci_dev *pdev) -{ -struct hsu_dma_chip *chip =pci_get_drvdata (pdev); - -free_irq (chip->irq, chip); -hsu_dma_remove (chip); }static const struct pci_device_id hsu_pci_id_table[] = {
@@ -130,7 +128,6 @@ static struct pci_driver hsu_pci_driver = { .name = "hsu_dma_pci", .id_table = hsu_pci_id_table, .probe = hsu_pci_probe, - .remove = hsu_pci_remove, };module_pci_driver (hsu_pci_driver);
Signature · 1 line
2.35.1
PATCH 2/4 dmaengine: hsu: using for_each_set_bit to simplify the code
It's more cleanly to use for_each_set_bit() instead of opencoding it.
--- drivers/dma/hsu/pci.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-)
drivers/dma/hsu/pci.c +8 -11
@@ -26,22 +26,19 @@static irqreturn_t hsu_pci_irq (int irq,void *dev) {struct hsu_dma_chip *chip = dev; -u32 dmaisr; -u32 status; +unsigned long dmaisr;unsigned short i; +u32 status;int ret =0 ;int err; dmaisr =readl (chip->regs +HSU_PCI_DMAISR ); -for (i =0 ; i < chip->hsu->nr_channels; i++) { -if (dmaisr &0x1 ) { - err =hsu_dma_get_status (chip, i, &status); -if (err >0 ) - ret |=1 ; -else if (err ==0 ) - ret |=hsu_dma_do_irq (chip, i, status); - } - dmaisr >>=1 ; +for_each_set_bit (i, &dmaisr, chip->hsu->nr_channels) { + err =hsu_dma_get_status (chip, i, &status); +if (err >0 ) + ret |=1 ; +else if (err ==0 ) + ret |=hsu_dma_do_irq (chip, i, status); }return IRQ_RETVAL (ret);
Signature · 1 line
2.35.1
PATCH 3/4 dmaengine: hsu: Use GENMASK() consistently
In reply to Andy ShevchenkoFor the masks replace chain of BIT() macros by GENMASK(). While at it, explicitly include bits.h.
--- drivers/dma/hsu/hsu.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/dma/hsu/hsu.h +4 -3
@@ -10,6 +10,7 @@#ifndef __DMA_HSU_H__#define __DMA_HSU_H__ +#include <linux/bits.h> #include <linux/spinlock.h> #include <linux/dma/hsu.h>
@@ -36,11 +37,11 @@/* Bits in HSU_CH_SR */ #define HSU_CH_SR_DESCTO (x) BIT(8 + (x)) -#define HSU_CH_SR_DESCTO_ANY (BIT(11) | BIT(10) | BIT(9) | BIT(8)) +#define HSU_CH_SR_DESCTO_ANY GENMASK(11, 8)#define HSU_CH_SR_CHE BIT(15)#define HSU_CH_SR_DESCE (x) BIT(16 + (x)) -#define HSU_CH_SR_DESCE_ANY (BIT(19) | BIT(18) | BIT(17) | BIT(16)) -#define HSU_CH_SR_CDESC_ANY (BIT(31) | BIT(30)) +#define HSU_CH_SR_DESCE_ANY GENMASK(19, 16) +#define HSU_CH_SR_CDESC_ANY GENMASK(31, 30)/* Bits in HSU_CH_CR */ #define HSU_CH_CR_CHA BIT(0)
Signature · 1 line
2.35.1
PATCH 4/4 dmaengine: hsu: Include headers we are direct user of
In reply to Andy ShevchenkoFor the sake of integrity, include headers we are direct user of.
--- drivers/dma/hsu/hsu.c | 8 ++++++++ drivers/dma/hsu/hsu.h | 5 ++++- drivers/dma/hsu/pci.c | 1 + include/linux/dma/hsu.h | 6 ++++-- include/linux/platform_data/dma-hsu.h | 2 +- 5 files changed, 18 insertions(+), 4 deletions(-)
drivers/dma/hsu/hsu.c +8 -0
@@ -16,12 +16,20 @@* port 3, and so on. */ +#include <linux/bits.h> #include <linux/delay.h> +#include <linux/device.h> #include <linux/dmaengine.h> #include <linux/dma-mapping.h> #include <linux/init.h> +#include <linux/interrupt.h> +#include <linux/list.h> #include <linux/module.h> +#include <linux/percpu-defs.h> +#include <linux/scatterlist.h> #include <linux/slab.h> +#include <linux/string.h> +#include <linux/spinlock.h> #include "hsu.h"
drivers/dma/hsu/hsu.h +4 -1
@@ -11,7 +11,10 @@#define __DMA_HSU_H__#include <linux/bits.h> -#include <linux/spinlock.h> +#include <linux/container_of.h> +#include <linux/io.h> +#include <linux/types.h> +#include <linux/dma/hsu.h> #include "../virt-dma.h"
drivers/dma/hsu/pci.c +1 -0
@@ -10,6 +10,7 @@#include <linux/bitops.h> #include <linux/device.h> +#include <linux/interrupt.h> #include <linux/module.h> #include <linux/pci.h>
include/linux/dma/hsu.h +4 -2
@@ -8,11 +8,13 @@#ifndef _DMA_HSU_H#define _DMA_HSU_H -#include <linux/device.h> -#include <linux/interrupt.h> +#include <linux/errno.h> +#include <linux/kconfig.h> +#include <linux/types.h> #include <linux/platform_data/dma-hsu.h> +struct device ;struct hsu_dma ;/**
include/linux/platform_data/dma-hsu.h +1 -1
@@ -8,7 +8,7 @@ #ifndef _PLATFORM_DATA_DMA_HSU_H #define _PLATFORM_DATA_DMA_HSU_H -#include <linux/device.h> +struct device; struct hsu_dma_slave { struct device *dma_dev;
Signature · 1 line
2.35.1
Quoted 2 lines · Andy Shevchenko
With help of
devm_add_action_or_reset()we may finish conversion the driver to use managed resources.
Vinod, can these be applied?
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 2 lines · Andy Shevchenko
With help of
devm_add_action_or_reset()we may finish conversion the driver to use managed resources.
Applied all, thanks
Signature · 1 line
~Vinod