virtio: Replace unsigned with unsigned int
Subsystems (2)
PATCH 1/2 virtio: Replace unsigned with unsigned int
This patch addresses the checkpatch.pl warning where unsigned int is preferred over unsigned.
Signed-off-by Solomon Tan <[email protected]>
--- drivers/virtio/virtio.c | 2 +- drivers/virtio/virtio_balloon.c | 12 ++++++------ drivers/virtio/virtio_mmio.c | 12 ++++++------ drivers/virtio/virtio_pci_common.c | 12 ++++++------ drivers/virtio/virtio_pci_common.h | 10 +++++----- drivers/virtio/virtio_pci_legacy.c | 10 +++++----- drivers/virtio/virtio_pci_modern.c | 12 ++++++------ drivers/virtio/virtio_ring.c | 12 ++++++------ drivers/virtio/virtio_vdpa.c | 10 +++++----- 9 files changed, 46 insertions(+), 46 deletions(-)
drivers/virtio/virtio.c +1 -1
@@ -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
@@ -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
@@ -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
@@ -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,
@@ -276,7 +276,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,
@@ -350,7 +350,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) {
@@ -389,7 +389,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
@@ -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);
drivers/virtio/virtio_pci_legacy.c +5 -5
@@ -45,8 +45,8 @@ static int vp_finalize_features(struct virtio_device *vdev) }/* virtio config->get() implementation */ -static void vp_get (struct virtio_device *vdev,unsigned offset, -void *buf,unsigned len) +static void vp_get (struct virtio_device *vdev,unsigned int offset, +void *buf,unsigned int len) {struct virtio_pci_device *vp_dev =to_vp_device (vdev); void __iomem *ioaddr = vp_dev->ldev.ioaddr +
@@ -61,8 +61,8 @@ static void vp_get(struct virtio_device *vdev, unsigned offset,/* the config->set() implementation. it's symmetric to the config->get() * implementation */ -static void vp_set (struct virtio_device *vdev,unsigned offset, -const void *buf,unsigned len) +static void vp_set (struct virtio_device *vdev,unsigned int offset, +const void *buf,unsigned int len) {struct virtio_pci_device *vp_dev =to_vp_device (vdev); void __iomem *ioaddr = vp_dev->ldev.ioaddr +
@@ -109,7 +109,7 @@ static u16 vp_config_vector(struct virtio_pci_device *vp_dev, u16 vector) static struct virtqueue *setup_vq(struct virtio_pci_device *vp_dev, struct virtio_pci_vq_info *info, - unsigned index, + unsigned int index, void (*callback)(struct virtqueue *vq), const char *name, bool ctx,
drivers/virtio/virtio_pci_modern.c +6 -6
@@ -60,8 +60,8 @@ static int vp_finalize_features(struct virtio_device *vdev) }/* virtio config->get() implementation */ -static void vp_get (struct virtio_device *vdev,unsigned offset, -void *buf,unsigned len) +static void vp_get (struct virtio_device *vdev,unsigned int offset, +void *buf,unsigned int len) {struct virtio_pci_device *vp_dev =to_vp_device (vdev);struct virtio_pci_modern_device *mdev = &vp_dev->mdev;
@@ -98,8 +98,8 @@ static void vp_get(struct virtio_device *vdev, unsigned offset,/* the config->set() implementation. it's symmetric to the config->get() * implementation */ -static void vp_set (struct virtio_device *vdev,unsigned offset, -const void *buf,unsigned len) +static void vp_set (struct virtio_device *vdev,unsigned int offset, +const void *buf,unsigned int len) {struct virtio_pci_device *vp_dev =to_vp_device (vdev);struct virtio_pci_modern_device *mdev = &vp_dev->mdev;
@@ -183,7 +183,7 @@ static u16 vp_config_vector(struct virtio_pci_device *vp_dev, u16 vector) static struct virtqueue *setup_vq(struct virtio_pci_device *vp_dev, struct virtio_pci_vq_info *info, - unsigned index, + unsigned int index, void (*callback)(struct virtqueue *vq), const char *name, bool ctx,
@@ -248,7 +248,7 @@ static struct virtqueue *setup_vq(struct virtio_pci_device *vp_dev,return ERR_PTR (err); } -static int vp_modern_find_vqs(struct virtio_device *vdev, unsigned nvqs, +static int vp_modern_find_vqs(struct virtio_device *vdev, unsigned int nvqs, struct virtqueue *vqs[], vq_callback_t *callbacks[], const char * const names[], const bool *ctx,
drivers/virtio/virtio_ring.c +6 -6
@@ -811,7 +811,7 @@ static void virtqueue_disable_cb_split(struct virtqueue *_vq) } } -static unsigned virtqueue_enable_cb_prepare_split (struct virtqueue *_vq) +static unsigned int virtqueue_enable_cb_prepare_split (struct virtqueue *_vq) {struct vring_virtqueue *vq =to_vvq (_vq);u16 last_used_idx;
@@ -836,7 +836,7 @@ static unsigned virtqueue_enable_cb_prepare_split(struct virtqueue *_vq)return last_used_idx; } -static bool virtqueue_poll_split (struct virtqueue *_vq,unsigned last_used_idx) +static bool virtqueue_poll_split (struct virtqueue *_vq,unsigned int last_used_idx) {struct vring_virtqueue *vq =to_vvq (_vq);
@@ -1488,7 +1488,7 @@ static void virtqueue_disable_cb_packed(struct virtqueue *_vq) } } -static unsigned virtqueue_enable_cb_prepare_packed (struct virtqueue *_vq) +static unsigned int virtqueue_enable_cb_prepare_packed (struct virtqueue *_vq) {struct vring_virtqueue *vq =to_vvq (_vq);
@@ -2027,7 +2027,7 @@ EXPORT_SYMBOL_GPL(virtqueue_disable_cb);* Caller must ensure we don't call this with other virtqueue * operations at the same time (except where noted). */ -unsigned virtqueue_enable_cb_prepare (struct virtqueue *_vq) +unsigned int virtqueue_enable_cb_prepare (struct virtqueue *_vq) {struct vring_virtqueue *vq =to_vvq (_vq);
@@ -2048,7 +2048,7 @@ EXPORT_SYMBOL_GPL(virtqueue_enable_cb_prepare);* * This does not need to be serialized. */ -bool virtqueue_poll (struct virtqueue *_vq,unsigned last_used_idx) +bool virtqueue_poll (struct virtqueue *_vq,unsigned int last_used_idx) {struct vring_virtqueue *vq =to_vvq (_vq);
@@ -2074,7 +2074,7 @@ EXPORT_SYMBOL_GPL(virtqueue_poll);*/ bool virtqueue_enable_cb (struct virtqueue *_vq) { -unsigned last_used_idx =virtqueue_enable_cb_prepare (_vq); +unsigned int last_used_idx =virtqueue_enable_cb_prepare (_vq);return !virtqueue_poll (_vq, last_used_idx); }
drivers/virtio/virtio_vdpa.c +5 -5
@@ -53,16 +53,16 @@ static struct vdpa_device *vd_get_vdpa(struct virtio_device *vdev)return to_virtio_vdpa_device (vdev)->vdpa; } -static void virtio_vdpa_get (struct virtio_device *vdev,unsigned offset, -void *buf,unsigned len) +static void virtio_vdpa_get (struct virtio_device *vdev,unsigned int offset, +void *buf,unsigned int len) {struct vdpa_device *vdpa =vd_get_vdpa (vdev);vdpa_get_config (vdpa, offset, buf, len); } -static void virtio_vdpa_set (struct virtio_device *vdev,unsigned offset, -const void *buf,unsigned len) +static void virtio_vdpa_set (struct virtio_device *vdev,unsigned int offset, +const void *buf,unsigned int len) {struct vdpa_device *vdpa =vd_get_vdpa (vdev);
@@ -263,7 +263,7 @@ static void virtio_vdpa_del_vqs(struct virtio_device *vdev)virtio_vdpa_del_vq (vq); } -static int virtio_vdpa_find_vqs(struct virtio_device *vdev, unsigned nvqs, +static int virtio_vdpa_find_vqs(struct virtio_device *vdev, unsigned int nvqs, struct virtqueue *vqs[], vq_callback_t *callbacks[], const char * const names[],
--
2.35.3