2021-02-10 08:25:53

by Tang Bin

Subject: [PATCH] virtio-mmio: Use to_virtio_mmio_device() to simply code

The file virtio_mmio.c has defined the function to_virtio_mmio_device,
so use it instead of container_of() to simply code. And remove
superfluous blank lines in this file.

Signed-off-by: Tang Bin <[email protected]>
---
drivers/virtio/virtio_mmio.c | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
index 627ac0487..449d0f209 100644
--- a/drivers/virtio/virtio_mmio.c
+++ b/drivers/virtio/virtio_mmio.c
@@ -69,14 +69,10 @@
#include <uapi/linux/virtio_mmio.h>
#include <linux/virtio_ring.h>

-
-
/* The alignment to use between consumer and producer parts of vring.
* Currently hardcoded to the page size. */
#define VIRTIO_MMIO_VRING_ALIGN PAGE_SIZE

-
-
#define to_virtio_mmio_device(_plat_dev) \
container_of(_plat_dev, struct virtio_mmio_device, vdev)

@@ -100,8 +96,6 @@ struct virtio_mmio_vq_info {
struct list_head node;
};

-
-
/* Configuration interface */

static u64 vm_get_features(struct virtio_device *vdev)
@@ -264,8 +258,6 @@ static void vm_reset(struct virtio_device *vdev)
writel(0, vm_dev->base + VIRTIO_MMIO_STATUS);
}

-
-
/* Transport interface */

/* the notify function used when creating a virt queue */
@@ -307,8 +299,6 @@ static irqreturn_t vm_interrupt(int irq, void *opaque)
return ret;
}

-
-
static void vm_del_vq(struct virtqueue *vq)
{
struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vq->vdev);
@@ -512,13 +502,11 @@ static const struct virtio_config_ops virtio_mmio_config_ops = {
.bus_name = vm_bus_name,
};

-
static void virtio_mmio_release_dev(struct device *_d)
{
struct virtio_device *vdev =
container_of(_d, struct virtio_device, dev);
- struct virtio_mmio_device *vm_dev =
- container_of(vdev, struct virtio_mmio_device, vdev);
+ struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vdev);
struct platform_device *pdev = vm_dev->pdev;

devm_kfree(&pdev->dev, vm_dev);
@@ -608,8 +596,6 @@ static int virtio_mmio_remove(struct platform_device *pdev)
return 0;
}

-
-
/* Devices list parameter */

#if defined(CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES)
--
2.20.1.windows.1

2021-02-10 08:45:18

by Jason Wang

Subject: Re: [PATCH] virtio-mmio: Use to_virtio_mmio_device() to simply code

On 2021/2/10 上午11:04, Tang Bin wrote:
> The file virtio_mmio.c has defined the function to_virtio_mmio_device,
> so use it instead of container_of() to simply code. And remove
> superfluous blank lines in this file.
>
> Signed-off-by: Tang Bin <[email protected]>
> ---
> drivers/virtio/virtio_mmio.c | 16 +---------------
> 1 file changed, 1 insertion(+), 15 deletions(-)
>
> diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
> index 627ac0487..449d0f209 100644
> --- a/drivers/virtio/virtio_mmio.c
> +++ b/drivers/virtio/virtio_mmio.c
> @@ -69,14 +69,10 @@
> #include <uapi/linux/virtio_mmio.h>
> #include <linux/virtio_ring.h>
>
> -
> -


It's better not mix the patch with style changes.

Other looks good.

Thanks


> /* The alignment to use between consumer and producer parts of vring.
> * Currently hardcoded to the page size. */
> #define VIRTIO_MMIO_VRING_ALIGN PAGE_SIZE
>
> -
> -
> #define to_virtio_mmio_device(_plat_dev) \
> container_of(_plat_dev, struct virtio_mmio_device, vdev)
>
> @@ -100,8 +96,6 @@ struct virtio_mmio_vq_info {
> struct list_head node;
> };
>
> -
> -
> /* Configuration interface */
>
> static u64 vm_get_features(struct virtio_device *vdev)
> @@ -264,8 +258,6 @@ static void vm_reset(struct virtio_device *vdev)
> writel(0, vm_dev->base + VIRTIO_MMIO_STATUS);
> }
>
> -
> -
> /* Transport interface */
>
> /* the notify function used when creating a virt queue */
> @@ -307,8 +299,6 @@ static irqreturn_t vm_interrupt(int irq, void *opaque)
> return ret;
> }
>
> -
> -
> static void vm_del_vq(struct virtqueue *vq)
> {
> struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vq->vdev);
> @@ -512,13 +502,11 @@ static const struct virtio_config_ops virtio_mmio_config_ops = {
> .bus_name = vm_bus_name,
> };
>
> -
> static void virtio_mmio_release_dev(struct device *_d)
> {
> struct virtio_device *vdev =
> container_of(_d, struct virtio_device, dev);
> - struct virtio_mmio_device *vm_dev =
> - container_of(vdev, struct virtio_mmio_device, vdev);
> + struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vdev);
> struct platform_device *pdev = vm_dev->pdev;
>
> devm_kfree(&pdev->dev, vm_dev);
> @@ -608,8 +596,6 @@ static int virtio_mmio_remove(struct platform_device *pdev)
> return 0;
> }
>
> -
> -
> /* Devices list parameter */
>
> #if defined(CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES)

2021-02-18 01:37:12

by Tang Bin

Subject: Re: [PATCH] virtio-mmio: Use to_virtio_mmio_device() to simply code

Dear Jason：

      Sorry for the late reply this email.

在 2021/2/10 16:09, Jason Wang 写道:
>
> On 2021/2/10 上午11:04, Tang Bin wrote:
>> The file virtio_mmio.c has defined the function to_virtio_mmio_device,
>> so use it instead of container_of() to simply code. And remove
>> superfluous blank lines in this file.
>>
>> Signed-off-by: Tang Bin <[email protected]>
>> ---
>>   drivers/virtio/virtio_mmio.c | 16 +---------------
>>   1 file changed, 1 insertion(+), 15 deletions(-)
>>
>> diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
>> index 627ac0487..449d0f209 100644
>> --- a/drivers/virtio/virtio_mmio.c
>> +++ b/drivers/virtio/virtio_mmio.c
>> @@ -69,14 +69,10 @@
>>   #include <uapi/linux/virtio_mmio.h>
>>   #include <linux/virtio_ring.h>
>>   -
>> -
>
>
> It's better not mix the patch with style changes.
>
> Other looks good.
>
> Thanks

Whether should I send patch V2？

Thanks

>
>
>>   /* The alignment to use between consumer and producer parts of vring.
>>    * Currently hardcoded to the page size. */
>>   #define VIRTIO_MMIO_VRING_ALIGN        PAGE_SIZE
>>   -
>> -
>>   #define to_virtio_mmio_device(_plat_dev) \
>>       container_of(_plat_dev, struct virtio_mmio_device, vdev)
>>   @@ -100,8 +96,6 @@ struct virtio_mmio_vq_info {
>>       struct list_head node;
>>   };
>>   -
>> -
>>   /* Configuration interface */
>>     static u64 vm_get_features(struct virtio_device *vdev)
>> @@ -264,8 +258,6 @@ static void vm_reset(struct virtio_device *vdev)
>>       writel(0, vm_dev->base + VIRTIO_MMIO_STATUS);
>>   }
>>   -
>> -
>>   /* Transport interface */
>>     /* the notify function used when creating a virt queue */
>> @@ -307,8 +299,6 @@ static irqreturn_t vm_interrupt(int irq, void
>> *opaque)
>>       return ret;
>>   }
>>   -
>> -
>>   static void vm_del_vq(struct virtqueue *vq)
>>   {
>>       struct virtio_mmio_device *vm_dev =
>> to_virtio_mmio_device(vq->vdev);
>> @@ -512,13 +502,11 @@ static const struct virtio_config_ops
>> virtio_mmio_config_ops = {
>>       .bus_name    = vm_bus_name,
>>   };
>>   -
>>   static void virtio_mmio_release_dev(struct device *_d)
>>   {
>>       struct virtio_device *vdev =
>>               container_of(_d, struct virtio_device, dev);
>> -    struct virtio_mmio_device *vm_dev =
>> -            container_of(vdev, struct virtio_mmio_device, vdev);
>> +    struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vdev);
>>       struct platform_device *pdev = vm_dev->pdev;
>>         devm_kfree(&pdev->dev, vm_dev);
>> @@ -608,8 +596,6 @@ static int virtio_mmio_remove(struct
>> platform_device *pdev)
>>       return 0;
>>   }
>>   -
>> -
>>   /* Devices list parameter */
>>     #if defined(CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES)
>

2021-02-21 11:29:31

by Michael S. Tsirkin

Subject: Re: [PATCH] virtio-mmio: Use to_virtio_mmio_device() to simply code

On Thu, Feb 18, 2021 at 09:34:08AM +0800, Tang Bin wrote:
> Dear Jason：
>
>       Sorry for the late reply this email.
>
> 在 2021/2/10 16:09, Jason Wang 写道:
> >
> > On 2021/2/10 上午11:04, Tang Bin wrote:
> > > The file virtio_mmio.c has defined the function to_virtio_mmio_device,
> > > so use it instead of container_of() to simply code. And remove
> > > superfluous blank lines in this file.
> > >
> > > Signed-off-by: Tang Bin <[email protected]>
> > > ---
> > >   drivers/virtio/virtio_mmio.c | 16 +---------------
> > >   1 file changed, 1 insertion(+), 15 deletions(-)
> > >
> > > diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
> > > index 627ac0487..449d0f209 100644
> > > --- a/drivers/virtio/virtio_mmio.c
> > > +++ b/drivers/virtio/virtio_mmio.c
> > > @@ -69,14 +69,10 @@
> > >   #include <uapi/linux/virtio_mmio.h>
> > >   #include <linux/virtio_ring.h>
> > >   -
> > > -
> >
> >
> > It's better not mix the patch with style changes.
> >
> > Other looks good.
> >
> > Thanks
>
> Whether should I send patch V2？
>
> Thanks


Please do.

> >
> >
> > >   /* The alignment to use between consumer and producer parts of vring.
> > >    * Currently hardcoded to the page size. */
> > >   #define VIRTIO_MMIO_VRING_ALIGN        PAGE_SIZE
> > >   -
> > > -
> > >   #define to_virtio_mmio_device(_plat_dev) \
> > >       container_of(_plat_dev, struct virtio_mmio_device, vdev)
> > >   @@ -100,8 +96,6 @@ struct virtio_mmio_vq_info {
> > >       struct list_head node;
> > >   };
> > >   -
> > > -
> > >   /* Configuration interface */
> > >     static u64 vm_get_features(struct virtio_device *vdev)
> > > @@ -264,8 +258,6 @@ static void vm_reset(struct virtio_device *vdev)
> > >       writel(0, vm_dev->base + VIRTIO_MMIO_STATUS);
> > >   }
> > >   -
> > > -
> > >   /* Transport interface */
> > >     /* the notify function used when creating a virt queue */
> > > @@ -307,8 +299,6 @@ static irqreturn_t vm_interrupt(int irq, void
> > > *opaque)
> > >       return ret;
> > >   }
> > >   -
> > > -
> > >   static void vm_del_vq(struct virtqueue *vq)
> > >   {
> > >       struct virtio_mmio_device *vm_dev =
> > > to_virtio_mmio_device(vq->vdev);
> > > @@ -512,13 +502,11 @@ static const struct virtio_config_ops
> > > virtio_mmio_config_ops = {
> > >       .bus_name    = vm_bus_name,
> > >   };
> > >   -
> > >   static void virtio_mmio_release_dev(struct device *_d)
> > >   {
> > >       struct virtio_device *vdev =
> > >               container_of(_d, struct virtio_device, dev);
> > > -    struct virtio_mmio_device *vm_dev =
> > > -            container_of(vdev, struct virtio_mmio_device, vdev);
> > > +    struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vdev);
> > >       struct platform_device *pdev = vm_dev->pdev;
> > >         devm_kfree(&pdev->dev, vm_dev);
> > > @@ -608,8 +596,6 @@ static int virtio_mmio_remove(struct
> > > platform_device *pdev)
> > >       return 0;
> > >   }
> > >   -
> > > -
> > >   /* Devices list parameter */
> > >     #if defined(CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES)
> >
>