diff mbox series

[1/2] net/virtio: drop duplicated reset method

Message ID 20181025094659.25492-2-tiwei.bie@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Maxime Coquelin
Headers
Series Some fixes for virtio and vhost |

Checks

Context Check Description
ci/Intel-compilation success Compilation OK
ci/checkpatch success coding style OK

Commit Message

Tiwei Bie Oct. 25, 2018, 9:46 a.m. UTC 
Drop the duplicated reset() method in virtio_pci_ops. Currently
vtpci_reset() is implemented on set_status() and get_status()
directly. The reset() method in virtio_pci_ops isn't used and
its implementation in the legacy device isn't right.

Signed-off-by: Tiwei Bie <tiwei.bie@intel.com>
---
 drivers/net/virtio/virtio_pci.c         | 15 ---------------
 drivers/net/virtio/virtio_pci.h         |  1 -
 drivers/net/virtio/virtio_user_ethdev.c |  1 -
 3 files changed, 17 deletions(-)

Comments

Maxime Coquelin Oct. 30, 2018, 9:10 a.m. UTC | #1 
On 10/25/18 11:46 AM, Tiwei Bie wrote:
> Drop the duplicated reset() method in virtio_pci_ops. Currently
> vtpci_reset() is implemented on set_status() and get_status()
> directly. The reset() method in virtio_pci_ops isn't used and
> its implementation in the legacy device isn't right.
> 
> Signed-off-by: Tiwei Bie <tiwei.bie@intel.com>
> ---
>   drivers/net/virtio/virtio_pci.c         | 15 ---------------
>   drivers/net/virtio/virtio_pci.h         |  1 -
>   drivers/net/virtio/virtio_user_ethdev.c |  1 -
>   3 files changed, 17 deletions(-)
> 


Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>

Thanks,
Maxime
diff mbox series

Patch

diff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c
index 6bd22e54a..6a3abcd26 100644
--- a/drivers/net/virtio/virtio_pci.c
+++ b/drivers/net/virtio/virtio_pci.c
@@ -166,12 +166,6 @@  legacy_set_status(struct virtio_hw *hw, uint8_t status)
 	rte_pci_ioport_write(VTPCI_IO(hw), &status, 1, VIRTIO_PCI_STATUS);
 }
 
-static void
-legacy_reset(struct virtio_hw *hw)
-{
-	legacy_set_status(hw, VIRTIO_CONFIG_STATUS_RESET);
-}
-
 static uint8_t
 legacy_get_isr(struct virtio_hw *hw)
 {
@@ -250,7 +244,6 @@  legacy_notify_queue(struct virtio_hw *hw, struct virtqueue *vq)
 const struct virtio_pci_ops legacy_ops = {
 	.read_dev_cfg	= legacy_read_dev_config,
 	.write_dev_cfg	= legacy_write_dev_config,
-	.reset		= legacy_reset,
 	.get_status	= legacy_get_status,
 	.set_status	= legacy_set_status,
 	.get_features	= legacy_get_features,
@@ -339,13 +332,6 @@  modern_set_status(struct virtio_hw *hw, uint8_t status)
 	rte_write8(status, &hw->common_cfg->device_status);
 }
 
-static void
-modern_reset(struct virtio_hw *hw)
-{
-	modern_set_status(hw, VIRTIO_CONFIG_STATUS_RESET);
-	modern_get_status(hw);
-}
-
 static uint8_t
 modern_get_isr(struct virtio_hw *hw)
 {
@@ -438,7 +424,6 @@  modern_notify_queue(struct virtio_hw *hw __rte_unused, struct virtqueue *vq)
 const struct virtio_pci_ops modern_ops = {
 	.read_dev_cfg	= modern_read_dev_config,
 	.write_dev_cfg	= modern_write_dev_config,
-	.reset		= modern_reset,
 	.get_status	= modern_get_status,
 	.set_status	= modern_set_status,
 	.get_features	= modern_get_features,
diff --git a/drivers/net/virtio/virtio_pci.h b/drivers/net/virtio/virtio_pci.h
index 58fdd3d45..64ba6ecbc 100644
--- a/drivers/net/virtio/virtio_pci.h
+++ b/drivers/net/virtio/virtio_pci.h
@@ -204,7 +204,6 @@  struct virtio_pci_ops {
 			     void *dst, int len);
 	void (*write_dev_cfg)(struct virtio_hw *hw, size_t offset,
 			      const void *src, int len);
-	void (*reset)(struct virtio_hw *hw);
 
 	uint8_t (*get_status)(struct virtio_hw *hw);
 	void    (*set_status)(struct virtio_hw *hw, uint8_t status);
diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c
index 525d16cab..80af3539d 100644
--- a/drivers/net/virtio/virtio_user_ethdev.c
+++ b/drivers/net/virtio/virtio_user_ethdev.c
@@ -331,7 +331,6 @@  virtio_user_notify_queue(struct virtio_hw *hw, struct virtqueue *vq)
 const struct virtio_pci_ops virtio_user_ops = {
 	.read_dev_cfg	= virtio_user_read_dev_config,
 	.write_dev_cfg	= virtio_user_write_dev_config,
-	.reset		= virtio_user_reset,
 	.get_status	= virtio_user_get_status,
 	.set_status	= virtio_user_set_status,
 	.get_features	= virtio_user_get_features,