Commit 31532340 authored by Solomon Tan's avatar Solomon Tan Committed by Michael S. Tsirkin
Browse files

virtio: Replace unsigned with unsigned int 



This patch addresses the checkpatch.pl warning where unsigned int is
preferred over unsigned.

Signed-off-by: default avatarSolomon Tan <solomonbstoner@protonmail.ch>
Message-Id: <YlzS49Wo8JMDhKOt@ArchDesktop>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 4e0d352a

drivers/virtio/virtio.c

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ EXPORT_SYMBOL_GPL(virtio_add_status); 
/* Do some validation, then set FEATURES_OK */

static int virtio_features_ok(struct virtio_device *dev)

{

	unsigned status;

	unsigned int status;

	int ret;



	might_sleep();

drivers/virtio/virtio_balloon.c

+6 −6
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
 * multiple balloon pages.  All memory counters in this driver are in balloon

 * page units.

 */

#define VIRTIO_BALLOON_PAGES_PER_PAGE (unsigned)(PAGE_SIZE >> VIRTIO_BALLOON_PFN_SHIFT)

#define VIRTIO_BALLOON_PAGES_PER_PAGE (unsigned int)(PAGE_SIZE >> VIRTIO_BALLOON_PFN_SHIFT)

#define VIRTIO_BALLOON_ARRAY_PFNS_MAX 256

/* Maximum number of (4k) pages to deflate on OOM notifications. */

#define VIRTIO_BALLOON_OOM_NR_PAGES 256
@@ -208,10 +208,10 @@ static void set_page_pfns(struct virtio_balloon *vb, 
					  page_to_balloon_pfn(page) + i);

}



static unsigned fill_balloon(struct virtio_balloon *vb, size_t num)

static unsigned int fill_balloon(struct virtio_balloon *vb, size_t num)

{

	unsigned num_allocated_pages;

	unsigned num_pfns;

	unsigned int num_allocated_pages;

	unsigned int num_pfns;

	struct page *page;

	LIST_HEAD(pages);
@@ -272,9 +272,9 @@ static void release_pages_balloon(struct virtio_balloon *vb, 
	}

}



static unsigned leak_balloon(struct virtio_balloon *vb, size_t num)

static unsigned int leak_balloon(struct virtio_balloon *vb, size_t num)

{

	unsigned num_freed_pages;

	unsigned int num_freed_pages;

	struct page *page;

	struct balloon_dev_info *vb_dev_info = &vb->vb_dev_info;

	LIST_HEAD(pages);

drivers/virtio/virtio_mmio.c

+6 −6
Original line number Diff line number Diff line
@@ -144,8 +144,8 @@ static int vm_finalize_features(struct virtio_device *vdev) 
	return 0;

}



static void vm_get(struct virtio_device *vdev, unsigned offset,

		   void *buf, unsigned len)

static void vm_get(struct virtio_device *vdev, unsigned int offset,

		   void *buf, unsigned int len)

{

	struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vdev);

	void __iomem *base = vm_dev->base + VIRTIO_MMIO_CONFIG;
@@ -186,8 +186,8 @@ static void vm_get(struct virtio_device *vdev, unsigned offset, 
	}

}



static void vm_set(struct virtio_device *vdev, unsigned offset,

		   const void *buf, unsigned len)

static void vm_set(struct virtio_device *vdev, unsigned int offset,

		   const void *buf, unsigned int len)

{

	struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vdev);

	void __iomem *base = vm_dev->base + VIRTIO_MMIO_CONFIG;
@@ -345,7 +345,7 @@ static void vm_del_vqs(struct virtio_device *vdev) 
	free_irq(platform_get_irq(vm_dev->pdev, 0), vm_dev);

}



static struct virtqueue *vm_setup_vq(struct virtio_device *vdev, unsigned index,

static struct virtqueue *vm_setup_vq(struct virtio_device *vdev, unsigned int index,

				  void (*callback)(struct virtqueue *vq),

				  const char *name, bool ctx)

{
@@ -455,7 +455,7 @@ static struct virtqueue *vm_setup_vq(struct virtio_device *vdev, unsigned index, 
	return ERR_PTR(err);

}



static int vm_find_vqs(struct virtio_device *vdev, unsigned nvqs,

static int vm_find_vqs(struct virtio_device *vdev, unsigned int nvqs,

		       struct virtqueue *vqs[],

		       vq_callback_t *callbacks[],

		       const char * const names[],

drivers/virtio/virtio_pci_common.c

+6 −6
Original line number Diff line number Diff line
@@ -104,8 +104,8 @@ static int vp_request_msix_vectors(struct virtio_device *vdev, int nvectors, 
{

	struct virtio_pci_device *vp_dev = to_vp_device(vdev);

	const char *name = dev_name(&vp_dev->vdev.dev);

	unsigned flags = PCI_IRQ_MSIX;

	unsigned i, v;

	unsigned int flags = PCI_IRQ_MSIX;

	unsigned int i, v;

	int err = -ENOMEM;



	vp_dev->msix_vectors = nvectors;
@@ -171,7 +171,7 @@ static int vp_request_msix_vectors(struct virtio_device *vdev, int nvectors, 
	return err;

}



static struct virtqueue *vp_setup_vq(struct virtio_device *vdev, unsigned index,

static struct virtqueue *vp_setup_vq(struct virtio_device *vdev, unsigned int index,

				     void (*callback)(struct virtqueue *vq),

				     const char *name,

				     bool ctx,
@@ -275,7 +275,7 @@ void vp_del_vqs(struct virtio_device *vdev) 
	vp_dev->vqs = NULL;

}



static int vp_find_vqs_msix(struct virtio_device *vdev, unsigned nvqs,

static int vp_find_vqs_msix(struct virtio_device *vdev, unsigned int nvqs,

		struct virtqueue *vqs[], vq_callback_t *callbacks[],

		const char * const names[], bool per_vq_vectors,

		const bool *ctx,
@@ -349,7 +349,7 @@ static int vp_find_vqs_msix(struct virtio_device *vdev, unsigned nvqs, 
	return err;

}



static int vp_find_vqs_intx(struct virtio_device *vdev, unsigned nvqs,

static int vp_find_vqs_intx(struct virtio_device *vdev, unsigned int nvqs,

		struct virtqueue *vqs[], vq_callback_t *callbacks[],

		const char * const names[], const bool *ctx)

{
@@ -388,7 +388,7 @@ static int vp_find_vqs_intx(struct virtio_device *vdev, unsigned nvqs, 
}



/* the config->find_vqs() implementation */

int vp_find_vqs(struct virtio_device *vdev, unsigned nvqs,

int vp_find_vqs(struct virtio_device *vdev, unsigned int nvqs,

		struct virtqueue *vqs[], vq_callback_t *callbacks[],

		const char * const names[], const bool *ctx,

		struct irq_affinity *desc)

drivers/virtio/virtio_pci_common.h

+5 −5
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ struct virtio_pci_vq_info { 
	struct list_head node;



	/* MSI-X vector (or none) */

	unsigned msix_vector;

	unsigned int msix_vector;

};



/* Our device structure */
@@ -68,16 +68,16 @@ struct virtio_pci_device { 
	 * and I'm too lazy to allocate each name separately. */

	char (*msix_names)[256];

	/* Number of available vectors */

	unsigned msix_vectors;

	unsigned int msix_vectors;

	/* Vectors allocated, excluding per-vq vectors if any */

	unsigned msix_used_vectors;

	unsigned int msix_used_vectors;



	/* Whether we have vector per vq */

	bool per_vq_vectors;



	struct virtqueue *(*setup_vq)(struct virtio_pci_device *vp_dev,

				      struct virtio_pci_vq_info *info,

				      unsigned idx,

				      unsigned int idx,

				      void (*callback)(struct virtqueue *vq),

				      const char *name,

				      bool ctx,
@@ -108,7 +108,7 @@ bool vp_notify(struct virtqueue *vq); 
/* the config->del_vqs() implementation */

void vp_del_vqs(struct virtio_device *vdev);

/* the config->find_vqs() implementation */

int vp_find_vqs(struct virtio_device *vdev, unsigned nvqs,

int vp_find_vqs(struct virtio_device *vdev, unsigned int nvqs,

		struct virtqueue *vqs[], vq_callback_t *callbacks[],

		const char * const names[], const bool *ctx,

		struct irq_affinity *desc);