From: Ingo Molnar <mingo@kernel.org>
To: Wei Tang <tangwei@cmss.chinamobile.com>
Cc: akpm@linux-foundation.org, peterz@infradead.org, tj@kernel.org,
kirill.shutemov@linux.intel.com, jason.low2@hp.com,
xypron.glpk@gmx.de, oleg@redhat.com, koct9i@gmail.com,
josh@joshtriplett.org, ebiederm@xmission.com, cyphar@cyphar.com,
linux-kernel@vger.kernel.org,
Linus Torvalds <torvalds@linux-foundation.org>,
Thomas Gleixner <tglx@linutronix.de>,
Peter Zijlstra <a.p.zijlstra@chello.nl>
Subject: [PATCH] treewide: Use 'sizeof(x)' instead of 'sizeof x'
Date: Tue, 2 Feb 2016 12:28:41 +0100 [thread overview]
Message-ID: <20160202112841.GA14524@gmail.com> (raw)
In-Reply-To: <20160202091118.GB30393@gmail.com>
* Ingo Molnar <mingo@kernel.org> wrote:
> If anyone feels strongly about accepting such patches, then the right solution
> is to create a Coccinelle semantic patch to run over the whole kernel and get
> over with the churn once and for all.
So applying a semantic patch like this to all .c files:
@@ expression E; @@
-sizeof E
+sizeof(E)
@@ expression E2; @@
-sizeof((E2))
+sizeof(E2)
Produces the single patch below for the whole kernel - instead of generating a
churn of 1,000+ patches ...
Since it's Coccinelle that generated the patch we can be reasonably sure that it's
an identity transformation - or if it fails, it's a visible failure.
Thanks,
Ingo
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/alpha/kernel/setup.c | 4 +-
arch/alpha/oprofile/common.c | 2 +-
arch/arm/common/mcpm_entry.c | 2 +-
arch/arm/mach-davinci/board-dm644x-evm.c | 2 +-
arch/arm/mach-ixp4xx/common.c | 2 +-
arch/arm/mach-pxa/devices.c | 2 +-
arch/arm/mach-u300/dummyspichip.c | 2 +-
arch/cris/arch-v10/kernel/traps.c | 2 +-
arch/cris/arch-v32/mach-a3/pinmux.c | 12 +-
arch/cris/arch-v32/mach-fs/pinmux.c | 12 +-
arch/cris/arch-v32/mm/intmem.c | 6 +-
arch/cris/boot/tools/build.c | 8 +-
arch/ia64/kernel/mca_drv.c | 2 +-
arch/m68k/bvme6000/rtc.c | 2 +-
arch/m68k/mvme16x/rtc.c | 2 +-
arch/mips/boot/elf2ecoff.c | 29 ++-
arch/mips/kernel/module.c | 2 +-
arch/mips/oprofile/common.c | 2 +-
arch/mips/sgi-ip22/ip22-gio.c | 2 +-
arch/parisc/kernel/cache.c | 2 +-
arch/parisc/kernel/process.c | 2 +-
arch/parisc/math-emu/driver.c | 4 +-
arch/powerpc/crypto/sha1.c | 2 +-
arch/powerpc/kernel/kgdb.c | 6 +-
arch/powerpc/oprofile/common.c | 2 +-
arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 2 +-
arch/powerpc/platforms/cell/spufs/context.c | 2 +-
arch/powerpc/platforms/cell/spufs/file.c | 22 +-
arch/powerpc/platforms/cell/spufs/gang.c | 2 +-
arch/s390/crypto/sha_common.c | 2 +-
arch/sparc/lib/bitext.c | 2 +-
arch/tile/kernel/backtrace.c | 6 +-
arch/um/kernel/um_arch.c | 2 +-
arch/x86/boot/cpucheck.c | 2 +-
arch/x86/boot/early_serial_console.c | 4 +-
arch/x86/boot/edd.c | 6 +-
arch/x86/boot/main.c | 4 +-
arch/x86/boot/memory.c | 2 +-
arch/x86/boot/regs.c | 2 +-
arch/x86/boot/video-vesa.c | 6 +-
arch/x86/boot/video.c | 2 +-
arch/x86/kernel/cpu/common.c | 4 +-
arch/x86/kernel/cpu/mcheck/mce.c | 2 +-
arch/x86/kernel/cpu/mtrr/generic.c | 2 +-
arch/x86/kernel/cpu/mtrr/if.c | 8 +-
arch/x86/kernel/e820.c | 2 +-
arch/x86/kernel/head64.c | 2 +-
arch/x86/kernel/msr.c | 8 +-
arch/x86/kvm/assigned-dev.c | 14 +-
arch/x86/kvm/emulate.c | 22 +-
arch/x86/kvm/lapic.c | 2 +-
arch/x86/kvm/x86.c | 46 ++--
arch/x86/tools/relocs.c | 4 +-
drivers/acpi/acpi_video.c | 2 +-
drivers/ata/sata_promise.c | 2 +-
drivers/atm/iphase.c | 2 +-
drivers/atm/lanai.c | 2 +-
drivers/base/isa.c | 2 +-
drivers/base/power/sysfs.c | 16 +-
drivers/base/regmap/regcache-lzo.c | 2 +-
drivers/base/regmap/regcache-rbtree.c | 2 +-
drivers/block/aoe/aoeblk.c | 4 +-
drivers/block/aoe/aoechr.c | 4 +-
drivers/block/aoe/aoecmd.c | 26 +--
drivers/block/aoe/aoedev.c | 6 +-
drivers/block/cciss.c | 2 +-
drivers/char/genrtc.c | 2 +-
drivers/char/rtc.c | 2 +-
drivers/crypto/nx/nx-aes-xcbc.c | 2 +-
drivers/crypto/nx/nx-sha256.c | 2 +-
drivers/crypto/nx/nx-sha512.c | 2 +-
drivers/firewire/nosy.c | 6 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 +-
drivers/gpu/drm/drm_atomic.c | 12 +-
drivers/gpu/drm/i915/intel_display.c | 4 +-
drivers/gpu/drm/radeon/radeon_display.c | 2 +-
drivers/i2c/i2c-core.c | 2 +-
drivers/iio/industrialio-trigger.c | 4 +-
drivers/infiniband/core/addr.c | 4 +-
drivers/infiniband/core/agent.c | 2 +-
drivers/infiniband/core/cache.c | 12 +-
drivers/infiniband/core/cm.c | 32 +--
drivers/infiniband/core/cma.c | 78 +++----
drivers/infiniband/core/device.c | 8 +-
drivers/infiniband/core/fmr_pool.c | 8 +-
drivers/infiniband/core/mad.c | 38 +--
drivers/infiniband/core/mad_rmpp.c | 2 +-
drivers/infiniband/core/multicast.c | 16 +-
drivers/infiniband/core/netlink.c | 2 +-
drivers/infiniband/core/sa_query.c | 12 +-
drivers/infiniband/core/sysfs.c | 6 +-
drivers/infiniband/core/ucm.c | 8 +-
drivers/infiniband/core/ucma.c | 18 +-
drivers/infiniband/core/ud_header.c | 8 +-
drivers/infiniband/core/umem.c | 2 +-
drivers/infiniband/core/user_mad.c | 16 +-
drivers/infiniband/core/uverbs_cmd.c | 260 ++++++++++-----------
drivers/infiniband/core/uverbs_main.c | 10 +-
drivers/infiniband/core/uverbs_marshall.c | 10 +-
drivers/infiniband/core/verbs.c | 4 +-
drivers/infiniband/hw/cxgb3/cxio_hal.c | 4 +-
drivers/infiniband/hw/cxgb3/iwch_cm.c | 2 +-
drivers/infiniband/hw/cxgb3/iwch_provider.c | 26 +--
drivers/infiniband/hw/cxgb4/cm.c | 14 +-
drivers/infiniband/hw/cxgb4/cq.c | 10 +-
drivers/infiniband/hw/cxgb4/device.c | 10 +-
drivers/infiniband/hw/cxgb4/mem.c | 4 +-
drivers/infiniband/hw/cxgb4/provider.c | 4 +-
drivers/infiniband/hw/cxgb4/qp.c | 64 ++---
drivers/infiniband/hw/cxgb4/resource.c | 16 +-
drivers/infiniband/hw/mlx4/ah.c | 4 +-
drivers/infiniband/hw/mlx4/alias_GUID.c | 11 +-
drivers/infiniband/hw/mlx4/cq.c | 14 +-
drivers/infiniband/hw/mlx4/doorbell.c | 2 +-
drivers/infiniband/hw/mlx4/mad.c | 30 +--
drivers/infiniband/hw/mlx4/main.c | 36 +--
drivers/infiniband/hw/mlx4/mcg.c | 30 +--
drivers/infiniband/hw/mlx4/mr.c | 2 +-
drivers/infiniband/hw/mlx4/qp.c | 40 ++--
drivers/infiniband/hw/mlx4/srq.c | 6 +-
drivers/infiniband/hw/mlx4/sysfs.c | 8 +-
drivers/infiniband/hw/mthca/mthca_allocator.c | 8 +-
drivers/infiniband/hw/mthca/mthca_av.c | 6 +-
drivers/infiniband/hw/mthca/mthca_cmd.c | 2 +-
drivers/infiniband/hw/mthca/mthca_cq.c | 2 +-
drivers/infiniband/hw/mthca/mthca_eq.c | 6 +-
drivers/infiniband/hw/mthca/mthca_mad.c | 6 +-
drivers/infiniband/hw/mthca/mthca_main.c | 4 +-
drivers/infiniband/hw/mthca/mthca_mcg.c | 2 +-
drivers/infiniband/hw/mthca/mthca_memfree.c | 12 +-
drivers/infiniband/hw/mthca/mthca_mr.c | 12 +-
drivers/infiniband/hw/mthca/mthca_profile.c | 2 +-
drivers/infiniband/hw/mthca/mthca_provider.c | 70 +++---
drivers/infiniband/hw/mthca/mthca_qp.c | 8 +-
drivers/infiniband/hw/mthca/mthca_srq.c | 6 +-
drivers/infiniband/hw/nes/nes_cm.c | 2 +-
drivers/infiniband/hw/nes/nes_hw.c | 2 +-
drivers/infiniband/hw/nes/nes_mgt.c | 4 +-
drivers/infiniband/hw/nes/nes_verbs.c | 12 +-
drivers/infiniband/hw/ocrdma/ocrdma_stats.c | 2 +-
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 2 +-
drivers/infiniband/ulp/ipoib/ipoib_cm.c | 22 +-
drivers/infiniband/ulp/ipoib/ipoib_fs.c | 10 +-
drivers/infiniband/ulp/ipoib/ipoib_ib.c | 4 +-
drivers/infiniband/ulp/ipoib/ipoib_main.c | 16 +-
drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 6 +-
drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 2 +-
drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 2 +-
drivers/infiniband/ulp/iser/iser_verbs.c | 6 +-
drivers/infiniband/ulp/srp/ib_srp.c | 30 +--
drivers/infiniband/ulp/srpt/ib_srpt.c | 42 ++--
drivers/input/keyboard/lm8323.c | 2 +-
drivers/input/misc/dm355evm_keys.c | 2 +-
drivers/input/touchscreen/ad7877.c | 6 +-
drivers/input/touchscreen/ads7846.c | 4 +-
drivers/isdn/gigaset/bas-gigaset.c | 2 +-
drivers/isdn/gigaset/capi.c | 2 +-
drivers/isdn/gigaset/common.c | 6 +-
drivers/isdn/gigaset/ev-layer.c | 2 +-
drivers/isdn/gigaset/i4l.c | 12 +-
drivers/isdn/gigaset/interface.c | 8 +-
drivers/isdn/i4l/isdn_tty.c | 2 +-
drivers/md/dm-bufio.c | 4 +-
drivers/md/dm-kcopyd.c | 2 +-
drivers/media/dvb-core/dvb_net.c | 4 +-
drivers/media/i2c/tvp5150.c | 2 +-
drivers/media/pci/ngene/ngene-dvb.c | 2 +-
drivers/media/pci/saa7134/saa7134-video.c | 4 +-
drivers/media/pci/ttpci/av7110_ir.c | 8 +-
drivers/media/pci/ttpci/av7110_v4l.c | 4 +-
drivers/media/platform/m2m-deinterlace.c | 2 +-
drivers/media/platform/mx2_emmaprp.c | 2 +-
drivers/media/rc/ir-rc6-decoder.c | 4 +-
drivers/media/usb/gspca/etoms.c | 16 +-
drivers/media/usb/gspca/gspca.c | 22 +-
drivers/media/usb/gspca/jeilinj.c | 2 +-
drivers/media/usb/gspca/mars.c | 2 +-
drivers/media/usb/gspca/mr97310a.c | 6 +-
drivers/media/usb/gspca/ov519.c | 2 +-
drivers/media/usb/gspca/pac207.c | 4 +-
drivers/media/usb/gspca/pac7302.c | 6 +-
drivers/media/usb/gspca/pac7311.c | 4 +-
drivers/media/usb/gspca/sn9c2028.c | 6 +-
drivers/media/usb/gspca/sonixj.c | 14 +-
drivers/media/usb/gspca/sq930x.c | 2 +-
drivers/media/usb/gspca/t613.c | 72 +++---
drivers/media/usb/gspca/topro.c | 10 +-
drivers/media/usb/gspca/zc3xx.c | 2 +-
drivers/media/usb/uvc/uvc_ctrl.c | 6 +-
drivers/media/usb/uvc/uvc_driver.c | 52 ++---
drivers/media/usb/uvc/uvc_v4l2.c | 12 +-
drivers/media/usb/uvc/uvc_video.c | 2 +-
drivers/media/v4l2-core/v4l2-mem2mem.c | 4 +-
drivers/media/v4l2-core/videobuf2-dma-contig.c | 6 +-
drivers/media/v4l2-core/videobuf2-dma-sg.c | 4 +-
drivers/mfd/t7l66xb.c | 2 +-
drivers/mfd/tc6393xb.c | 2 +-
drivers/mfd/tps65010.c | 16 +-
drivers/misc/apds990x.c | 2 +-
drivers/misc/bh1770glc.c | 2 +-
drivers/misc/eeprom/at25.c | 2 +-
drivers/misc/ibmasm/r_heartbeat.c | 4 +-
drivers/mtd/devices/m25p80.c | 2 +-
drivers/mtd/devices/mtd_dataflash.c | 6 +-
drivers/net/ethernet/marvell/skge.c | 2 +-
drivers/net/ethernet/mellanox/mlx4/alloc.c | 4 +-
drivers/net/ethernet/mellanox/mlx4/cmd.c | 2 +-
drivers/net/ethernet/mellanox/mlx4/en_resources.c | 4 +-
drivers/net/ethernet/mellanox/mlx4/en_rx.c | 2 +-
drivers/net/ethernet/mellanox/mlx4/en_tx.c | 2 +-
drivers/net/ethernet/mellanox/mlx4/eq.c | 18 +-
drivers/net/ethernet/mellanox/mlx4/icm.c | 2 +-
drivers/net/ethernet/mellanox/mlx4/intf.c | 2 +-
drivers/net/ethernet/mellanox/mlx4/main.c | 4 +-
drivers/net/ethernet/mellanox/mlx4/mcg.c | 12 +-
drivers/net/ethernet/mellanox/mlx4/mr.c | 6 +-
drivers/net/ethernet/mellanox/mlx4/qp.c | 4 +-
.../net/ethernet/mellanox/mlx4/resource_tracker.c | 24 +-
drivers/net/usb/mcs7830.c | 4 +-
drivers/net/usb/net1080.c | 14 +-
drivers/net/usb/pegasus.c | 2 +-
drivers/net/usb/rndis_host.c | 42 ++--
drivers/net/usb/sierra_net.c | 4 +-
drivers/net/usb/usbnet.c | 12 +-
drivers/net/usb/zaurus.c | 6 +-
drivers/net/virtio_net.c | 2 +-
drivers/net/wan/sbni.c | 6 +-
drivers/net/wireless/marvell/mwifiex/scan.c | 3 +-
drivers/net/wireless/rndis_wlan.c | 6 +-
drivers/oprofile/oprofile_perf.c | 2 +-
drivers/parport/parport_serial.c | 2 +-
drivers/parport/probe.c | 2 +-
drivers/pcmcia/bfin_cf_pcmcia.c | 2 +-
drivers/pcmcia/omap_cf.c | 2 +-
drivers/rapidio/rio.c | 2 +-
drivers/s390/crypto/zcrypt_api.c | 4 +-
drivers/scsi/aha152x.c | 2 +-
drivers/scsi/lpfc/lpfc_init.c | 8 +-
drivers/scsi/ultrastor.c | 2 +-
drivers/scsi/virtio_scsi.c | 2 +-
drivers/scsi/vmw_pvscsi.c | 4 +-
drivers/spi/spi-lm70llp.c | 2 +-
drivers/spi/spi-mpc512x-psc.c | 4 +-
drivers/spi/spi-mpc52xx-psc.c | 4 +-
drivers/spi/spi-mpc52xx.c | 2 +-
drivers/spi/spi-omap-uwire.c | 2 +-
drivers/spi/spi-omap2-mcspi.c | 4 +-
drivers/spi/spi-ppc4xx.c | 4 +-
drivers/staging/most/hdm-dim2/dim2_hdm.c | 4 +-
drivers/staging/rdma/ehca/ehca_qp.c | 2 +-
drivers/staging/rdma/ehca/ehca_uverbs.c | 2 +-
drivers/staging/rdma/ipath/ipath_driver.c | 4 +-
drivers/staging/rdma/ipath/ipath_eeprom.c | 12 +-
drivers/staging/rdma/ipath/ipath_file_ops.c | 4 +-
drivers/staging/rdma/ipath/ipath_fs.c | 8 +-
drivers/staging/rdma/ipath/ipath_iba6110.c | 6 +-
drivers/staging/rdma/ipath/ipath_init_chip.c | 2 +-
drivers/staging/rdma/ipath/ipath_intr.c | 10 +-
drivers/staging/rdma/ipath/ipath_mmap.c | 2 +-
drivers/staging/rdma/ipath/ipath_mr.c | 10 +-
drivers/staging/rdma/ipath/ipath_rc.c | 4 +-
drivers/staging/rdma/ipath/ipath_ruc.c | 4 +-
drivers/staging/rdma/ipath/ipath_stats.c | 8 +-
drivers/staging/rdma/ipath/ipath_sysfs.c | 4 +-
drivers/staging/rdma/ipath/ipath_uc.c | 2 +-
drivers/staging/rdma/ipath/ipath_ud.c | 2 +-
drivers/staging/rdma/ipath/ipath_verbs.c | 10 +-
drivers/staging/rdma/ipath/ipath_verbs_mcast.c | 4 +-
drivers/target/target_core_spc.c | 2 +-
drivers/tty/pty.c | 4 +-
drivers/tty/serial/8250/8250_of.c | 2 +-
drivers/tty/serial/crisv10.c | 6 +-
drivers/tty/vt/vt_ioctl.c | 4 +-
drivers/usb/class/cdc-acm.c | 6 +-
drivers/usb/core/hcd.c | 12 +-
drivers/usb/core/hub.c | 12 +-
drivers/usb/core/sysfs.c | 4 +-
drivers/usb/core/usb.c | 4 +-
drivers/usb/gadget/composite.c | 7 +-
drivers/usb/gadget/function/f_acm.c | 4 +-
drivers/usb/gadget/function/f_ecm.c | 20 +-
drivers/usb/gadget/function/f_eem.c | 4 +-
drivers/usb/gadget/function/f_fs.c | 10 +-
drivers/usb/gadget/function/f_hid.c | 4 +-
drivers/usb/gadget/function/f_loopback.c | 2 +-
drivers/usb/gadget/function/f_mass_storage.c | 2 +-
drivers/usb/gadget/function/f_ncm.c | 22 +-
drivers/usb/gadget/function/f_phonet.c | 12 +-
drivers/usb/gadget/function/f_rndis.c | 16 +-
drivers/usb/gadget/function/f_serial.c | 2 +-
drivers/usb/gadget/function/f_subset.c | 10 +-
drivers/usb/gadget/function/f_uac1.c | 2 +-
drivers/usb/gadget/function/f_uac2.c | 50 ++--
drivers/usb/gadget/function/rndis.c | 4 +-
drivers/usb/gadget/function/storage_common.c | 2 +-
drivers/usb/gadget/function/u_ether.c | 2 +-
drivers/usb/gadget/legacy/acm_ms.c | 2 +-
drivers/usb/gadget/legacy/audio.c | 2 +-
drivers/usb/gadget/legacy/cdc2.c | 2 +-
drivers/usb/gadget/legacy/dbgp.c | 8 +-
drivers/usb/gadget/legacy/ether.c | 2 +-
drivers/usb/gadget/legacy/g_ffs.c | 2 +-
drivers/usb/gadget/legacy/hid.c | 2 +-
drivers/usb/gadget/legacy/inode.c | 18 +-
drivers/usb/gadget/legacy/mass_storage.c | 2 +-
drivers/usb/gadget/legacy/multi.c | 2 +-
drivers/usb/gadget/legacy/ncm.c | 2 +-
drivers/usb/gadget/legacy/printer.c | 2 +-
drivers/usb/gadget/legacy/zero.c | 2 +-
drivers/usb/gadget/udc/dummy_hcd.c | 6 +-
drivers/usb/gadget/udc/fsl_udc_core.c | 2 +-
drivers/usb/gadget/udc/goku_udc.c | 4 +-
drivers/usb/gadget/udc/mv_u3d_core.c | 2 +-
drivers/usb/gadget/udc/mv_udc_core.c | 2 +-
drivers/usb/gadget/udc/omap_udc.c | 6 +-
drivers/usb/gadget/udc/pch_udc.c | 12 +-
drivers/usb/gadget/udc/pxa25x_udc.c | 2 +-
drivers/usb/gadget/udc/pxa27x_udc.c | 4 +-
drivers/usb/host/ehci-dbg.c | 16 +-
drivers/usb/host/ehci-mem.c | 8 +-
drivers/usb/host/ehci-sched.c | 8 +-
drivers/usb/host/isp116x-hcd.c | 2 +-
drivers/usb/host/isp1362-hcd.c | 2 +-
drivers/usb/host/ohci-dbg.c | 2 +-
drivers/usb/host/ohci-hcd.c | 2 +-
drivers/usb/host/ohci-mem.c | 4 +-
drivers/usb/host/oxu210hp-hcd.c | 12 +-
drivers/usb/host/sl811-hcd.c | 2 +-
drivers/usb/host/xhci-mem.c | 6 +-
drivers/usb/musb/cppi_dma.c | 2 +-
drivers/usb/musb/musb_gadget.c | 4 +-
drivers/usb/musb/musb_gadget_ep0.c | 2 +-
drivers/usb/musb/musb_host.c | 2 +-
drivers/usb/phy/phy-isp1301-omap.c | 4 +-
drivers/usb/renesas_usbhs/mod_gadget.c | 2 +-
drivers/usb/serial/pl2303.c | 4 +-
drivers/usb/storage/sddr55.c | 10 +-
drivers/vhost/net.c | 16 +-
drivers/vhost/scsi.c | 10 +-
drivers/vhost/test.c | 8 +-
drivers/vhost/vhost.c | 62 ++---
drivers/video/console/sticore.c | 4 +-
drivers/video/fbdev/carminefb.c | 4 +-
drivers/video/fbdev/omap2/omapfb/omapfb-main.c | 2 +-
drivers/video/fbdev/tmiofb.c | 2 +-
drivers/virtio/virtio_balloon.c | 2 +-
drivers/virtio/virtio_mmio.c | 24 +-
drivers/virtio/virtio_pci_common.c | 16 +-
drivers/virtio/virtio_pci_modern.c | 24 +-
fs/autofs4/expire.c | 2 +-
fs/autofs4/waitq.c | 2 +-
fs/binfmt_elf.c | 4 +-
fs/char_dev.c | 2 +-
fs/cifs/connect.c | 2 +-
fs/compat.c | 6 +-
fs/hpfs/namei.c | 8 +-
fs/isofs/inode.c | 4 +-
fs/proc/task_mmu.c | 2 +-
fs/pstore/inode.c | 2 +-
fs/statfs.c | 2 +-
fs/xfs/uuid.c | 2 +-
init/initramfs.c | 2 +-
ipc/compat_mq.c | 4 +-
kernel/fork.c | 2 +-
kernel/power/suspend_test.c | 2 +-
kernel/ptrace.c | 4 +-
kernel/signal.c | 2 +-
kernel/sys.c | 2 +-
kernel/time/posix-cpu-timers.c | 8 +-
lib/mpi/mpi-pow.c | 2 +-
lib/mpi/mpih-mul.c | 4 +-
lib/mpi/mpiutil.c | 2 +-
net/9p/trans_rdma.c | 6 +-
net/atm/br2684.c | 6 +-
net/atm/pppoatm.c | 2 +-
net/compat.c | 2 +-
net/core/scm.c | 2 +-
net/openvswitch/flow_table.c | 2 +-
net/rds/ib_rdma.c | 2 +-
net/rds/iw.c | 2 +-
net/rds/iw_rdma.c | 2 +-
net/sunrpc/xprtrdma/svc_rdma_sendto.c | 4 +-
net/sunrpc/xprtrdma/svc_rdma_transport.c | 8 +-
security/keys/encrypted-keys/encrypted.c | 20 +-
security/keys/trusted.c | 20 +-
security/selinux/hooks.c | 4 +-
security/selinux/ss/conditional.c | 4 +-
security/selinux/ss/ebitmap.c | 2 +-
security/selinux/ss/policydb.c | 15 +-
sound/core/sound.c | 2 +-
sound/soc/codecs/tlv320aic26.c | 2 +-
sound/soc/codecs/wm8983.c | 4 +-
sound/soc/codecs/wm8985.c | 4 +-
sound/soc/fsl/mpc5200_dma.c | 8 +-
sound/soc/soc-core.c | 6 +-
sound/spi/at73c213.c | 2 +-
tools/firewire/nosy-dump.c | 12 +-
tools/power/cpupower/utils/helpers/msr.c | 4 +-
tools/power/x86/turbostat/turbostat.c | 4 +-
.../x86_energy_perf_policy.c | 12 +-
tools/spi/spidev_fdx.c | 10 +-
tools/testing/selftests/vm/thuge-gen.c | 4 +-
tools/usb/testusb.c | 14 +-
tools/virtio/ringtest/main.c | 8 +-
tools/virtio/ringtest/ring.c | 10 +-
tools/virtio/ringtest/virtio_ring_0_9.c | 4 +-
tools/virtio/virtio_test.c | 12 +-
usr/gen_init_cpio.c | 2 +-
408 files changed, 1613 insertions(+), 1618 deletions(-)
diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c
index b20af76f12c1..4b69ebf30bc2 100644
--- a/arch/alpha/kernel/setup.c
+++ b/arch/alpha/kernel/setup.c
@@ -559,9 +559,9 @@ setup_arch(char **cmdline_p)
boot flags depending on the boot mode, we need some shorthand.
This should do for installation. */
if (strcmp(COMMAND_LINE, "INSTALL") == 0) {
- strlcpy(command_line, "root=/dev/fd0 load_ramdisk=1", sizeof command_line);
+ strlcpy(command_line, "root=/dev/fd0 load_ramdisk=1", sizeof(command_line));
} else {
- strlcpy(command_line, COMMAND_LINE, sizeof command_line);
+ strlcpy(command_line, COMMAND_LINE, sizeof(command_line));
}
strcpy(boot_command_line, command_line);
*cmdline_p = command_line;
diff --git a/arch/alpha/oprofile/common.c b/arch/alpha/oprofile/common.c
index 310a4ce1dccc..6ea17fc12255 100644
--- a/arch/alpha/oprofile/common.c
+++ b/arch/alpha/oprofile/common.c
@@ -114,7 +114,7 @@ op_axp_create_files(struct dentry *root)
struct dentry *dir;
char buf[4];
- snprintf(buf, sizeof buf, "%d", i);
+ snprintf(buf, sizeof(buf), "%d", i);
dir = oprofilefs_mkdir(root, buf);
oprofilefs_create_ulong(dir, "enabled", &ctr[i].enabled);
diff --git a/arch/arm/common/mcpm_entry.c b/arch/arm/common/mcpm_entry.c
index a923524d1040..5b05511204d5 100644
--- a/arch/arm/common/mcpm_entry.c
+++ b/arch/arm/common/mcpm_entry.c
@@ -426,7 +426,7 @@ int __init mcpm_sync_init(
{
unsigned int i, j, mpidr, this_cluster;
- BUILD_BUG_ON(MCPM_SYNC_CLUSTER_SIZE * MAX_NR_CLUSTERS != sizeof mcpm_sync);
+ BUILD_BUG_ON(MCPM_SYNC_CLUSTER_SIZE * MAX_NR_CLUSTERS != sizeof(mcpm_sync));
BUG_ON((unsigned long)&mcpm_sync & (__CACHE_WRITEBACK_GRANULE - 1));
/*
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
index 7a20507a3eef..68fd04841cdd 100644
--- a/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@ -314,7 +314,7 @@ evm_led_setup(struct i2c_client *client, int gpio, unsigned ngpio, void *c)
*/
evm_led_dev = platform_device_alloc("leds-gpio", 0);
platform_device_add_data(evm_led_dev,
- &evm_led_data, sizeof evm_led_data);
+ &evm_led_data, sizeof(evm_led_data));
evm_led_dev->dev.parent = &client->dev;
status = platform_device_add(evm_led_dev);
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
index 1cb6f2f02880..7434525d1a2a 100644
--- a/arch/arm/mach-ixp4xx/common.c
+++ b/arch/arm/mach-ixp4xx/common.c
@@ -348,7 +348,7 @@ static struct pxa2xx_udc_mach_info ixp4xx_udc_info;
void __init ixp4xx_set_udc_info(struct pxa2xx_udc_mach_info *info)
{
- memcpy(&ixp4xx_udc_info, info, sizeof *info);
+ memcpy(&ixp4xx_udc_info, info, sizeof(*info));
}
static struct resource ixp4xx_udc_resources[] = {
diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c
index 37d8d85662f0..2d390b52f98c 100644
--- a/arch/arm/mach-pxa/devices.c
+++ b/arch/arm/mach-pxa/devices.c
@@ -95,7 +95,7 @@ static struct pxa2xx_udc_mach_info pxa_udc_info = {
void __init pxa_set_udc_info(struct pxa2xx_udc_mach_info *info)
{
- memcpy(&pxa_udc_info, info, sizeof *info);
+ memcpy(&pxa_udc_info, info, sizeof(*info));
}
static struct resource pxa2xx_udc_resources[] = {
diff --git a/arch/arm/mach-u300/dummyspichip.c b/arch/arm/mach-u300/dummyspichip.c
index 68fe986ca42e..4e23239c21e7 100644
--- a/arch/arm/mach-u300/dummyspichip.c
+++ b/arch/arm/mach-u300/dummyspichip.c
@@ -222,7 +222,7 @@ static int pl022_dummy_probe(struct spi_device *spi)
dev_info(&spi->dev, "probing dummy SPI device\n");
- p_dummy = kzalloc(sizeof *p_dummy, GFP_KERNEL);
+ p_dummy = kzalloc(sizeof(*p_dummy), GFP_KERNEL);
if (!p_dummy)
return -ENOMEM;
diff --git a/arch/cris/arch-v10/kernel/traps.c b/arch/cris/arch-v10/kernel/traps.c
index 7001beda716c..929e0d07e861 100644
--- a/arch/cris/arch-v10/kernel/traps.c
+++ b/arch/cris/arch-v10/kernel/traps.c
@@ -119,7 +119,7 @@ handle_BUG(struct pt_regs *regs)
unsigned char c;
unsigned long irp = regs->irp;
- if (__copy_from_user(&f, (const void __user *)(irp - 8), sizeof f))
+ if (__copy_from_user(&f, (const void __user *)(irp - 8), sizeof(f)))
return;
if (f.prefix != BUG_PREFIX || f.magic != BUG_MAGIC)
return;
diff --git a/arch/cris/arch-v32/mach-a3/pinmux.c b/arch/cris/arch-v32/mach-a3/pinmux.c
index 591f77526746..5993aea23c68 100644
--- a/arch/cris/arch-v32/mach-a3/pinmux.c
+++ b/arch/cris/arch-v32/mach-a3/pinmux.c
@@ -83,7 +83,7 @@ int
crisv32_pinmux_alloc_fixed(enum fixed_function function)
{
int ret = -EINVAL;
- char saved[sizeof pins];
+ char saved[sizeof(pins)];
unsigned long flags;
reg_pinmux_rw_hwprot hwprot;
reg_clkgen_rw_clk_ctrl clk_ctrl;
@@ -91,7 +91,7 @@ crisv32_pinmux_alloc_fixed(enum fixed_function function)
spin_lock_irqsave(&pinmux_lock, flags);
/* Save internal data for recovery */
- memcpy(saved, pins, sizeof pins);
+ memcpy(saved, pins, sizeof(pins));
crisv32_pinmux_init(); /* must be done before we read rw_hwprot */
@@ -203,7 +203,7 @@ crisv32_pinmux_alloc_fixed(enum fixed_function function)
REG_WR(pinmux, regi_pinmux, rw_hwprot, hwprot);
REG_WR(clkgen, regi_clkgen, rw_clk_ctrl, clk_ctrl);
} else
- memcpy(pins, saved, sizeof pins);
+ memcpy(pins, saved, sizeof(pins));
spin_unlock_irqrestore(&pinmux_lock, flags);
@@ -261,14 +261,14 @@ int
crisv32_pinmux_dealloc_fixed(enum fixed_function function)
{
int ret = -EINVAL;
- char saved[sizeof pins];
+ char saved[sizeof(pins)];
unsigned long flags;
reg_pinmux_rw_hwprot hwprot;
spin_lock_irqsave(&pinmux_lock, flags);
/* Save internal data for recovery */
- memcpy(saved, pins, sizeof pins);
+ memcpy(saved, pins, sizeof(pins));
crisv32_pinmux_init(); /* must be done before we read rw_hwprot */
@@ -361,7 +361,7 @@ crisv32_pinmux_dealloc_fixed(enum fixed_function function)
if (!ret)
REG_WR(pinmux, regi_pinmux, rw_hwprot, hwprot);
else
- memcpy(pins, saved, sizeof pins);
+ memcpy(pins, saved, sizeof(pins));
spin_unlock_irqrestore(&pinmux_lock, flags);
diff --git a/arch/cris/arch-v32/mach-fs/pinmux.c b/arch/cris/arch-v32/mach-fs/pinmux.c
index d8a3a3c439dd..7ae63ec82e63 100644
--- a/arch/cris/arch-v32/mach-fs/pinmux.c
+++ b/arch/cris/arch-v32/mach-fs/pinmux.c
@@ -93,14 +93,14 @@ int crisv32_pinmux_alloc(int port, int first_pin, int last_pin,
int crisv32_pinmux_alloc_fixed(enum fixed_function function)
{
int ret = -EINVAL;
- char saved[sizeof pins];
+ char saved[sizeof(pins)];
unsigned long flags;
reg_pinmux_rw_hwprot hwprot;
spin_lock_irqsave(&pinmux_lock, flags);
/* Save internal data for recovery */
- memcpy(saved, pins, sizeof pins);
+ memcpy(saved, pins, sizeof(pins));
crisv32_pinmux_init(); /* Must be done before we read rw_hwprot */
@@ -168,7 +168,7 @@ int crisv32_pinmux_alloc_fixed(enum fixed_function function)
if (!ret)
REG_WR(pinmux, regi_pinmux, rw_hwprot, hwprot);
else
- memcpy(pins, saved, sizeof pins);
+ memcpy(pins, saved, sizeof(pins));
spin_unlock_irqrestore(&pinmux_lock, flags);
@@ -228,14 +228,14 @@ int crisv32_pinmux_dealloc(int port, int first_pin, int last_pin)
int crisv32_pinmux_dealloc_fixed(enum fixed_function function)
{
int ret = -EINVAL;
- char saved[sizeof pins];
+ char saved[sizeof(pins)];
unsigned long flags;
reg_pinmux_rw_hwprot hwprot;
spin_lock_irqsave(&pinmux_lock, flags);
/* Save internal data for recovery */
- memcpy(saved, pins, sizeof pins);
+ memcpy(saved, pins, sizeof(pins));
crisv32_pinmux_init(); /* Must be done before we read rw_hwprot */
@@ -303,7 +303,7 @@ int crisv32_pinmux_dealloc_fixed(enum fixed_function function)
if (!ret)
REG_WR(pinmux, regi_pinmux, rw_hwprot, hwprot);
else
- memcpy(pins, saved, sizeof pins);
+ memcpy(pins, saved, sizeof(pins));
spin_unlock_irqrestore(&pinmux_lock, flags);
diff --git a/arch/cris/arch-v32/mm/intmem.c b/arch/cris/arch-v32/mm/intmem.c
index 9ef56092a4c5..fc8c4b075eef 100644
--- a/arch/cris/arch-v32/mm/intmem.c
+++ b/arch/cris/arch-v32/mm/intmem.c
@@ -34,7 +34,7 @@ static void crisv32_intmem_init(void)
static int initiated = 0;
if (!initiated) {
struct intmem_allocation* alloc;
- alloc = kmalloc(sizeof *alloc, GFP_KERNEL);
+ alloc = kmalloc(sizeof(*alloc), GFP_KERNEL);
INIT_LIST_HEAD(&intmem_allocations);
intmem_virtual = ioremap(MEM_INTMEM_START + RESERVED_SIZE,
MEM_INTMEM_SIZE - RESERVED_SIZE);
@@ -63,7 +63,7 @@ void* crisv32_intmem_alloc(unsigned size, unsigned align)
allocation->size >= size + alignment) {
if (allocation->size > size + alignment) {
struct intmem_allocation* alloc;
- alloc = kmalloc(sizeof *alloc, GFP_ATOMIC);
+ alloc = kmalloc(sizeof(*alloc), GFP_ATOMIC);
alloc->status = STATUS_FREE;
alloc->size = allocation->size - size -
alignment;
@@ -73,7 +73,7 @@ void* crisv32_intmem_alloc(unsigned size, unsigned align)
if (alignment) {
struct intmem_allocation *tmp;
- tmp = kmalloc(sizeof *tmp, GFP_ATOMIC);
+ tmp = kmalloc(sizeof(*tmp), GFP_ATOMIC);
tmp->offset = allocation->offset;
tmp->size = alignment;
tmp->status = STATUS_FREE;
diff --git a/arch/cris/boot/tools/build.c b/arch/cris/boot/tools/build.c
index c8adef364160..af0b5dc2ee39 100644
--- a/arch/cris/boot/tools/build.c
+++ b/arch/cris/boot/tools/build.c
@@ -141,7 +141,7 @@ int main(int argc, char ** argv)
minor_root = DEFAULT_MINOR_ROOT;
}
fprintf(stderr, "Root device is (%d, %d)\n", major_root, minor_root);
- for (i=0;i<sizeof buf; i++) buf[i]=0;
+ for (i=0;i<sizeof(buf); i++) buf[i]=0;
if ((id=open(argv[1],O_RDONLY,0))<0)
die("Unable to open 'boot'");
if (read(id,buf,MINIX_HEADER) != MINIX_HEADER)
@@ -158,7 +158,7 @@ int main(int argc, char ** argv)
die("Non-Minix header of 'boot'");
if (((long *) buf)[7] != 0)
die("Illegal symbol table in 'boot'");
- i=read(id,buf,sizeof buf);
+ i=read(id,buf,sizeof(buf));
fprintf(stderr,"Boot sector %d bytes.\n",i);
if (i != 512)
die("Boot block must be exactly 512 bytes");
@@ -187,7 +187,7 @@ int main(int argc, char ** argv)
die("Non-Minix header of 'setup'");
if (((long *) buf)[7] != 0)
die("Illegal symbol table in 'setup'");
- for (i=0 ; (c=read(id,buf,sizeof buf))>0 ; i+=c )
+ for (i=0 ; (c=read(id,buf,sizeof(buf)))>0 ; i+=c )
#ifdef __BIG_KERNEL__
{
if (!i) {
@@ -217,7 +217,7 @@ int main(int argc, char ** argv)
if (setup_sectors < SETUP_SECTS)
setup_sectors = SETUP_SECTS;
fprintf(stderr,"Setup is %d bytes.\n",i);
- for (c=0 ; c<sizeof(buf) ; c++)
+ for (c=0 ; c<sizeof(buf); c++)
buf[c] = '\0';
while (i < setup_sectors * 512) {
c = setup_sectors * 512 - i;
diff --git a/arch/ia64/kernel/mca_drv.c b/arch/ia64/kernel/mca_drv.c
index 94f8bf777afa..452130a4c9b4 100644
--- a/arch/ia64/kernel/mca_drv.c
+++ b/arch/ia64/kernel/mca_drv.c
@@ -343,7 +343,7 @@ init_record_index_pools(void)
/* - 2 - */
sect_min_size = sal_log_sect_min_sizes[0];
- for (i = 1; i < sizeof sal_log_sect_min_sizes/sizeof(size_t); i++)
+ for (i = 1; i < sizeof(sal_log_sect_min_sizes)/sizeof(size_t); i++)
if (sect_min_size > sal_log_sect_min_sizes[i])
sect_min_size = sal_log_sect_min_sizes[i];
diff --git a/arch/m68k/bvme6000/rtc.c b/arch/m68k/bvme6000/rtc.c
index cf12a17dc289..43a97e7f9afe 100644
--- a/arch/m68k/bvme6000/rtc.c
+++ b/arch/m68k/bvme6000/rtc.c
@@ -64,7 +64,7 @@ static long rtc_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
} while (wtime.tm_sec != bcd2bin(rtc->bcd_sec));
rtc->msr = msr;
local_irq_restore(flags);
- return copy_to_user(argp, &wtime, sizeof wtime) ?
+ return copy_to_user(argp, &wtime, sizeof(wtime)) ?
-EFAULT : 0;
}
case RTC_SET_TIME: /* Set the RTC */
diff --git a/arch/m68k/mvme16x/rtc.c b/arch/m68k/mvme16x/rtc.c
index 1755e2f7137d..2e41e1684a1e 100644
--- a/arch/m68k/mvme16x/rtc.c
+++ b/arch/m68k/mvme16x/rtc.c
@@ -59,7 +59,7 @@ static long rtc_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
wtime.tm_wday = bcd2bin(rtc->bcd_dow)-1;
rtc->ctrl = 0;
local_irq_restore(flags);
- return copy_to_user(argp, &wtime, sizeof wtime) ?
+ return copy_to_user(argp, &wtime, sizeof(wtime)) ?
-EFAULT : 0;
}
case RTC_SET_TIME: /* Set the RTC */
diff --git a/arch/mips/boot/elf2ecoff.c b/arch/mips/boot/elf2ecoff.c
index 266c8137e859..ac9b23f8b8ac 100644
--- a/arch/mips/boot/elf2ecoff.c
+++ b/arch/mips/boot/elf2ecoff.c
@@ -77,8 +77,8 @@ static void copy(int out, int in, off_t offset, off_t size)
remaining = size;
while (remaining) {
cur = remaining;
- if (cur > sizeof ibuf)
- cur = sizeof ibuf;
+ if (cur > sizeof(ibuf))
+ cur = sizeof(ibuf);
remaining -= cur;
if ((count = read(in, ibuf, cur)) != cur) {
fprintf(stderr, "copy: read: %s\n",
@@ -302,8 +302,8 @@ int main(int argc, char *argv[])
}
/* Read the header, which is at the beginning of the file... */
- i = read(infile, &ex, sizeof ex);
- if (i != sizeof ex) {
+ i = read(infile, &ex, sizeof(ex));
+ if (i != sizeof(ex)) {
fprintf(stderr, "ex: %s: %s.\n",
argv[1],
i ? strerror(errno) : "End of file reached");
@@ -425,7 +425,7 @@ int main(int argc, char *argv[])
eah.data_start = data.vaddr;
eah.bss_start = bss.vaddr;
eah.gprmask = 0xf3fffffe;
- memset(&eah.cprmask, '\0', sizeof eah.cprmask);
+ memset(&eah.cprmask, '\0', sizeof(eah.cprmask));
eah.gp_value = 0; /* unused. */
if (format_bigendian)
@@ -440,10 +440,10 @@ int main(int argc, char *argv[])
efh.f_timdat = 0; /* bogus */
efh.f_symptr = 0;
efh.f_nsyms = 0;
- efh.f_opthdr = sizeof eah;
+ efh.f_opthdr = sizeof(eah);
efh.f_flags = 0x100f; /* Stripped, not sharable. */
- memset(esecs, 0, sizeof esecs);
+ memset(esecs, 0, sizeof(esecs));
strcpy(esecs[0].s_name, ".text");
strcpy(esecs[1].s_name, ".data");
strcpy(esecs[2].s_name, ".bss");
@@ -511,8 +511,8 @@ int main(int argc, char *argv[])
if (must_convert_endian)
convert_ecoff_filehdr(&efh);
/* Write the headers... */
- i = write(outfile, &efh, sizeof efh);
- if (i != sizeof efh) {
+ i = write(outfile, &efh, sizeof(efh));
+ if (i != sizeof(efh)) {
perror("efh: write");
exit(1);
@@ -527,8 +527,8 @@ int main(int argc, char *argv[])
if (must_convert_endian)
convert_ecoff_aouthdr(&eah);
- i = write(outfile, &eah, sizeof eah);
- if (i != sizeof eah) {
+ i = write(outfile, &eah, sizeof(eah));
+ if (i != sizeof(eah)) {
perror("eah: write");
exit(1);
}
@@ -576,13 +576,12 @@ int main(int argc, char *argv[])
fprintf(stderr,
"Warning: %ld byte intersegment gap.\n",
gap);
- memset(obuf, 0, sizeof obuf);
+ memset(obuf, 0, sizeof(obuf));
while (gap) {
int count =
write(outfile, obuf,
(gap >
- sizeof obuf ? sizeof
- obuf : gap));
+ sizeof(obuf) ? sizeof(obuf) : gap));
if (count < 0) {
fprintf(stderr,
"Error writing gap: %s\n",
@@ -607,7 +606,7 @@ int main(int argc, char *argv[])
*/
{
char obuf[4096];
- memset(obuf, 0, sizeof obuf);
+ memset(obuf, 0, sizeof(obuf));
if (write(outfile, obuf, sizeof(obuf)) != sizeof(obuf)) {
fprintf(stderr, "Error writing PROM padding: %s\n",
strerror(errno));
diff --git a/arch/mips/kernel/module.c b/arch/mips/kernel/module.c
index 1833f5171ccd..733219f4486e 100644
--- a/arch/mips/kernel/module.c
+++ b/arch/mips/kernel/module.c
@@ -94,7 +94,7 @@ static int apply_r_mips_hi16_rel(struct module *me, u32 *location, Elf_Addr v)
* the carry we need to add. Save the information, and let LO16 do the
* actual relocation.
*/
- n = kmalloc(sizeof *n, GFP_KERNEL);
+ n = kmalloc(sizeof(*n), GFP_KERNEL);
if (!n)
return -ENOMEM;
diff --git a/arch/mips/oprofile/common.c b/arch/mips/oprofile/common.c
index 3c9ec3ddca84..1870546fd678 100644
--- a/arch/mips/oprofile/common.c
+++ b/arch/mips/oprofile/common.c
@@ -43,7 +43,7 @@ static int op_mips_create_files(struct dentry *root)
struct dentry *dir;
char buf[4];
- snprintf(buf, sizeof buf, "%d", i);
+ snprintf(buf, sizeof(buf), "%d", i);
dir = oprofilefs_mkdir(root, buf);
oprofilefs_create_ulong(dir, "enabled", &ctr[i].enabled);
diff --git a/arch/mips/sgi-ip22/ip22-gio.c b/arch/mips/sgi-ip22/ip22-gio.c
index cdf187600010..1835763bb4e2 100644
--- a/arch/mips/sgi-ip22/ip22-gio.c
+++ b/arch/mips/sgi-ip22/ip22-gio.c
@@ -358,7 +358,7 @@ static void ip22_check_gio(int slotno, unsigned long addr, int irq)
}
printk(KERN_INFO "GIO: slot %d : %s (id %x)\n",
slotno, name, id);
- gio_dev = kzalloc(sizeof *gio_dev, GFP_KERNEL);
+ gio_dev = kzalloc(sizeof(*gio_dev), GFP_KERNEL);
gio_dev->name = name;
gio_dev->slotno = slotno;
gio_dev->id.id = id;
diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c
index 91c2a39cd5aa..86215afe34ab 100644
--- a/arch/parisc/kernel/cache.c
+++ b/arch/parisc/kernel/cache.c
@@ -239,7 +239,7 @@ parisc_cache_init(void)
#ifndef CONFIG_PA20
if (pdc_btlb_info(&btlb_info) < 0) {
- memset(&btlb_info, 0, sizeof btlb_info);
+ memset(&btlb_info, 0, sizeof(btlb_info));
}
#endif
diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c
index 809905a811ed..10b0a896a44d 100644
--- a/arch/parisc/kernel/process.c
+++ b/arch/parisc/kernel/process.c
@@ -171,7 +171,7 @@ int dump_fpu (struct pt_regs * regs, elf_fpregset_t *r)
if (regs == NULL)
return 0;
- memcpy(r, regs->fr, sizeof *r);
+ memcpy(r, regs->fr, sizeof(*r));
return 1;
}
diff --git a/arch/parisc/math-emu/driver.c b/arch/parisc/math-emu/driver.c
index 09ef4136c693..30b51d24098b 100644
--- a/arch/parisc/math-emu/driver.c
+++ b/arch/parisc/math-emu/driver.c
@@ -92,7 +92,7 @@ handle_fpe(struct pt_regs *regs)
*/
__u64 frcopy[36];
- memcpy(frcopy, regs->fr, sizeof regs->fr);
+ memcpy(frcopy, regs->fr, sizeof(regs->fr));
frcopy[32] = 0;
memcpy(&orig_sw, frcopy, sizeof(orig_sw));
@@ -114,7 +114,7 @@ handle_fpe(struct pt_regs *regs)
printk(KERN_DEBUG "\n");
}
- memcpy(regs->fr, frcopy, sizeof regs->fr);
+ memcpy(regs->fr, frcopy, sizeof(regs->fr));
if (signalcode != 0) {
si.si_signo = signalcode >> 24;
si.si_errno = 0;
diff --git a/arch/powerpc/crypto/sha1.c b/arch/powerpc/crypto/sha1.c
index c154cebc1041..9fa3db4c2af5 100644
--- a/arch/powerpc/crypto/sha1.c
+++ b/arch/powerpc/crypto/sha1.c
@@ -99,7 +99,7 @@ static int sha1_final(struct shash_desc *desc, u8 *out)
dst[i] = cpu_to_be32(sctx->state[i]);
/* Wipe context */
- memset(sctx, 0, sizeof *sctx);
+ memset(sctx, 0, sizeof(*sctx));
return 0;
}
diff --git a/arch/powerpc/kernel/kgdb.c b/arch/powerpc/kernel/kgdb.c
index e77c3ccf8dcf..abad4a656a39 100644
--- a/arch/powerpc/kernel/kgdb.c
+++ b/arch/powerpc/kernel/kgdb.c
@@ -175,15 +175,15 @@ static int kgdb_singlestep(struct pt_regs *regs)
if (thread_info != exception_thread_info) {
/* Save the original current_thread_info. */
- memcpy(backup_current_thread_info, exception_thread_info, sizeof *thread_info);
- memcpy(exception_thread_info, thread_info, sizeof *thread_info);
+ memcpy(backup_current_thread_info, exception_thread_info, sizeof(*thread_info));
+ memcpy(exception_thread_info, thread_info, sizeof(*thread_info));
}
kgdb_handle_exception(0, SIGTRAP, 0, regs);
if (thread_info != exception_thread_info)
/* Restore current_thread_info lastly. */
- memcpy(exception_thread_info, backup_current_thread_info, sizeof *thread_info);
+ memcpy(exception_thread_info, backup_current_thread_info, sizeof(*thread_info));
return 1;
}
diff --git a/arch/powerpc/oprofile/common.c b/arch/powerpc/oprofile/common.c
index bf094c5a4bd9..de02342a3c63 100644
--- a/arch/powerpc/oprofile/common.c
+++ b/arch/powerpc/oprofile/common.c
@@ -159,7 +159,7 @@ static int op_powerpc_create_files(struct dentry *root)
struct dentry *dir;
char buf[4];
- snprintf(buf, sizeof buf, "%d", i);
+ snprintf(buf, sizeof(buf), "%d", i);
dir = oprofilefs_mkdir(root, buf);
oprofilefs_create_ulong(dir, "enabled", &ctr[i].enabled);
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
index 3048e34db6d8..d1a77befdf18 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
@@ -724,7 +724,7 @@ static int mpc52xx_gpt_probe(struct platform_device *ofdev)
{
struct mpc52xx_gpt_priv *gpt;
- gpt = devm_kzalloc(&ofdev->dev, sizeof *gpt, GFP_KERNEL);
+ gpt = devm_kzalloc(&ofdev->dev, sizeof(*gpt), GFP_KERNEL);
if (!gpt)
return -ENOMEM;
diff --git a/arch/powerpc/platforms/cell/spufs/context.c b/arch/powerpc/platforms/cell/spufs/context.c
index 3b4152faeb1f..64116dd10c24 100644
--- a/arch/powerpc/platforms/cell/spufs/context.c
+++ b/arch/powerpc/platforms/cell/spufs/context.c
@@ -37,7 +37,7 @@ struct spu_context *alloc_spu_context(struct spu_gang *gang)
{
struct spu_context *ctx;
- ctx = kzalloc(sizeof *ctx, GFP_KERNEL);
+ ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
if (!ctx)
goto out;
/* Binding to physical processor deferred
diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
index 2936a0044c04..da5641c151f8 100644
--- a/arch/powerpc/platforms/cell/spufs/file.c
+++ b/arch/powerpc/platforms/cell/spufs/file.c
@@ -477,7 +477,7 @@ __spufs_regs_read(struct spu_context *ctx, char __user *buffer,
{
struct spu_lscsa *lscsa = ctx->csa.lscsa;
return simple_read_from_buffer(buffer, size, pos,
- lscsa->gprs, sizeof lscsa->gprs);
+ lscsa->gprs, sizeof(lscsa->gprs));
}
static ssize_t
@@ -668,7 +668,7 @@ static ssize_t spufs_mbox_stat_read(struct file *file, char __user *buf,
spu_release(ctx);
- if (copy_to_user(buf, &mbox_stat, sizeof mbox_stat))
+ if (copy_to_user(buf, &mbox_stat, sizeof(mbox_stat)))
return -EFAULT;
return 4;
@@ -817,7 +817,7 @@ static ssize_t spufs_ibox_stat_read(struct file *file, char __user *buf,
ibox_stat = (ctx->ops->mbox_stat_read(ctx) >> 16) & 0xff;
spu_release(ctx);
- if (copy_to_user(buf, &ibox_stat, sizeof ibox_stat))
+ if (copy_to_user(buf, &ibox_stat, sizeof(ibox_stat)))
return -EFAULT;
return 4;
@@ -967,7 +967,7 @@ static ssize_t spufs_wbox_stat_read(struct file *file, char __user *buf,
wbox_stat = (ctx->ops->mbox_stat_read(ctx) >> 8) & 0xff;
spu_release(ctx);
- if (copy_to_user(buf, &wbox_stat, sizeof wbox_stat))
+ if (copy_to_user(buf, &wbox_stat, sizeof(wbox_stat)))
return -EFAULT;
return 4;
@@ -1695,11 +1695,11 @@ static ssize_t spufs_mfc_write(struct file *file, const char __user *buffer,
struct mfc_dma_command cmd;
int ret = -EINVAL;
- if (size != sizeof cmd)
+ if (size != sizeof(cmd))
goto out;
ret = -EFAULT;
- if (copy_from_user(&cmd, buffer, sizeof cmd))
+ if (copy_from_user(&cmd, buffer, sizeof(cmd)))
goto out;
ret = spufs_check_valid_dma(&cmd);
@@ -2038,7 +2038,7 @@ static ssize_t __spufs_mbox_info_read(struct spu_context *ctx,
data = ctx->csa.prob.pu_mb_R;
- return simple_read_from_buffer(buf, len, pos, &data, sizeof data);
+ return simple_read_from_buffer(buf, len, pos, &data, sizeof(data));
}
static ssize_t spufs_mbox_info_read(struct file *file, char __user *buf,
@@ -2078,7 +2078,7 @@ static ssize_t __spufs_ibox_info_read(struct spu_context *ctx,
data = ctx->csa.priv2.puint_mb_R;
- return simple_read_from_buffer(buf, len, pos, &data, sizeof data);
+ return simple_read_from_buffer(buf, len, pos, &data, sizeof(data));
}
static ssize_t spufs_ibox_info_read(struct file *file, char __user *buf,
@@ -2173,7 +2173,7 @@ static ssize_t __spufs_dma_info_read(struct spu_context *ctx,
}
return simple_read_from_buffer(buf, len, pos, &info,
- sizeof info);
+ sizeof(info));
}
static ssize_t spufs_dma_info_read(struct file *file, char __user *buf,
@@ -2207,7 +2207,7 @@ static ssize_t __spufs_proxydma_info_read(struct spu_context *ctx,
{
struct spu_proxydma_info info;
struct mfc_cq_sr *qp, *puqp;
- int ret = sizeof info;
+ int ret = sizeof(info);
int i;
if (len < ret)
@@ -2230,7 +2230,7 @@ static ssize_t __spufs_proxydma_info_read(struct spu_context *ctx,
}
return simple_read_from_buffer(buf, len, pos, &info,
- sizeof info);
+ sizeof(info));
}
static ssize_t spufs_proxydma_info_read(struct file *file, char __user *buf,
diff --git a/arch/powerpc/platforms/cell/spufs/gang.c b/arch/powerpc/platforms/cell/spufs/gang.c
index 71a443253021..f4252e10c1fc 100644
--- a/arch/powerpc/platforms/cell/spufs/gang.c
+++ b/arch/powerpc/platforms/cell/spufs/gang.c
@@ -29,7 +29,7 @@ struct spu_gang *alloc_spu_gang(void)
{
struct spu_gang *gang;
- gang = kzalloc(sizeof *gang, GFP_KERNEL);
+ gang = kzalloc(sizeof(*gang), GFP_KERNEL);
if (!gang)
goto out;
diff --git a/arch/s390/crypto/sha_common.c b/arch/s390/crypto/sha_common.c
index 8620b0ec9c42..97f6824e4148 100644
--- a/arch/s390/crypto/sha_common.c
+++ b/arch/s390/crypto/sha_common.c
@@ -96,7 +96,7 @@ int s390_sha_final(struct shash_desc *desc, u8 *out)
/* copy digest to out */
memcpy(out, ctx->state, crypto_shash_digestsize(desc->tfm));
/* wipe context */
- memset(ctx, 0, sizeof *ctx);
+ memset(ctx, 0, sizeof(*ctx));
return 0;
}
diff --git a/arch/sparc/lib/bitext.c b/arch/sparc/lib/bitext.c
index 8ec4e9c0251a..0bfe37fc7f43 100644
--- a/arch/sparc/lib/bitext.c
+++ b/arch/sparc/lib/bitext.c
@@ -120,7 +120,7 @@ void bit_map_clear(struct bit_map *t, int offset, int len)
void bit_map_init(struct bit_map *t, unsigned long *map, int size)
{
bitmap_zero(map, size);
- memset(t, 0, sizeof *t);
+ memset(t, 0, sizeof(*t));
spin_lock_init(&t->lock);
t->map = map;
t->size = size;
diff --git a/arch/tile/kernel/backtrace.c b/arch/tile/kernel/backtrace.c
index f8b74ca83b92..1f2e8342cffc 100644
--- a/arch/tile/kernel/backtrace.c
+++ b/arch/tile/kernel/backtrace.c
@@ -311,8 +311,8 @@ static void find_caller_pc_and_caller_sp(CallerLocation *location,
* prevent any problems.
*/
unsigned int bytes_to_prefetch = 4096 - (pc & 4095);
- if (bytes_to_prefetch > sizeof prefetched_bundles)
- bytes_to_prefetch = sizeof prefetched_bundles;
+ if (bytes_to_prefetch > sizeof(prefetched_bundles))
+ bytes_to_prefetch = sizeof(prefetched_bundles);
if (!read_memory_func(prefetched_bundles, pc,
bytes_to_prefetch,
@@ -641,7 +641,7 @@ bool backtrace_next(BacktraceIterator *state)
}
/* Try to read the frame linkage data chaining to the next function. */
- if (!state->read_memory_func(&next_frame, state->fp, sizeof next_frame,
+ if (!state->read_memory_func(&next_frame, state->fp, sizeof(next_frame),
state->read_memory_func_extra)) {
return false;
}
diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c
index 16630e75f056..b553ee32891a 100644
--- a/arch/um/kernel/um_arch.c
+++ b/arch/um/kernel/um_arch.c
@@ -345,7 +345,7 @@ void __init setup_arch(char **cmdline_p)
paging_init();
strlcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
*cmdline_p = command_line;
- setup_hostinfo(host_info, sizeof host_info);
+ setup_hostinfo(host_info, sizeof(host_info));
}
void __init check_bugs(void)
diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
index 1fd7d575092e..8f297c01edc6 100644
--- a/arch/x86/boot/cpucheck.c
+++ b/arch/x86/boot/cpucheck.c
@@ -103,7 +103,7 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
{
int err;
- memset(&cpu.flags, 0, sizeof cpu.flags);
+ memset(&cpu.flags, 0, sizeof(cpu.flags));
cpu.level = 3;
if (has_eflag(X86_EFLAGS_AC))
diff --git a/arch/x86/boot/early_serial_console.c b/arch/x86/boot/early_serial_console.c
index 45a07684bbab..f764a466c4e3 100644
--- a/arch/x86/boot/early_serial_console.c
+++ b/arch/x86/boot/early_serial_console.c
@@ -45,7 +45,7 @@ static void parse_earlyprintk(void)
int pos = 0;
int port = 0;
- if (cmdline_find_option("earlyprintk", arg, sizeof arg) > 0) {
+ if (cmdline_find_option("earlyprintk", arg, sizeof(arg)) > 0) {
char *e;
if (!strncmp(arg, "serial", 6)) {
@@ -119,7 +119,7 @@ static void parse_console_uart8250(void)
* console=uart8250,io,0x3f8,115200n8
* need to make sure it is last one console !
*/
- if (cmdline_find_option("console", optstr, sizeof optstr) <= 0)
+ if (cmdline_find_option("console", optstr, sizeof(optstr)) <= 0)
return;
options = optstr;
diff --git a/arch/x86/boot/edd.c b/arch/x86/boot/edd.c
index 223e42527077..6c176b6a42ad 100644
--- a/arch/x86/boot/edd.c
+++ b/arch/x86/boot/edd.c
@@ -76,7 +76,7 @@ static int get_edd_info(u8 devno, struct edd_info *ei)
{
struct biosregs ireg, oreg;
- memset(ei, 0, sizeof *ei);
+ memset(ei, 0, sizeof(*ei));
/* Check Extensions Present */
@@ -133,7 +133,7 @@ void query_edd(void)
struct edd_info ei, *edp;
u32 *mbrptr;
- if (cmdline_find_option("edd", eddarg, sizeof eddarg) > 0) {
+ if (cmdline_find_option("edd", eddarg, sizeof(eddarg)) > 0) {
if (!strcmp(eddarg, "skipmbr") || !strcmp(eddarg, "skip")) {
do_edd = 1;
do_mbr = 0;
@@ -166,7 +166,7 @@ void query_edd(void)
*/
if (!get_edd_info(devno, &ei)
&& boot_params.eddbuf_entries < EDDMAXNR) {
- memcpy(edp, &ei, sizeof ei);
+ memcpy(edp, &ei, sizeof(ei));
edp++;
boot_params.eddbuf_entries++;
}
diff --git a/arch/x86/boot/main.c b/arch/x86/boot/main.c
index 9bcea386db65..73532543d689 100644
--- a/arch/x86/boot/main.c
+++ b/arch/x86/boot/main.c
@@ -36,8 +36,8 @@ static void copy_boot_params(void)
const struct old_cmdline * const oldcmd =
(const struct old_cmdline *)OLD_CL_ADDRESS;
- BUILD_BUG_ON(sizeof boot_params != 4096);
- memcpy(&boot_params.hdr, &hdr, sizeof hdr);
+ BUILD_BUG_ON(sizeof(boot_params) != 4096);
+ memcpy(&boot_params.hdr, &hdr, sizeof(hdr));
if (!boot_params.hdr.cmd_line_ptr &&
oldcmd->cl_magic == OLD_CL_MAGIC) {
diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
index db75d07c3645..cf1bd92873b4 100644
--- a/arch/x86/boot/memory.c
+++ b/arch/x86/boot/memory.c
@@ -26,7 +26,7 @@ static int detect_memory_e820(void)
initregs(&ireg);
ireg.ax = 0xe820;
- ireg.cx = sizeof buf;
+ ireg.cx = sizeof(buf);
ireg.edx = SMAP;
ireg.di = (size_t)&buf;
diff --git a/arch/x86/boot/regs.c b/arch/x86/boot/regs.c
index c0fb356a3092..2fe3616ba161 100644
--- a/arch/x86/boot/regs.c
+++ b/arch/x86/boot/regs.c
@@ -21,7 +21,7 @@
void initregs(struct biosregs *reg)
{
- memset(reg, 0, sizeof *reg);
+ memset(reg, 0, sizeof(*reg));
reg->eflags |= X86_EFLAGS_CF;
reg->ds = ds();
reg->es = ds();
diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
index ba3e100654db..3ecc11a9c440 100644
--- a/arch/x86/boot/video-vesa.c
+++ b/arch/x86/boot/video-vesa.c
@@ -62,7 +62,7 @@ static int vesa_probe(void)
if (mode & ~0x1ff)
continue;
- memset(&vminfo, 0, sizeof vminfo); /* Just in case... */
+ memset(&vminfo, 0, sizeof(vminfo)); /* Just in case... */
ireg.ax = 0x4f01;
ireg.cx = mode;
@@ -109,7 +109,7 @@ static int vesa_set_mode(struct mode_info *mode)
int is_graphic;
u16 vesa_mode = mode->mode - VIDEO_FIRST_VESA;
- memset(&vminfo, 0, sizeof vminfo); /* Just in case... */
+ memset(&vminfo, 0, sizeof(vminfo)); /* Just in case... */
initregs(&ireg);
ireg.ax = 0x4f01;
@@ -241,7 +241,7 @@ void vesa_store_edid(void)
struct biosregs ireg, oreg;
/* Apparently used as a nonsense token... */
- memset(&boot_params.edid_info, 0x13, sizeof boot_params.edid_info);
+ memset(&boot_params.edid_info, 0x13, sizeof(boot_params.edid_info));
if (vginfo.version < 0x0200)
return; /* EDID requires VBE 2.0+ */
diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
index 77780e386e9b..ac89b6624a40 100644
--- a/arch/x86/boot/video.c
+++ b/arch/x86/boot/video.c
@@ -115,7 +115,7 @@ static unsigned int get_entry(void)
} else if ((key >= '0' && key <= '9') ||
(key >= 'A' && key <= 'Z') ||
(key >= 'a' && key <= 'z')) {
- if (len < sizeof entry_buf) {
+ if (len < sizeof(entry_buf)) {
entry_buf[len++] = key;
putchar(key);
}
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 37830de8f60a..acdf06dd655c 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -727,7 +727,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)
#endif
c->x86_cache_alignment = c->x86_clflush_size;
- memset(&c->x86_capability, 0, sizeof c->x86_capability);
+ memset(&c->x86_capability, 0, sizeof(c->x86_capability));
c->extended_cpuid_level = 0;
if (!have_cpuid_p())
@@ -879,7 +879,7 @@ static void identify_cpu(struct cpuinfo_x86 *c)
c->x86_virt_bits = 32;
#endif
c->x86_cache_alignment = c->x86_clflush_size;
- memset(&c->x86_capability, 0, sizeof c->x86_capability);
+ memset(&c->x86_capability, 0, sizeof(c->x86_capability));
generic_identify(c);
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index a006f4cd792b..953eb59bad1b 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -2312,7 +2312,7 @@ static int mce_device_create(unsigned int cpu)
if (!mce_available(&boot_cpu_data))
return -EIO;
- dev = kzalloc(sizeof *dev, GFP_KERNEL);
+ dev = kzalloc(sizeof(*dev), GFP_KERNEL);
if (!dev)
return -ENOMEM;
dev->id = cpu;
diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c
index c870af161008..e3a372d37661 100644
--- a/arch/x86/kernel/cpu/mtrr/generic.c
+++ b/arch/x86/kernel/cpu/mtrr/generic.c
@@ -795,7 +795,7 @@ static void generic_set_all(void)
local_irq_restore(flags);
/* Use the atomic bitops to update the global mask */
- for (count = 0; count < sizeof mask * 8; ++count) {
+ for (count = 0; count < sizeof(mask) * 8; ++count) {
if (mask & 0x01)
set_bit(count, &smp_changes_mask);
mask >>= 1;
diff --git a/arch/x86/kernel/cpu/mtrr/if.c b/arch/x86/kernel/cpu/mtrr/if.c
index d76f13d6d8d6..6c2502524c6a 100644
--- a/arch/x86/kernel/cpu/mtrr/if.c
+++ b/arch/x86/kernel/cpu/mtrr/if.c
@@ -43,7 +43,7 @@ mtrr_file_add(unsigned long base, unsigned long size,
max = num_var_ranges;
if (fcount == NULL) {
- fcount = kzalloc(max * sizeof *fcount, GFP_KERNEL);
+ fcount = kzalloc(max * sizeof(*fcount), GFP_KERNEL);
if (!fcount)
return -ENOMEM;
FILE_FCOUNT(file) = fcount;
@@ -182,12 +182,12 @@ mtrr_ioctl(struct file *file, unsigned int cmd, unsigned long __arg)
case MTRRIOC_SET_PAGE_ENTRY:
case MTRRIOC_DEL_PAGE_ENTRY:
case MTRRIOC_KILL_PAGE_ENTRY:
- if (copy_from_user(&sentry, arg, sizeof sentry))
+ if (copy_from_user(&sentry, arg, sizeof(sentry)))
return -EFAULT;
break;
case MTRRIOC_GET_ENTRY:
case MTRRIOC_GET_PAGE_ENTRY:
- if (copy_from_user(&gentry, arg, sizeof gentry))
+ if (copy_from_user(&gentry, arg, sizeof(gentry)))
return -EFAULT;
break;
#ifdef CONFIG_COMPAT
@@ -340,7 +340,7 @@ mtrr_ioctl(struct file *file, unsigned int cmd, unsigned long __arg)
switch (cmd) {
case MTRRIOC_GET_ENTRY:
case MTRRIOC_GET_PAGE_ENTRY:
- if (copy_to_user(arg, &gentry, sizeof gentry))
+ if (copy_to_user(arg, &gentry, sizeof(gentry)))
err = -EFAULT;
break;
#ifdef CONFIG_COMPAT
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
index 569c1e4f96fe..cc3521216046 100644
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
@@ -302,7 +302,7 @@ int __init sanitize_e820_map(struct e820entry *biosmap, int max_nr_map,
chg_nr = chgidx;
/* sort change-point list by memory addresses (low -> high) */
- sort(change_point, chg_nr, sizeof *change_point, cpcompare, NULL);
+ sort(change_point, chg_nr, sizeof(*change_point), cpcompare, NULL);
/* create a new bios memory map, removing overlaps */
overlap_entries = 0; /* number of entries in the overlap table */
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
index 2c0f3407bd1f..16313eeabf7f 100644
--- a/arch/x86/kernel/head64.c
+++ b/arch/x86/kernel/head64.c
@@ -129,7 +129,7 @@ static void __init copy_bootdata(char *real_mode_data)
char * command_line;
unsigned long cmd_line_ptr;
- memcpy(&boot_params, real_mode_data, sizeof boot_params);
+ memcpy(&boot_params, real_mode_data, sizeof(boot_params));
sanitize_boot_params(&boot_params);
cmd_line_ptr = get_cmd_line_ptr();
if (cmd_line_ptr) {
diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
index 64f9616f93f1..f56dcbff3105 100644
--- a/arch/x86/kernel/msr.c
+++ b/arch/x86/kernel/msr.c
@@ -114,14 +114,14 @@ static long msr_ioctl(struct file *file, unsigned int ioc, unsigned long arg)
err = -EBADF;
break;
}
- if (copy_from_user(®s, uregs, sizeof regs)) {
+ if (copy_from_user(®s, uregs, sizeof(regs))) {
err = -EFAULT;
break;
}
err = rdmsr_safe_regs_on_cpu(cpu, regs);
if (err)
break;
- if (copy_to_user(uregs, ®s, sizeof regs))
+ if (copy_to_user(uregs, ®s, sizeof(regs)))
err = -EFAULT;
break;
@@ -130,14 +130,14 @@ static long msr_ioctl(struct file *file, unsigned int ioc, unsigned long arg)
err = -EBADF;
break;
}
- if (copy_from_user(®s, uregs, sizeof regs)) {
+ if (copy_from_user(®s, uregs, sizeof(regs))) {
err = -EFAULT;
break;
}
err = wrmsr_safe_regs_on_cpu(cpu, regs);
if (err)
break;
- if (copy_to_user(uregs, ®s, sizeof regs))
+ if (copy_to_user(uregs, ®s, sizeof(regs)))
err = -EFAULT;
break;
diff --git a/arch/x86/kvm/assigned-dev.c b/arch/x86/kvm/assigned-dev.c
index 9dc091acd5fb..38c6d76186c9 100644
--- a/arch/x86/kvm/assigned-dev.c
+++ b/arch/x86/kvm/assigned-dev.c
@@ -982,7 +982,7 @@ long kvm_vm_ioctl_assigned_device(struct kvm *kvm, unsigned ioctl,
struct kvm_assigned_pci_dev assigned_dev;
r = -EFAULT;
- if (copy_from_user(&assigned_dev, argp, sizeof assigned_dev))
+ if (copy_from_user(&assigned_dev, argp, sizeof(assigned_dev)))
goto out;
r = kvm_vm_ioctl_assign_device(kvm, &assigned_dev);
if (r)
@@ -997,7 +997,7 @@ long kvm_vm_ioctl_assigned_device(struct kvm *kvm, unsigned ioctl,
struct kvm_assigned_irq assigned_irq;
r = -EFAULT;
- if (copy_from_user(&assigned_irq, argp, sizeof assigned_irq))
+ if (copy_from_user(&assigned_irq, argp, sizeof(assigned_irq)))
goto out;
r = kvm_vm_ioctl_assign_irq(kvm, &assigned_irq);
if (r)
@@ -1008,7 +1008,7 @@ long kvm_vm_ioctl_assigned_device(struct kvm *kvm, unsigned ioctl,
struct kvm_assigned_irq assigned_irq;
r = -EFAULT;
- if (copy_from_user(&assigned_irq, argp, sizeof assigned_irq))
+ if (copy_from_user(&assigned_irq, argp, sizeof(assigned_irq)))
goto out;
r = kvm_vm_ioctl_deassign_dev_irq(kvm, &assigned_irq);
if (r)
@@ -1019,7 +1019,7 @@ long kvm_vm_ioctl_assigned_device(struct kvm *kvm, unsigned ioctl,
struct kvm_assigned_pci_dev assigned_dev;
r = -EFAULT;
- if (copy_from_user(&assigned_dev, argp, sizeof assigned_dev))
+ if (copy_from_user(&assigned_dev, argp, sizeof(assigned_dev)))
goto out;
r = kvm_vm_ioctl_deassign_device(kvm, &assigned_dev);
if (r)
@@ -1029,7 +1029,7 @@ long kvm_vm_ioctl_assigned_device(struct kvm *kvm, unsigned ioctl,
case KVM_ASSIGN_SET_MSIX_NR: {
struct kvm_assigned_msix_nr entry_nr;
r = -EFAULT;
- if (copy_from_user(&entry_nr, argp, sizeof entry_nr))
+ if (copy_from_user(&entry_nr, argp, sizeof(entry_nr)))
goto out;
r = kvm_vm_ioctl_set_msix_nr(kvm, &entry_nr);
if (r)
@@ -1039,7 +1039,7 @@ long kvm_vm_ioctl_assigned_device(struct kvm *kvm, unsigned ioctl,
case KVM_ASSIGN_SET_MSIX_ENTRY: {
struct kvm_assigned_msix_entry entry;
r = -EFAULT;
- if (copy_from_user(&entry, argp, sizeof entry))
+ if (copy_from_user(&entry, argp, sizeof(entry)))
goto out;
r = kvm_vm_ioctl_set_msix_entry(kvm, &entry);
if (r)
@@ -1050,7 +1050,7 @@ long kvm_vm_ioctl_assigned_device(struct kvm *kvm, unsigned ioctl,
struct kvm_assigned_pci_dev assigned_dev;
r = -EFAULT;
- if (copy_from_user(&assigned_dev, argp, sizeof assigned_dev))
+ if (copy_from_user(&assigned_dev, argp, sizeof(assigned_dev)))
goto out;
r = kvm_vm_ioctl_set_pci_irq_mask(kvm, &assigned_dev);
break;
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index 1505587d06e9..54206cd20635 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -1449,7 +1449,7 @@ static int read_interrupt_descriptor(struct x86_emulate_ctxt *ctxt,
return emulate_gp(ctxt, index << 3 | 0x2);
addr = dt.address + index * 8;
- return ctxt->ops->read_std(ctxt, addr, desc, sizeof *desc,
+ return ctxt->ops->read_std(ctxt, addr, desc, sizeof(*desc),
&ctxt->exception);
}
@@ -1463,7 +1463,7 @@ static void get_descriptor_table_ptr(struct x86_emulate_ctxt *ctxt,
struct desc_struct desc;
u16 sel;
- memset (dt, 0, sizeof *dt);
+ memset (dt, 0, sizeof(*dt));
if (!ops->get_segment(ctxt, &sel, &desc, &base3,
VCPU_SREG_LDTR))
return;
@@ -1528,7 +1528,7 @@ static int write_segment_descriptor(struct x86_emulate_ctxt *ctxt,
if (rc != X86EMUL_CONTINUE)
return rc;
- return ctxt->ops->write_std(ctxt, addr, desc, sizeof *desc,
+ return ctxt->ops->write_std(ctxt, addr, desc, sizeof(*desc),
&ctxt->exception);
}
@@ -1548,7 +1548,7 @@ static int __load_segment_descriptor(struct x86_emulate_ctxt *ctxt,
u16 dummy;
u32 base3 = 0;
- memset(&seg_desc, 0, sizeof seg_desc);
+ memset(&seg_desc, 0, sizeof(seg_desc));
if (ctxt->mode == X86EMUL_MODE_REAL) {
/* set real mode segment descriptor (keep limit etc. for
@@ -2958,19 +2958,19 @@ static int task_switch_16(struct x86_emulate_ctxt *ctxt,
int ret;
u32 new_tss_base = get_desc_base(new_desc);
- ret = ops->read_std(ctxt, old_tss_base, &tss_seg, sizeof tss_seg,
+ ret = ops->read_std(ctxt, old_tss_base, &tss_seg, sizeof(tss_seg),
&ctxt->exception);
if (ret != X86EMUL_CONTINUE)
return ret;
save_state_to_tss16(ctxt, &tss_seg);
- ret = ops->write_std(ctxt, old_tss_base, &tss_seg, sizeof tss_seg,
+ ret = ops->write_std(ctxt, old_tss_base, &tss_seg, sizeof(tss_seg),
&ctxt->exception);
if (ret != X86EMUL_CONTINUE)
return ret;
- ret = ops->read_std(ctxt, new_tss_base, &tss_seg, sizeof tss_seg,
+ ret = ops->read_std(ctxt, new_tss_base, &tss_seg, sizeof(tss_seg),
&ctxt->exception);
if (ret != X86EMUL_CONTINUE)
return ret;
@@ -2980,7 +2980,7 @@ static int task_switch_16(struct x86_emulate_ctxt *ctxt,
ret = ops->write_std(ctxt, new_tss_base,
&tss_seg.prev_task_link,
- sizeof tss_seg.prev_task_link,
+ sizeof(tss_seg.prev_task_link),
&ctxt->exception);
if (ret != X86EMUL_CONTINUE)
return ret;
@@ -3104,7 +3104,7 @@ static int task_switch_32(struct x86_emulate_ctxt *ctxt,
u32 eip_offset = offsetof(struct tss_segment_32, eip);
u32 ldt_sel_offset = offsetof(struct tss_segment_32, ldt_selector);
- ret = ops->read_std(ctxt, old_tss_base, &tss_seg, sizeof tss_seg,
+ ret = ops->read_std(ctxt, old_tss_base, &tss_seg, sizeof(tss_seg),
&ctxt->exception);
if (ret != X86EMUL_CONTINUE)
return ret;
@@ -3117,7 +3117,7 @@ static int task_switch_32(struct x86_emulate_ctxt *ctxt,
if (ret != X86EMUL_CONTINUE)
return ret;
- ret = ops->read_std(ctxt, new_tss_base, &tss_seg, sizeof tss_seg,
+ ret = ops->read_std(ctxt, new_tss_base, &tss_seg, sizeof(tss_seg),
&ctxt->exception);
if (ret != X86EMUL_CONTINUE)
return ret;
@@ -3127,7 +3127,7 @@ static int task_switch_32(struct x86_emulate_ctxt *ctxt,
ret = ops->write_std(ctxt, new_tss_base,
&tss_seg.prev_task_link,
- sizeof tss_seg.prev_task_link,
+ sizeof(tss_seg.prev_task_link),
&ctxt->exception);
if (ret != X86EMUL_CONTINUE)
return ret;
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index 36591faed13b..e78fac6dddf3 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -1900,7 +1900,7 @@ void kvm_apic_post_state_restore(struct kvm_vcpu *vcpu,
kvm_lapic_set_base(vcpu, vcpu->arch.apic_base);
/* set SPIV separately to get count of SW disabled APICs right */
apic_set_spiv(apic, *((u32 *)(s->regs + APIC_SPIV)));
- memcpy(vcpu->arch.apic->regs, s->regs, sizeof *s);
+ memcpy(vcpu->arch.apic->regs, s->regs, sizeof(*s));
/* call kvm_apic_set_id() to put apic into apic_map */
kvm_apic_set_id(apic, kvm_apic_id(apic));
kvm_apic_set_version(vcpu);
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 4244c2baf57d..d08837260c78 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -2491,7 +2491,7 @@ static int msr_io(struct kvm_vcpu *vcpu, struct kvm_msrs __user *user_msrs,
unsigned size;
r = -EFAULT;
- if (copy_from_user(&msrs, user_msrs, sizeof msrs))
+ if (copy_from_user(&msrs, user_msrs, sizeof(msrs)))
goto out;
r = -E2BIG;
@@ -2637,11 +2637,11 @@ long kvm_arch_dev_ioctl(struct file *filp,
unsigned n;
r = -EFAULT;
- if (copy_from_user(&msr_list, user_msr_list, sizeof msr_list))
+ if (copy_from_user(&msr_list, user_msr_list, sizeof(msr_list)))
goto out;
n = msr_list.nmsrs;
msr_list.nmsrs = num_msrs_to_save + num_emulated_msrs;
- if (copy_to_user(user_msr_list, &msr_list, sizeof msr_list))
+ if (copy_to_user(user_msr_list, &msr_list, sizeof(msr_list)))
goto out;
r = -E2BIG;
if (n < msr_list.nmsrs)
@@ -2663,7 +2663,7 @@ long kvm_arch_dev_ioctl(struct file *filp,
struct kvm_cpuid2 cpuid;
r = -EFAULT;
- if (copy_from_user(&cpuid, cpuid_arg, sizeof cpuid))
+ if (copy_from_user(&cpuid, cpuid_arg, sizeof(cpuid)))
goto out;
r = kvm_dev_ioctl_get_cpuid(&cpuid, cpuid_arg->entries,
@@ -2672,7 +2672,7 @@ long kvm_arch_dev_ioctl(struct file *filp,
goto out;
r = -EFAULT;
- if (copy_to_user(cpuid_arg, &cpuid, sizeof cpuid))
+ if (copy_to_user(cpuid_arg, &cpuid, sizeof(cpuid)))
goto out;
r = 0;
break;
@@ -2682,7 +2682,7 @@ long kvm_arch_dev_ioctl(struct file *filp,
mce_cap = KVM_MCE_CAP_SUPPORTED;
r = -EFAULT;
- if (copy_to_user(argp, &mce_cap, sizeof mce_cap))
+ if (copy_to_user(argp, &mce_cap, sizeof(mce_cap)))
goto out;
r = 0;
break;
@@ -2767,7 +2767,7 @@ static int kvm_vcpu_ioctl_get_lapic(struct kvm_vcpu *vcpu,
if (vcpu->arch.apicv_active)
kvm_x86_ops->sync_pir_to_irr(vcpu);
- memcpy(s->regs, vcpu->arch.apic->regs, sizeof *s);
+ memcpy(s->regs, vcpu->arch.apic->regs, sizeof(*s));
return 0;
}
@@ -3271,7 +3271,7 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
struct kvm_interrupt irq;
r = -EFAULT;
- if (copy_from_user(&irq, argp, sizeof irq))
+ if (copy_from_user(&irq, argp, sizeof(irq)))
goto out;
r = kvm_vcpu_ioctl_interrupt(vcpu, &irq);
break;
@@ -3289,7 +3289,7 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
struct kvm_cpuid cpuid;
r = -EFAULT;
- if (copy_from_user(&cpuid, cpuid_arg, sizeof cpuid))
+ if (copy_from_user(&cpuid, cpuid_arg, sizeof(cpuid)))
goto out;
r = kvm_vcpu_ioctl_set_cpuid(vcpu, &cpuid, cpuid_arg->entries);
break;
@@ -3299,7 +3299,7 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
struct kvm_cpuid2 cpuid;
r = -EFAULT;
- if (copy_from_user(&cpuid, cpuid_arg, sizeof cpuid))
+ if (copy_from_user(&cpuid, cpuid_arg, sizeof(cpuid)))
goto out;
r = kvm_vcpu_ioctl_set_cpuid2(vcpu, &cpuid,
cpuid_arg->entries);
@@ -3310,14 +3310,14 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
struct kvm_cpuid2 cpuid;
r = -EFAULT;
- if (copy_from_user(&cpuid, cpuid_arg, sizeof cpuid))
+ if (copy_from_user(&cpuid, cpuid_arg, sizeof(cpuid)))
goto out;
r = kvm_vcpu_ioctl_get_cpuid2(vcpu, &cpuid,
cpuid_arg->entries);
if (r)
goto out;
r = -EFAULT;
- if (copy_to_user(cpuid_arg, &cpuid, sizeof cpuid))
+ if (copy_to_user(cpuid_arg, &cpuid, sizeof(cpuid)))
goto out;
r = 0;
break;
@@ -3332,13 +3332,13 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
struct kvm_tpr_access_ctl tac;
r = -EFAULT;
- if (copy_from_user(&tac, argp, sizeof tac))
+ if (copy_from_user(&tac, argp, sizeof(tac)))
goto out;
r = vcpu_ioctl_tpr_access_reporting(vcpu, &tac);
if (r)
goto out;
r = -EFAULT;
- if (copy_to_user(argp, &tac, sizeof tac))
+ if (copy_to_user(argp, &tac, sizeof(tac)))
goto out;
r = 0;
break;
@@ -3350,7 +3350,7 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
if (!lapic_in_kernel(vcpu))
goto out;
r = -EFAULT;
- if (copy_from_user(&va, argp, sizeof va))
+ if (copy_from_user(&va, argp, sizeof(va)))
goto out;
r = kvm_lapic_set_vapic_addr(vcpu, va.vapic_addr);
break;
@@ -3359,7 +3359,7 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
u64 mcg_cap;
r = -EFAULT;
- if (copy_from_user(&mcg_cap, argp, sizeof mcg_cap))
+ if (copy_from_user(&mcg_cap, argp, sizeof(mcg_cap)))
goto out;
r = kvm_vcpu_ioctl_x86_setup_mce(vcpu, mcg_cap);
break;
@@ -3368,7 +3368,7 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
struct kvm_x86_mce mce;
r = -EFAULT;
- if (copy_from_user(&mce, argp, sizeof mce))
+ if (copy_from_user(&mce, argp, sizeof(mce)))
goto out;
r = kvm_vcpu_ioctl_x86_set_mce(vcpu, &mce);
break;
@@ -3789,7 +3789,7 @@ long kvm_arch_vm_ioctl(struct file *filp,
u64 ident_addr;
r = -EFAULT;
- if (copy_from_user(&ident_addr, argp, sizeof ident_addr))
+ if (copy_from_user(&ident_addr, argp, sizeof(ident_addr)))
goto out;
r = kvm_vm_ioctl_set_identity_map_addr(kvm, ident_addr);
break;
@@ -3876,7 +3876,7 @@ long kvm_arch_vm_ioctl(struct file *filp,
if (r)
goto get_irqchip_out;
r = -EFAULT;
- if (copy_to_user(argp, chip, sizeof *chip))
+ if (copy_to_user(argp, chip, sizeof(*chip)))
goto get_irqchip_out;
r = 0;
get_irqchip_out:
@@ -3922,7 +3922,7 @@ long kvm_arch_vm_ioctl(struct file *filp,
}
case KVM_SET_PIT: {
r = -EFAULT;
- if (copy_from_user(&u.ps, argp, sizeof u.ps))
+ if (copy_from_user(&u.ps, argp, sizeof(u.ps)))
goto out;
r = -ENXIO;
if (!kvm->arch.vpit)
@@ -7013,7 +7013,7 @@ int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu,
sregs->efer = vcpu->arch.efer;
sregs->apic_base = kvm_get_apic_base(vcpu);
- memset(sregs->interrupt_bitmap, 0, sizeof sregs->interrupt_bitmap);
+ memset(sregs->interrupt_bitmap, 0, sizeof(sregs->interrupt_bitmap));
if (vcpu->arch.interrupt.pending && !vcpu->arch.interrupt.soft)
set_bit(vcpu->arch.interrupt.nr,
@@ -7241,7 +7241,7 @@ int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu)
fpu->last_opcode = fxsave->fop;
fpu->last_ip = fxsave->rip;
fpu->last_dp = fxsave->rdp;
- memcpy(fpu->xmm, fxsave->xmm_space, sizeof fxsave->xmm_space);
+ memcpy(fpu->xmm, fxsave->xmm_space, sizeof(fxsave->xmm_space));
return 0;
}
@@ -7258,7 +7258,7 @@ int kvm_arch_vcpu_ioctl_set_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu)
fxsave->fop = fpu->last_opcode;
fxsave->rip = fpu->last_ip;
fxsave->rdp = fpu->last_dp;
- memcpy(fxsave->xmm_space, fpu->xmm, sizeof fxsave->xmm_space);
+ memcpy(fxsave->xmm_space, fpu->xmm, sizeof(fxsave->xmm_space));
return 0;
}
diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
index 0c2fae8d929d..4a3b61ddecc5 100644
--- a/arch/x86/tools/relocs.c
+++ b/arch/x86/tools/relocs.c
@@ -128,7 +128,7 @@ static void regex_init(int use_real_mode)
REG_EXTENDED|REG_NOSUB);
if (err) {
- regerror(err, &sym_regex_c[i], errbuf, sizeof errbuf);
+ regerror(err, &sym_regex_c[i], errbuf, sizeof(errbuf));
die("%s", errbuf);
}
}
@@ -402,7 +402,7 @@ static void read_shdrs(FILE *fp)
}
for (i = 0; i < ehdr.e_shnum; i++) {
struct section *sec = &secs[i];
- if (fread(&shdr, sizeof shdr, 1, fp) != 1)
+ if (fread(&shdr, sizeof(shdr), 1, fp) != 1)
die("Cannot read ELF section headers %d/%d: %s\n",
i, ehdr.e_shnum, strerror(errno));
sec->shdr.sh_name = elf_word_to_cpu(shdr.sh_name);
diff --git a/drivers/acpi/acpi_video.c b/drivers/acpi/acpi_video.c
index a76f8be1bfe7..8bfac37f0acf 100644
--- a/drivers/acpi/acpi_video.c
+++ b/drivers/acpi/acpi_video.c
@@ -811,7 +811,7 @@ acpi_video_init_brightness(struct acpi_video_device *device)
goto out;
}
- br->levels = kmalloc((obj->package.count + 2) * sizeof *(br->levels),
+ br->levels = kmalloc((obj->package.count + 2) * sizeof(*(br->levels)),
GFP_KERNEL);
if (!br->levels) {
result = -ENOMEM;
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c
index 0fa211e2831c..f65316db40ff 100644
--- a/drivers/ata/sata_promise.c
+++ b/drivers/ata/sata_promise.c
@@ -1223,7 +1223,7 @@ static int pdc_ata_init_one(struct pci_dev *pdev,
dev_err(&pdev->dev, "failed to allocate host\n");
return -ENOMEM;
}
- hpriv = devm_kzalloc(&pdev->dev, sizeof *hpriv, GFP_KERNEL);
+ hpriv = devm_kzalloc(&pdev->dev, sizeof(*hpriv), GFP_KERNEL);
if (!hpriv)
return -ENOMEM;
spin_lock_init(&hpriv->hard_reset_lock);
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
index 7d00f2994738..108e6bdeda09 100644
--- a/drivers/atm/iphase.c
+++ b/drivers/atm/iphase.c
@@ -2753,7 +2753,7 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
if (!dev->phy->ioctl) return -EINVAL;
return dev->phy->ioctl(dev,cmd,arg);
}
- if (copy_from_user(&ia_cmds, arg, sizeof ia_cmds)) return -EFAULT;
+ if (copy_from_user(&ia_cmds, arg, sizeof(ia_cmds))) return -EFAULT;
board = ia_cmds.status;
if ((board < 0) || (board > iadev_count))
board = 0;
diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
index ce43ae3e87b3..7bcae6680a34 100644
--- a/drivers/atm/lanai.c
+++ b/drivers/atm/lanai.c
@@ -2127,7 +2127,7 @@ static int lanai_dev_open(struct atm_dev *atmdev)
lanai->nbound = 0;
#endif
lanai->cbrvcc = NULL;
- memset(&lanai->stats, 0, sizeof lanai->stats);
+ memset(&lanai->stats, 0, sizeof(lanai->stats));
spin_lock_init(&lanai->endtxlock);
spin_lock_init(&lanai->servicelock);
atmdev->ci_range.vpi_bits = 0;
diff --git a/drivers/base/isa.c b/drivers/base/isa.c
index 91dba65d7264..536127790a4e 100644
--- a/drivers/base/isa.c
+++ b/drivers/base/isa.c
@@ -126,7 +126,7 @@ int isa_register_driver(struct isa_driver *isa_driver, unsigned int ndev)
for (id = 0; id < ndev; id++) {
struct isa_dev *isa_dev;
- isa_dev = kzalloc(sizeof *isa_dev, GFP_KERNEL);
+ isa_dev = kzalloc(sizeof(*isa_dev), GFP_KERNEL);
if (!isa_dev) {
error = -ENOMEM;
break;
diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
index a7b46798c81d..77990d414b9f 100644
--- a/drivers/base/power/sysfs.c
+++ b/drivers/base/power/sysfs.c
@@ -115,9 +115,9 @@ static ssize_t control_store(struct device * dev, struct device_attribute *attr,
if (cp)
len = cp - buf;
device_lock(dev);
- if (len == sizeof ctrl_auto - 1 && strncmp(buf, ctrl_auto, len) == 0)
+ if (len == sizeof(ctrl_auto) - 1 && strncmp(buf, ctrl_auto, len) == 0)
pm_runtime_allow(dev);
- else if (len == sizeof ctrl_on - 1 && strncmp(buf, ctrl_on, len) == 0)
+ else if (len == sizeof(ctrl_on) - 1 && strncmp(buf, ctrl_on, len) == 0)
pm_runtime_forbid(dev);
else
n = -EINVAL;
@@ -355,11 +355,11 @@ wake_store(struct device * dev, struct device_attribute *attr,
cp = memchr(buf, '\n', n);
if (cp)
len = cp - buf;
- if (len == sizeof _enabled - 1
- && strncmp(buf, _enabled, sizeof _enabled - 1) == 0)
+ if (len == sizeof(_enabled) - 1
+ && strncmp(buf, _enabled, sizeof(_enabled) - 1) == 0)
device_set_wakeup_enable(dev, 1);
- else if (len == sizeof _disabled - 1
- && strncmp(buf, _disabled, sizeof _disabled - 1) == 0)
+ else if (len == sizeof(_disabled) - 1
+ && strncmp(buf, _disabled, sizeof(_disabled) - 1) == 0)
device_set_wakeup_enable(dev, 0);
else
return -EINVAL;
@@ -576,9 +576,9 @@ static ssize_t async_store(struct device *dev, struct device_attribute *attr,
cp = memchr(buf, '\n', n);
if (cp)
len = cp - buf;
- if (len == sizeof _enabled - 1 && strncmp(buf, _enabled, len) == 0)
+ if (len == sizeof(_enabled) - 1 && strncmp(buf, _enabled, len) == 0)
device_enable_async_suspend(dev);
- else if (len == sizeof _disabled - 1 &&
+ else if (len == sizeof(_disabled) - 1 &&
strncmp(buf, _disabled, len) == 0)
device_disable_async_suspend(dev);
else
diff --git a/drivers/base/regmap/regcache-lzo.c b/drivers/base/regmap/regcache-lzo.c
index 6f77d7319fc6..0e675ed1532e 100644
--- a/drivers/base/regmap/regcache-lzo.c
+++ b/drivers/base/regmap/regcache-lzo.c
@@ -162,7 +162,7 @@ static int regcache_lzo_init(struct regmap *map)
/* allocate the lzo blocks and initialize them */
for (i = 0; i < blkcount; i++) {
- lzo_blocks[i] = kzalloc(sizeof **lzo_blocks,
+ lzo_blocks[i] = kzalloc(sizeof(**lzo_blocks),
GFP_KERNEL);
if (!lzo_blocks[i]) {
kfree(sync_bmp);
diff --git a/drivers/base/regmap/regcache-rbtree.c b/drivers/base/regmap/regcache-rbtree.c
index aa56af87d941..47ca3d82976e 100644
--- a/drivers/base/regmap/regcache-rbtree.c
+++ b/drivers/base/regmap/regcache-rbtree.c
@@ -202,7 +202,7 @@ static int regcache_rbtree_init(struct regmap *map)
int i;
int ret;
- map->cache = kmalloc(sizeof *rbtree_ctx, GFP_KERNEL);
+ map->cache = kmalloc(sizeof(*rbtree_ctx), GFP_KERNEL);
if (!map->cache)
return -ENOMEM;
diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
index dd73e1ff1759..38305392403d 100644
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
@@ -65,7 +65,7 @@ static ssize_t aoedisk_show_netif(struct device *dev,
struct aoeif *ifp, *e;
char *p;
- memset(nds, 0, sizeof nds);
+ memset(nds, 0, sizeof(nds));
nd = nds;
ne = nd + ARRAY_SIZE(nds);
t = d->targets;
@@ -409,7 +409,7 @@ aoeblk_gdalloc(void *vp)
gd->fops = &aoe_bdops;
gd->private_data = d;
set_capacity(gd, d->ssize);
- snprintf(gd->disk_name, sizeof gd->disk_name, "etherd/e%ld.%d",
+ snprintf(gd->disk_name, sizeof(gd->disk_name), "etherd/e%ld.%d",
d->aoemajor, d->aoeminor);
d->flags &= ~DEVFL_GDALLOC;
diff --git a/drivers/block/aoe/aoechr.c b/drivers/block/aoe/aoechr.c
index ab41be625a53..9c52dec327df 100644
--- a/drivers/block/aoe/aoechr.c
+++ b/drivers/block/aoe/aoechr.c
@@ -85,9 +85,9 @@ revalidate(const char __user *str, size_t size)
struct sk_buff *skb;
char buf[16];
- if (size >= sizeof buf)
+ if (size >= sizeof(buf))
return -EINVAL;
- buf[sizeof buf - 1] = '\0';
+ buf[sizeof(buf) - 1] = '\0';
if (copy_from_user(buf, str, size))
return -EFAULT;
diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
index d048d2009e89..84553e3b27c5 100644
--- a/drivers/block/aoe/aoecmd.c
+++ b/drivers/block/aoe/aoecmd.c
@@ -130,8 +130,8 @@ aoehdr_atainit(struct aoedev *d, struct aoetgt *t, struct aoe_hdr *h)
{
u32 host_tag = newtag(d);
- memcpy(h->src, t->ifp->nd->dev_addr, sizeof h->src);
- memcpy(h->dst, t->addr, sizeof h->dst);
+ memcpy(h->src, t->ifp->nd->dev_addr, sizeof(h->src));
+ memcpy(h->dst, t->addr, sizeof(h->dst));
h->type = __constant_cpu_to_be16(ETH_P_AOE);
h->verfl = AOE_HVER;
h->major = cpu_to_be16(d->aoemajor);
@@ -424,19 +424,19 @@ aoecmd_cfg_pkts(ushort aoemajor, unsigned char aoeminor, struct sk_buff_head *qu
if (!is_aoe_netif(ifp))
goto cont;
- skb = new_skb(sizeof *h + sizeof *ch);
+ skb = new_skb(sizeof(*h) + sizeof(*ch));
if (skb == NULL) {
printk(KERN_INFO "aoe: skb alloc failure\n");
goto cont;
}
- skb_put(skb, sizeof *h + sizeof *ch);
+ skb_put(skb, sizeof(*h) + sizeof(*ch));
skb->dev = ifp;
__skb_queue_tail(queue, skb);
h = (struct aoe_hdr *) skb_mac_header(skb);
- memset(h, 0, sizeof *h + sizeof *ch);
+ memset(h, 0, sizeof(*h) + sizeof(*ch));
- memset(h->dst, 0xff, sizeof h->dst);
- memcpy(h->src, ifp->dev_addr, sizeof h->src);
+ memset(h->dst, 0xff, sizeof(h->dst));
+ memcpy(h->src, ifp->dev_addr, sizeof(h->src));
h->type = __constant_cpu_to_be16(ETH_P_AOE);
h->verfl = AOE_HVER;
h->major = cpu_to_be16(aoemajor);
@@ -482,8 +482,8 @@ resend(struct aoedev *d, struct frame *f)
f->tag = n;
fhash(f);
h->tag = cpu_to_be32(n);
- memcpy(h->dst, t->addr, sizeof h->dst);
- memcpy(h->src, t->ifp->nd->dev_addr, sizeof h->src);
+ memcpy(h->dst, t->addr, sizeof(h->dst));
+ memcpy(h->src, t->ifp->nd->dev_addr, sizeof(h->src));
skb->dev = t->ifp->nd;
skb = skb_clone(skb, GFP_ATOMIC);
@@ -562,7 +562,7 @@ ejectif(struct aoetgt *t, struct aoeif *ifp)
nd = ifp->nd;
e = t->ifs + NAOEIFS - 1;
- n = (e - ifp) * sizeof *ifp;
+ n = (e - ifp) * sizeof(*ifp);
memmove(ifp, ifp+1, n);
e->nd = NULL;
dev_put(nd);
@@ -1374,7 +1374,7 @@ aoecmd_ata_rsp(struct sk_buff *skb)
aoemajor = be16_to_cpu(get_unaligned(&h->major));
d = aoedev_by_aoeaddr(aoemajor, h->minor, 0);
if (d == NULL) {
- snprintf(ebuf, sizeof ebuf, "aoecmd_ata_rsp: ata response "
+ snprintf(ebuf, sizeof(ebuf), "aoecmd_ata_rsp: ata response "
"for unknown device %d.%d\n",
aoemajor, h->minor);
aoechr_error(ebuf);
@@ -1453,7 +1453,7 @@ aoecmd_ata_id(struct aoedev *d)
skb = f->skb;
h = (struct aoe_hdr *) skb_mac_header(skb);
ah = (struct aoe_atahdr *) (h+1);
- skb_put(skb, sizeof *h + sizeof *ah);
+ skb_put(skb, sizeof(*h) + sizeof(*ah));
memset(h, 0, skb->len);
f->tag = aoehdr_atainit(d, t, h);
fhash(f);
@@ -1521,7 +1521,7 @@ addtgt(struct aoedev *d, char *addr, ulong nframes)
goto nomem;
t->nframes = nframes;
t->d = d;
- memcpy(t->addr, addr, sizeof t->addr);
+ memcpy(t->addr, addr, sizeof(t->addr));
t->ifp = t->ifs;
aoecmd_wreset(t);
t->maxout = t->nframes / 2;
diff --git a/drivers/block/aoe/aoedev.c b/drivers/block/aoe/aoedev.c
index ffd1947500c6..0c55bd501875 100644
--- a/drivers/block/aoe/aoedev.c
+++ b/drivers/block/aoe/aoedev.c
@@ -313,8 +313,8 @@ flush(const char __user *str, size_t cnt, int exiting)
skipflags = DEVFL_GDALLOC | DEVFL_NEWSIZE | DEVFL_TKILL;
if (!exiting && cnt >= 3) {
- if (cnt > sizeof buf)
- cnt = sizeof buf;
+ if (cnt > sizeof(buf))
+ cnt = sizeof(buf);
if (copy_from_user(buf, str, cnt))
return -EFAULT;
all = !strncmp(buf, "all", 3);
@@ -453,7 +453,7 @@ aoedev_by_aoeaddr(ulong maj, int min, int do_alloc)
}
if (d || !do_alloc || minor_get(&sysminor, maj, min) < 0)
goto out;
- d = kcalloc(1, sizeof *d, GFP_ATOMIC);
+ d = kcalloc(1, sizeof(*d), GFP_ATOMIC);
if (!d)
goto out;
d->targets = kcalloc(NTARGETS, sizeof(*d->targets), GFP_ATOMIC);
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 63c2064689f8..88a849179209 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -519,7 +519,7 @@ cciss_proc_write(struct file *file, const char __user *buf,
return PTR_ERR(buffer);
#ifdef CONFIG_CISS_SCSI_TAPE
- if (strncmp(ENGAGE_SCSI, buffer, sizeof ENGAGE_SCSI - 1) == 0) {
+ if (strncmp(ENGAGE_SCSI, buffer, sizeof(ENGAGE_SCSI) - 1) == 0) {
struct seq_file *seq = file->private_data;
ctlr_info_t *h = seq->private;
diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
index 4f943759d376..d27a7f10df5e 100644
--- a/drivers/char/genrtc.c
+++ b/drivers/char/genrtc.c
@@ -276,7 +276,7 @@ static int gen_rtc_ioctl(struct file *file,
if (get_rtc_pll(&pll))
return -EINVAL;
else
- return copy_to_user(argp, &pll, sizeof pll) ? -EFAULT : 0;
+ return copy_to_user(argp, &pll, sizeof(pll)) ? -EFAULT : 0;
case RTC_PLL_SET:
if (!capable(CAP_SYS_TIME))
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index 35259961cc38..11a3005926d0 100644
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
@@ -712,7 +712,7 @@ static int rtc_do_ioctl(unsigned int cmd, unsigned long arg, int kernel)
return -ENOTTY;
}
return copy_to_user((void __user *)arg,
- &wtime, sizeof wtime) ? -EFAULT : 0;
+ &wtime, sizeof(wtime)) ? -EFAULT : 0;
}
static long rtc_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
diff --git a/drivers/crypto/nx/nx-aes-xcbc.c b/drivers/crypto/nx/nx-aes-xcbc.c
index c2f7d4befb55..871d69336af7 100644
--- a/drivers/crypto/nx/nx-aes-xcbc.c
+++ b/drivers/crypto/nx/nx-aes-xcbc.c
@@ -171,7 +171,7 @@ static int nx_xcbc_init(struct shash_desc *desc)
{
struct xcbc_state *sctx = shash_desc_ctx(desc);
- memset(sctx, 0, sizeof *sctx);
+ memset(sctx, 0, sizeof(*sctx));
return 0;
}
diff --git a/drivers/crypto/nx/nx-sha256.c b/drivers/crypto/nx/nx-sha256.c
index becb738c897b..5c7fdbaba180 100644
--- a/drivers/crypto/nx/nx-sha256.c
+++ b/drivers/crypto/nx/nx-sha256.c
@@ -50,7 +50,7 @@ static int nx_crypto_ctx_sha256_init(struct crypto_tfm *tfm)
static int nx_sha256_init(struct shash_desc *desc) {
struct sha256_state *sctx = shash_desc_ctx(desc);
- memset(sctx, 0, sizeof *sctx);
+ memset(sctx, 0, sizeof(*sctx));
sctx->state[0] = __cpu_to_be32(SHA256_H0);
sctx->state[1] = __cpu_to_be32(SHA256_H1);
diff --git a/drivers/crypto/nx/nx-sha512.c b/drivers/crypto/nx/nx-sha512.c
index b6e183d58d73..af2a2c0010ee 100644
--- a/drivers/crypto/nx/nx-sha512.c
+++ b/drivers/crypto/nx/nx-sha512.c
@@ -50,7 +50,7 @@ static int nx_sha512_init(struct shash_desc *desc)
{
struct sha512_state *sctx = shash_desc_ctx(desc);
- memset(sctx, 0, sizeof *sctx);
+ memset(sctx, 0, sizeof(*sctx));
sctx->state[0] = __cpu_to_be64(SHA512_H0);
sctx->state[1] = __cpu_to_be64(SHA512_H1);
diff --git a/drivers/firewire/nosy.c b/drivers/firewire/nosy.c
index 76b2d390f6ec..d82102aca91b 100644
--- a/drivers/firewire/nosy.c
+++ b/drivers/firewire/nosy.c
@@ -289,7 +289,7 @@ nosy_open(struct inode *inode, struct file *file)
if (lynx == NULL)
return -ENODEV;
- client = kmalloc(sizeof *client, GFP_KERNEL);
+ client = kmalloc(sizeof(*client), GFP_KERNEL);
if (client == NULL)
goto fail;
@@ -366,7 +366,7 @@ nosy_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
stats.lost_packet_count = client->buffer.lost_packet_count;
spin_unlock_irq(client_list_lock);
- if (copy_to_user((void __user *) arg, &stats, sizeof stats))
+ if (copy_to_user((void __user *) arg, &stats, sizeof(stats)))
return -EFAULT;
else
return 0;
@@ -547,7 +547,7 @@ add_card(struct pci_dev *dev, const struct pci_device_id *unused)
}
pci_set_master(dev);
- lynx = kzalloc(sizeof *lynx, GFP_KERNEL);
+ lynx = kzalloc(sizeof(*lynx), GFP_KERNEL);
if (lynx == NULL) {
dev_err(&dev->dev, "Failed to allocate control structure\n");
ret = -ENOMEM;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index acd066d0a805..5ebb5106b535 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
@@ -169,7 +169,7 @@ int amdgpu_crtc_page_flip(struct drm_crtc *crtc,
u64 base;
int i, r;
- work = kzalloc(sizeof *work, GFP_KERNEL);
+ work = kzalloc(sizeof(*work), GFP_KERNEL);
if (work == NULL)
return -ENOMEM;
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index 3f74193885f1..44adf9264ef7 100644
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -1350,23 +1350,23 @@ static struct drm_pending_vblank_event *create_vblank_event(
unsigned long flags;
spin_lock_irqsave(&dev->event_lock, flags);
- if (file_priv->event_space < sizeof e->event) {
+ if (file_priv->event_space < sizeof(e->event)) {
spin_unlock_irqrestore(&dev->event_lock, flags);
goto out;
}
- file_priv->event_space -= sizeof e->event;
+ file_priv->event_space -= sizeof(e->event);
spin_unlock_irqrestore(&dev->event_lock, flags);
- e = kzalloc(sizeof *e, GFP_KERNEL);
+ e = kzalloc(sizeof(*e), GFP_KERNEL);
if (e == NULL) {
spin_lock_irqsave(&dev->event_lock, flags);
- file_priv->event_space += sizeof e->event;
+ file_priv->event_space += sizeof(e->event);
spin_unlock_irqrestore(&dev->event_lock, flags);
goto out;
}
e->event.base.type = DRM_EVENT_FLIP_COMPLETE;
- e->event.base.length = sizeof e->event;
+ e->event.base.length = sizeof(e->event);
e->event.user_data = user_data;
e->base.event = &e->event.base;
e->base.file_priv = file_priv;
@@ -1382,7 +1382,7 @@ static void destroy_vblank_event(struct drm_device *dev,
unsigned long flags;
spin_lock_irqsave(&dev->event_lock, flags);
- file_priv->event_space += sizeof e->event;
+ file_priv->event_space += sizeof(e->event);
spin_unlock_irqrestore(&dev->event_lock, flags);
kfree(e);
}
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 2f00828ccc6e..4d15d40636e9 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -6504,7 +6504,7 @@ struct intel_connector *intel_connector_alloc(void)
{
struct intel_connector *connector;
- connector = kzalloc(sizeof *connector, GFP_KERNEL);
+ connector = kzalloc(sizeof(*connector), GFP_KERNEL);
if (!connector)
return NULL;
@@ -12336,7 +12336,7 @@ clear_intel_crtc_state(struct intel_crtc_state *crtc_state)
ddi_pll_sel = crtc_state->ddi_pll_sel;
force_thru = crtc_state->pch_pfit.force_thru;
- memset(crtc_state, 0, sizeof *crtc_state);
+ memset(crtc_state, 0, sizeof(*crtc_state));
crtc_state->base = tmp_state;
crtc_state->scaler_state = scaler_state;
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index 298ea1c453c3..ffd4438f2ed6 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -502,7 +502,7 @@ static int radeon_crtc_page_flip(struct drm_crtc *crtc,
unsigned long flags;
int r;
- work = kzalloc(sizeof *work, GFP_KERNEL);
+ work = kzalloc(sizeof(*work), GFP_KERNEL);
if (work == NULL)
return -ENOMEM;
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index ffe715d346d8..2158b03fd2f2 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -1038,7 +1038,7 @@ i2c_new_device(struct i2c_adapter *adap, struct i2c_board_info const *info)
struct i2c_client *client;
int status;
- client = kzalloc(sizeof *client, GFP_KERNEL);
+ client = kzalloc(sizeof(*client), GFP_KERNEL);
if (!client)
return NULL;
diff --git a/drivers/iio/industrialio-trigger.c b/drivers/iio/industrialio-trigger.c
index ae2806aafb72..0c93905d1604 100644
--- a/drivers/iio/industrialio-trigger.c
+++ b/drivers/iio/industrialio-trigger.c
@@ -267,7 +267,7 @@ struct iio_poll_func
va_list vargs;
struct iio_poll_func *pf;
- pf = kmalloc(sizeof *pf, GFP_KERNEL);
+ pf = kmalloc(sizeof(*pf), GFP_KERNEL);
if (pf == NULL)
return NULL;
va_start(vargs, fmt);
@@ -445,7 +445,7 @@ static void iio_trig_subirqunmask(struct irq_data *d)
static struct iio_trigger *viio_trigger_alloc(const char *fmt, va_list vargs)
{
struct iio_trigger *trig;
- trig = kzalloc(sizeof *trig, GFP_KERNEL);
+ trig = kzalloc(sizeof(*trig), GFP_KERNEL);
if (trig) {
int i;
trig->dev.type = &iio_trig_type;
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
index 337353d86cfa..68a633c5a1cf 100644
--- a/drivers/infiniband/core/addr.c
+++ b/drivers/infiniband/core/addr.c
@@ -271,7 +271,7 @@ static int addr6_resolve(struct sockaddr_in6 *src_in,
struct rt6_info *rt;
int ret;
- memset(&fl6, 0, sizeof fl6);
+ memset(&fl6, 0, sizeof(fl6));
fl6.daddr = dst_in->sin6_addr;
fl6.saddr = src_in->sin6_addr;
fl6.flowi6_oif = addr->bound_dev_if;
@@ -447,7 +447,7 @@ int rdma_resolve_ip(struct rdma_addr_client *client,
struct addr_req *req;
int ret = 0;
- req = kzalloc(sizeof *req, GFP_KERNEL);
+ req = kzalloc(sizeof(*req), GFP_KERNEL);
if (!req)
return -ENOMEM;
diff --git a/drivers/infiniband/core/agent.c b/drivers/infiniband/core/agent.c
index 4fa524dfb6cf..5a482c684278 100644
--- a/drivers/infiniband/core/agent.c
+++ b/drivers/infiniband/core/agent.c
@@ -154,7 +154,7 @@ int ib_agent_port_open(struct ib_device *device, int port_num)
int ret;
/* Create new device info */
- port_priv = kzalloc(sizeof *port_priv, GFP_KERNEL);
+ port_priv = kzalloc(sizeof(*port_priv), GFP_KERNEL);
if (!port_priv) {
dev_err(&device->dev, "No memory for ib_agent_port_private\n");
ret = -ENOMEM;
diff --git a/drivers/infiniband/core/cache.c b/drivers/infiniband/core/cache.c
index 53343ffbff7a..164aadf02c10 100644
--- a/drivers/infiniband/core/cache.c
+++ b/drivers/infiniband/core/cache.c
@@ -1037,7 +1037,7 @@ static void ib_cache_update(struct ib_device *device,
table = ports_table[port - rdma_start_port(device)];
- tprops = kmalloc(sizeof *tprops, GFP_KERNEL);
+ tprops = kmalloc(sizeof(*tprops), GFP_KERNEL);
if (!tprops)
return;
@@ -1048,8 +1048,8 @@ static void ib_cache_update(struct ib_device *device,
goto err;
}
- pkey_cache = kmalloc(sizeof *pkey_cache + tprops->pkey_tbl_len *
- sizeof *pkey_cache->table, GFP_KERNEL);
+ pkey_cache = kmalloc(sizeof(*pkey_cache) + tprops->pkey_tbl_len *
+ sizeof(*pkey_cache->table), GFP_KERNEL);
if (!pkey_cache)
goto err;
@@ -1135,7 +1135,7 @@ static void ib_cache_event(struct ib_event_handler *handler,
event->event == IB_EVENT_SM_CHANGE ||
event->event == IB_EVENT_CLIENT_REREGISTER ||
event->event == IB_EVENT_GID_CHANGE) {
- work = kmalloc(sizeof *work, GFP_ATOMIC);
+ work = kmalloc(sizeof(*work), GFP_ATOMIC);
if (work) {
INIT_WORK(&work->work, ib_cache_task);
work->device = event->device;
@@ -1153,9 +1153,9 @@ int ib_cache_setup_one(struct ib_device *device)
rwlock_init(&device->cache.lock);
device->cache.pkey_cache =
- kzalloc(sizeof *device->cache.pkey_cache *
+ kzalloc(sizeof(*device->cache.pkey_cache) *
(rdma_end_port(device) - rdma_start_port(device) + 1), GFP_KERNEL);
- device->cache.lmc_cache = kmalloc(sizeof *device->cache.lmc_cache *
+ device->cache.lmc_cache = kmalloc(sizeof(*device->cache.lmc_cache) *
(rdma_end_port(device) -
rdma_start_port(device) + 1),
GFP_KERNEL);
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index 1d92e091e22e..be29d26f16a7 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -630,7 +630,7 @@ static struct cm_id_private * cm_insert_remote_sidr(struct cm_id_private
else {
int cmp;
cmp = memcmp(port_gid, &cur_cm_id_priv->av.dgid,
- sizeof *port_gid);
+ sizeof(*port_gid));
if (cmp < 0)
link = &(*link)->rb_left;
else if (cmp > 0)
@@ -649,7 +649,7 @@ static void cm_reject_sidr_req(struct cm_id_private *cm_id_priv,
{
struct ib_cm_sidr_rep_param param;
- memset(¶m, 0, sizeof param);
+ memset(¶m, 0, sizeof(param));
param.status = status;
ib_send_cm_sidr_rep(&cm_id_priv->id, ¶m);
}
@@ -661,7 +661,7 @@ struct ib_cm_id *ib_create_cm_id(struct ib_device *device,
struct cm_id_private *cm_id_priv;
int ret;
- cm_id_priv = kzalloc(sizeof *cm_id_priv, GFP_KERNEL);
+ cm_id_priv = kzalloc(sizeof(*cm_id_priv), GFP_KERNEL);
if (!cm_id_priv)
return ERR_PTR(-ENOMEM);
@@ -748,7 +748,7 @@ static struct cm_timewait_info * cm_create_timewait_info(__be32 local_id)
{
struct cm_timewait_info *timewait_info;
- timewait_info = kzalloc(sizeof *timewait_info, GFP_KERNEL);
+ timewait_info = kzalloc(sizeof(*timewait_info), GFP_KERNEL);
if (!timewait_info)
return ERR_PTR(-ENOMEM);
@@ -847,7 +847,7 @@ static void cm_destroy_id(struct ib_cm_id *cm_id, int err)
spin_unlock_irq(&cm_id_priv->lock);
ib_send_cm_rej(cm_id, IB_CM_REJ_TIMEOUT,
&cm_id_priv->id.device->node_guid,
- sizeof cm_id_priv->id.device->node_guid,
+ sizeof(cm_id_priv->id.device->node_guid),
NULL, 0);
break;
case IB_CM_REQ_RCVD:
@@ -1293,7 +1293,7 @@ static void cm_format_paths_from_req(struct cm_req_msg *req_msg,
struct ib_sa_path_rec *primary_path,
struct ib_sa_path_rec *alt_path)
{
- memset(primary_path, 0, sizeof *primary_path);
+ memset(primary_path, 0, sizeof(*primary_path));
primary_path->dgid = req_msg->primary_local_gid;
primary_path->sgid = req_msg->primary_remote_gid;
primary_path->dlid = req_msg->primary_local_lid;
@@ -1315,7 +1315,7 @@ static void cm_format_paths_from_req(struct cm_req_msg *req_msg,
primary_path->service_id = req_msg->service_id;
if (req_msg->alt_local_lid) {
- memset(alt_path, 0, sizeof *alt_path);
+ memset(alt_path, 0, sizeof(*alt_path));
alt_path->dgid = req_msg->alt_local_gid;
alt_path->sgid = req_msg->alt_remote_gid;
alt_path->dlid = req_msg->alt_local_lid;
@@ -1667,7 +1667,7 @@ static int cm_req_handler(struct cm_work *work)
}
work->path[0].gid_type = gid_attr.gid_type;
ib_send_cm_rej(cm_id, IB_CM_REJ_INVALID_GID,
- &work->path[0].sgid, sizeof work->path[0].sgid,
+ &work->path[0].sgid, sizeof(work->path[0].sgid),
NULL, 0);
goto rejected;
}
@@ -1676,7 +1676,7 @@ static int cm_req_handler(struct cm_work *work)
if (ret) {
ib_send_cm_rej(cm_id, IB_CM_REJ_INVALID_ALT_GID,
&work->path[0].sgid,
- sizeof work->path[0].sgid, NULL, 0);
+ sizeof(work->path[0].sgid), NULL, 0);
goto rejected;
}
}
@@ -2762,7 +2762,7 @@ static void cm_format_path_from_lap(struct cm_id_private *cm_id_priv,
struct ib_sa_path_rec *path,
struct cm_lap_msg *lap_msg)
{
- memset(path, 0, sizeof *path);
+ memset(path, 0, sizeof(*path));
path->dgid = lap_msg->alt_local_gid;
path->sgid = lap_msg->alt_remote_gid;
path->dlid = lap_msg->alt_local_lid;
@@ -3263,7 +3263,7 @@ static void cm_process_send_error(struct ib_mad_send_buf *msg,
enum ib_cm_state state;
int ret;
- memset(&cm_event, 0, sizeof cm_event);
+ memset(&cm_event, 0, sizeof(cm_event));
cm_id_priv = msg->context[0];
/* Discard old sends or ones without a response. */
@@ -3413,7 +3413,7 @@ static int cm_establish(struct ib_cm_id *cm_id)
if (!cm_dev)
return -ENODEV;
- work = kmalloc(sizeof *work, GFP_ATOMIC);
+ work = kmalloc(sizeof(*work), GFP_ATOMIC);
if (!work)
return -ENOMEM;
@@ -3560,7 +3560,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
atomic_long_inc(&port->counter_group[CM_RECV].
counter[attr_id - CM_ATTR_ID_OFFSET]);
- work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
+ work = kmalloc(sizeof(*work) + sizeof(struct ib_sa_path_rec) * paths,
GFP_KERNEL);
if (!work) {
ib_free_recv_mad(mad_recv_wc);
@@ -3880,7 +3880,7 @@ static void cm_add_one(struct ib_device *ib_device)
if (!rdma_cap_ib_cm(ib_device, i))
continue;
- port = kzalloc(sizeof *port, GFP_KERNEL);
+ port = kzalloc(sizeof(*port), GFP_KERNEL);
if (!port)
goto error1;
@@ -3985,7 +3985,7 @@ static int __init ib_cm_init(void)
{
int ret;
- memset(&cm, 0, sizeof cm);
+ memset(&cm, 0, sizeof(cm));
INIT_LIST_HEAD(&cm.device_list);
rwlock_init(&cm.device_lock);
spin_lock_init(&cm.lock);
@@ -3995,7 +3995,7 @@ static int __init ib_cm_init(void)
cm.remote_qp_table = RB_ROOT;
cm.remote_sidr_table = RB_ROOT;
idr_init(&cm.local_id_table);
- get_random_bytes(&cm.random_id_operand, sizeof cm.random_id_operand);
+ get_random_bytes(&cm.random_id_operand, sizeof(cm.random_id_operand));
INIT_LIST_HEAD(&cm.timewait_list);
ret = class_register(&cm_class);
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 9729639df407..ce3f32711f32 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -595,7 +595,7 @@ static int cma_acquire_dev(struct rdma_id_private *id_priv,
&iboe_gid);
memcpy(&gid, dev_addr->src_dev_addr +
- rdma_addr_gid_offset(dev_addr), sizeof gid);
+ rdma_addr_gid_offset(dev_addr), sizeof(gid));
if (listen_id_priv) {
cma_dev = listen_id_priv->cma_dev;
@@ -697,7 +697,7 @@ static int cma_resolve_ib_dev(struct rdma_id_private *id_priv)
found:
cma_attach_to_dev(id_priv, cma_dev);
addr = (struct sockaddr_ib *) cma_src_addr(id_priv);
- memcpy(&addr->sib_addr, &sgid, sizeof sgid);
+ memcpy(&addr->sib_addr, &sgid, sizeof(sgid));
cma_translate_ib(addr, &id_priv->id.route.addr.dev_addr);
return 0;
}
@@ -726,7 +726,7 @@ struct rdma_cm_id *rdma_create_id(struct net *net,
{
struct rdma_id_private *id_priv;
- id_priv = kzalloc(sizeof *id_priv, GFP_KERNEL);
+ id_priv = kzalloc(sizeof(*id_priv), GFP_KERNEL);
if (!id_priv)
return ERR_PTR(-ENOMEM);
@@ -743,7 +743,7 @@ struct rdma_cm_id *rdma_create_id(struct net *net,
mutex_init(&id_priv->handler_mutex);
INIT_LIST_HEAD(&id_priv->listen_list);
INIT_LIST_HEAD(&id_priv->mc_list);
- get_random_bytes(&id_priv->seq_num, sizeof id_priv->seq_num);
+ get_random_bytes(&id_priv->seq_num, sizeof(id_priv->seq_num));
id_priv->id.route.addr.dev_addr.net = get_net(net);
return &id_priv->id;
@@ -1668,7 +1668,7 @@ static int cma_ib_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)
cma_disable_callback(id_priv, RDMA_CM_DISCONNECT)))
return 0;
- memset(&event, 0, sizeof event);
+ memset(&event, 0, sizeof(event));
switch (ib_event->event) {
case IB_CM_REQ_ERROR:
case IB_CM_REP_ERROR:
@@ -1758,7 +1758,7 @@ static struct rdma_id_private *cma_new_conn_id(struct rdma_cm_id *listen_id,
rt = &id->route;
rt->num_paths = ib_event->param.req_rcvd.alternate_path ? 2 : 1;
- rt->path_rec = kmalloc(sizeof *rt->path_rec * rt->num_paths,
+ rt->path_rec = kmalloc(sizeof(*rt->path_rec) * rt->num_paths,
GFP_KERNEL);
if (!rt->path_rec)
goto err;
@@ -1880,7 +1880,7 @@ static int cma_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)
goto net_dev_put;
}
- memset(&event, 0, sizeof event);
+ memset(&event, 0, sizeof(event));
offset = cma_user_data_offset(listen_id);
event.event = RDMA_CM_EVENT_CONNECT_REQUEST;
if (ib_event->event == IB_CM_SIDR_REQ_RECEIVED) {
@@ -1970,7 +1970,7 @@ static int cma_iw_handler(struct iw_cm_id *iw_id, struct iw_cm_event *iw_event)
if (cma_disable_callback(id_priv, RDMA_CM_CONNECT))
return 0;
- memset(&event, 0, sizeof event);
+ memset(&event, 0, sizeof(event));
switch (iw_event->event) {
case IW_CM_EVENT_CLOSE:
event.event = RDMA_CM_EVENT_DISCONNECTED;
@@ -2072,7 +2072,7 @@ static int iw_conn_req_handler(struct iw_cm_id *cm_id,
memcpy(cma_src_addr(conn_id), laddr, rdma_addr_size(laddr));
memcpy(cma_dst_addr(conn_id), raddr, rdma_addr_size(raddr));
- memset(&event, 0, sizeof event);
+ memset(&event, 0, sizeof(event));
event.event = RDMA_CM_EVENT_CONNECT_REQUEST;
event.param.conn.private_data = iw_event->private_data;
event.param.conn.private_data_len = iw_event->private_data_len;
@@ -2240,7 +2240,7 @@ static int cma_query_ib_route(struct rdma_id_private *id_priv, int timeout_ms,
struct sockaddr_in6 *sin6;
struct sockaddr_ib *sib;
- memset(&path_rec, 0, sizeof path_rec);
+ memset(&path_rec, 0, sizeof(path_rec));
rdma_addr_get_sgid(dev_addr, &path_rec.sgid);
rdma_addr_get_dgid(dev_addr, &path_rec.dgid);
path_rec.pkey = cpu_to_be16(ib_addr_get_pkey(dev_addr));
@@ -2330,7 +2330,7 @@ static int cma_resolve_ib_route(struct rdma_id_private *id_priv, int timeout_ms)
struct cma_work *work;
int ret;
- work = kzalloc(sizeof *work, GFP_KERNEL);
+ work = kzalloc(sizeof(*work), GFP_KERNEL);
if (!work)
return -ENOMEM;
@@ -2340,7 +2340,7 @@ static int cma_resolve_ib_route(struct rdma_id_private *id_priv, int timeout_ms)
work->new_state = RDMA_CM_ROUTE_RESOLVED;
work->event.event = RDMA_CM_EVENT_ROUTE_RESOLVED;
- route->path_rec = kmalloc(sizeof *route->path_rec, GFP_KERNEL);
+ route->path_rec = kmalloc(sizeof(*route->path_rec), GFP_KERNEL);
if (!route->path_rec) {
ret = -ENOMEM;
goto err1;
@@ -2370,7 +2370,7 @@ int rdma_set_ib_paths(struct rdma_cm_id *id,
RDMA_CM_ROUTE_RESOLVED))
return -EINVAL;
- id->route.path_rec = kmemdup(path_rec, sizeof *path_rec * num_paths,
+ id->route.path_rec = kmemdup(path_rec, sizeof(*path_rec) * num_paths,
GFP_KERNEL);
if (!id->route.path_rec) {
ret = -ENOMEM;
@@ -2389,7 +2389,7 @@ static int cma_resolve_iw_route(struct rdma_id_private *id_priv, int timeout_ms)
{
struct cma_work *work;
- work = kzalloc(sizeof *work, GFP_KERNEL);
+ work = kzalloc(sizeof(*work), GFP_KERNEL);
if (!work)
return -ENOMEM;
@@ -2431,14 +2431,14 @@ static int cma_resolve_iboe_route(struct rdma_id_private *id_priv)
struct net_device *ndev = NULL;
- work = kzalloc(sizeof *work, GFP_KERNEL);
+ work = kzalloc(sizeof(*work), GFP_KERNEL);
if (!work)
return -ENOMEM;
work->id = id_priv;
INIT_WORK(&work->work, cma_work_handler);
- route->path_rec = kzalloc(sizeof *route->path_rec, GFP_KERNEL);
+ route->path_rec = kzalloc(sizeof(*route->path_rec), GFP_KERNEL);
if (!route->path_rec) {
ret = -ENOMEM;
goto err1;
@@ -2629,7 +2629,7 @@ static void addr_handler(int status, struct sockaddr *src_addr,
struct rdma_id_private *id_priv = context;
struct rdma_cm_event event;
- memset(&event, 0, sizeof event);
+ memset(&event, 0, sizeof(event));
mutex_lock(&id_priv->handler_mutex);
if (!cma_comp_exch(id_priv, RDMA_CM_ADDR_QUERY,
RDMA_CM_ADDR_RESOLVED))
@@ -2666,7 +2666,7 @@ static int cma_resolve_loopback(struct rdma_id_private *id_priv)
union ib_gid gid;
int ret;
- work = kzalloc(sizeof *work, GFP_KERNEL);
+ work = kzalloc(sizeof(*work), GFP_KERNEL);
if (!work)
return -ENOMEM;
@@ -2696,7 +2696,7 @@ static int cma_resolve_ib_addr(struct rdma_id_private *id_priv)
struct cma_work *work;
int ret;
- work = kzalloc(sizeof *work, GFP_KERNEL);
+ work = kzalloc(sizeof(*work), GFP_KERNEL);
if (!work)
return -ENOMEM;
@@ -2859,7 +2859,7 @@ static int cma_alloc_port(enum rdma_port_space ps,
struct rdma_bind_list *bind_list;
int ret;
- bind_list = kzalloc(sizeof *bind_list, GFP_KERNEL);
+ bind_list = kzalloc(sizeof(*bind_list), GFP_KERNEL);
if (!bind_list)
return -ENOMEM;
@@ -3210,7 +3210,7 @@ static int cma_sidr_rep_handler(struct ib_cm_id *cm_id,
if (cma_disable_callback(id_priv, RDMA_CM_CONNECT))
return 0;
- memset(&event, 0, sizeof event);
+ memset(&event, 0, sizeof(event));
switch (ib_event->event) {
case IB_CM_SIDR_REQ_ERROR:
event.event = RDMA_CM_EVENT_UNREACHABLE;
@@ -3266,7 +3266,7 @@ static int cma_resolve_ib_udp(struct rdma_id_private *id_priv,
void *private_data;
int offset, ret;
- memset(&req, 0, sizeof req);
+ memset(&req, 0, sizeof(req));
offset = cma_user_data_offset(id_priv);
req.private_data_len = offset + conn_param->private_data_len;
if (req.private_data_len < conn_param->private_data_len)
@@ -3323,7 +3323,7 @@ static int cma_connect_ib(struct rdma_id_private *id_priv,
struct ib_cm_id *id;
int offset, ret;
- memset(&req, 0, sizeof req);
+ memset(&req, 0, sizeof(req));
offset = cma_user_data_offset(id_priv);
req.private_data_len = offset + conn_param->private_data_len;
if (req.private_data_len < conn_param->private_data_len)
@@ -3415,7 +3415,7 @@ static int cma_connect_iw(struct rdma_id_private *id_priv,
iw_param.private_data_len = conn_param->private_data_len;
iw_param.qpn = id_priv->id.qp ? id_priv->qp_num : conn_param->qp_num;
} else {
- memset(&iw_param, 0, sizeof iw_param);
+ memset(&iw_param, 0, sizeof(iw_param));
iw_param.qpn = id_priv->qp_num;
}
ret = iw_cm_connect(cm_id, &iw_param);
@@ -3474,7 +3474,7 @@ static int cma_accept_ib(struct rdma_id_private *id_priv,
if (ret)
goto out;
- memset(&rep, 0, sizeof rep);
+ memset(&rep, 0, sizeof(rep));
rep.qp_num = id_priv->qp_num;
rep.starting_psn = id_priv->seq_num;
rep.private_data = conn_param->private_data;
@@ -3520,7 +3520,7 @@ static int cma_send_sidr_rep(struct rdma_id_private *id_priv,
struct ib_cm_sidr_rep_param rep;
int ret;
- memset(&rep, 0, sizeof rep);
+ memset(&rep, 0, sizeof(rep));
rep.status = status;
if (status == IB_SIDR_SUCCESS) {
ret = cma_set_qkey(id_priv, qkey);
@@ -3679,7 +3679,7 @@ static int cma_ib_mc_handler(int status, struct ib_sa_multicast *multicast)
be16_to_cpu(multicast->rec.mlid));
mutex_unlock(&id_priv->qp_mutex);
- memset(&event, 0, sizeof event);
+ memset(&event, 0, sizeof(event));
event.status = status;
event.param.ud.private_data = mc->context;
if (!status) {
@@ -3724,14 +3724,14 @@ static void cma_set_mgid(struct rdma_id_private *id_priv,
struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) addr;
if (cma_any_addr(addr)) {
- memset(mgid, 0, sizeof *mgid);
+ memset(mgid, 0, sizeof(*mgid));
} else if ((addr->sa_family == AF_INET6) &&
((be32_to_cpu(sin6->sin6_addr.s6_addr32[0]) & 0xFFF0FFFF) ==
0xFF10A01B)) {
/* IPv6 address is an SA assigned MGID. */
- memcpy(mgid, &sin6->sin6_addr, sizeof *mgid);
+ memcpy(mgid, &sin6->sin6_addr, sizeof(*mgid));
} else if (addr->sa_family == AF_IB) {
- memcpy(mgid, &((struct sockaddr_ib *) addr)->sib_addr, sizeof *mgid);
+ memcpy(mgid, &((struct sockaddr_ib *) addr)->sib_addr, sizeof(*mgid));
} else if ((addr->sa_family == AF_INET6)) {
ipv6_ib_mc_map(&sin6->sin6_addr, dev_addr->broadcast, mc_map);
if (id_priv->id.ps == RDMA_PS_UDP)
@@ -3807,9 +3807,9 @@ static void cma_iboe_set_mgid(struct sockaddr *addr, union ib_gid *mgid)
struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)addr;
if (cma_any_addr(addr)) {
- memset(mgid, 0, sizeof *mgid);
+ memset(mgid, 0, sizeof(*mgid));
} else if (addr->sa_family == AF_INET6) {
- memcpy(mgid, &sin6->sin6_addr, sizeof *mgid);
+ memcpy(mgid, &sin6->sin6_addr, sizeof(*mgid));
} else {
mgid->raw[0] = 0xff;
mgid->raw[1] = 0x0e;
@@ -3840,7 +3840,7 @@ static int cma_iboe_join_multicast(struct rdma_id_private *id_priv,
if (cma_zero_addr((struct sockaddr *)&mc->addr))
return -EINVAL;
- work = kzalloc(sizeof *work, GFP_KERNEL);
+ work = kzalloc(sizeof(*work), GFP_KERNEL);
if (!work)
return -ENOMEM;
@@ -3915,7 +3915,7 @@ int rdma_join_multicast(struct rdma_cm_id *id, struct sockaddr *addr,
!cma_comp(id_priv, RDMA_CM_ADDR_RESOLVED))
return -EINVAL;
- mc = kmalloc(sizeof *mc, GFP_KERNEL);
+ mc = kmalloc(sizeof(*mc), GFP_KERNEL);
if (!mc)
return -ENOMEM;
@@ -4005,7 +4005,7 @@ static int cma_netdev_change(struct net_device *ndev, struct rdma_id_private *id
memcmp(dev_addr->src_dev_addr, ndev->dev_addr, ndev->addr_len)) {
printk(KERN_INFO "RDMA CM addr change for ndev %s used by id %p\n",
ndev->name, &id_priv->id);
- work = kzalloc(sizeof *work, GFP_KERNEL);
+ work = kzalloc(sizeof(*work), GFP_KERNEL);
if (!work)
return -ENOMEM;
@@ -4057,7 +4057,7 @@ static void cma_add_one(struct ib_device *device)
unsigned int i;
unsigned long supported_gids = 0;
- cma_dev = kmalloc(sizeof *cma_dev, GFP_KERNEL);
+ cma_dev = kmalloc(sizeof(*cma_dev), GFP_KERNEL);
if (!cma_dev)
return;
@@ -4106,7 +4106,7 @@ static int cma_remove_id_dev(struct rdma_id_private *id_priv)
if (!cma_comp(id_priv, RDMA_CM_DEVICE_REMOVAL))
goto out;
- memset(&event, 0, sizeof event);
+ memset(&event, 0, sizeof(event));
event.event = RDMA_CM_EVENT_DEVICE_REMOVAL;
ret = id_priv->id.event_handler(&id_priv->id, &event);
out:
@@ -4187,13 +4187,13 @@ static int cma_get_id_stats(struct sk_buff *skb, struct netlink_callback *cb)
}
id_stats = ibnl_put_msg(skb, &nlh, cb->nlh->nlmsg_seq,
- sizeof *id_stats, RDMA_NL_RDMA_CM,
+ sizeof(*id_stats), RDMA_NL_RDMA_CM,
RDMA_NL_RDMA_CM_ID_STATS,
NLM_F_MULTI);
if (!id_stats)
goto out;
- memset(id_stats, 0, sizeof *id_stats);
+ memset(id_stats, 0, sizeof(*id_stats));
id = &id_priv->id;
id_stats->node_type = id->route.addr.dev_addr.dev_type;
id_stats->port_num = id->port_num;
diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c
index 00da80e02154..9d2886b5ae9b 100644
--- a/drivers/infiniband/core/device.c
+++ b/drivers/infiniband/core/device.c
@@ -152,14 +152,14 @@ static int alloc_name(char *name)
continue;
if (i < 0 || i >= PAGE_SIZE * 8)
continue;
- snprintf(buf, sizeof buf, name, i);
+ snprintf(buf, sizeof(buf), name, i);
if (!strncmp(buf, device->name, IB_DEVICE_NAME_MAX))
set_bit(i, inuse);
}
i = find_first_zero_bit(inuse, PAGE_SIZE * 8);
free_page((unsigned long) inuse);
- snprintf(buf, sizeof buf, name, i);
+ snprintf(buf, sizeof(buf), name, i);
if (__ib_device_get_by_name(buf))
return -ENFILE;
@@ -253,7 +253,7 @@ static int add_client_context(struct ib_device *device, struct ib_client *client
struct ib_client_data *context;
unsigned long flags;
- context = kmalloc(sizeof *context, GFP_KERNEL);
+ context = kmalloc(sizeof(*context), GFP_KERNEL);
if (!context) {
printk(KERN_WARNING "Couldn't allocate client context for %s/%s\n",
device->name, client->name);
@@ -844,7 +844,7 @@ int ib_find_gid(struct ib_device *device, union ib_gid *gid,
ret = ib_query_gid(device, port, i, &tmp_gid, NULL);
if (ret)
return ret;
- if (!memcmp(&tmp_gid, gid, sizeof *gid)) {
+ if (!memcmp(&tmp_gid, gid, sizeof(*gid))) {
*port_num = port;
if (index)
*index = i;
diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
index 6ac3683c144b..f4739cdc0464 100644
--- a/drivers/infiniband/core/fmr_pool.c
+++ b/drivers/infiniband/core/fmr_pool.c
@@ -128,7 +128,7 @@ static inline struct ib_pool_fmr *ib_fmr_cache_lookup(struct ib_fmr_pool *pool,
if (io_virtual_address == fmr->io_virtual_address &&
page_list_len == fmr->page_list_len &&
!memcmp(page_list, fmr->page_list,
- page_list_len * sizeof *page_list))
+ page_list_len * sizeof(*page_list)))
return fmr;
return NULL;
@@ -232,7 +232,7 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
else
max_remaps = device->attrs.max_map_per_fmr;
- pool = kmalloc(sizeof *pool, GFP_KERNEL);
+ pool = kmalloc(sizeof(*pool), GFP_KERNEL);
if (!pool) {
printk(KERN_WARNING PFX "couldn't allocate pool struct\n");
return ERR_PTR(-ENOMEM);
@@ -248,7 +248,7 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
if (params->cache) {
pool->cache_bucket =
- kmalloc(IB_FMR_HASH_SIZE * sizeof *pool->cache_bucket,
+ kmalloc(IB_FMR_HASH_SIZE * sizeof(*pool->cache_bucket),
GFP_KERNEL);
if (!pool->cache_bucket) {
printk(KERN_WARNING PFX "Failed to allocate cache in pool\n");
@@ -287,7 +287,7 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
.max_maps = pool->max_remaps,
.page_shift = params->page_shift
};
- int bytes_per_fmr = sizeof *fmr;
+ int bytes_per_fmr = sizeof(*fmr);
if (pool->cache_bucket)
bytes_per_fmr += params->max_pages_per_fmr * sizeof (u64);
diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
index 9fa5bf33f5a3..2c1ff225ac5c 100644
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
@@ -335,14 +335,14 @@ struct ib_mad_agent *ib_register_mad_agent(struct ib_device *device,
}
/* Allocate structures */
- mad_agent_priv = kzalloc(sizeof *mad_agent_priv, GFP_KERNEL);
+ mad_agent_priv = kzalloc(sizeof(*mad_agent_priv), GFP_KERNEL);
if (!mad_agent_priv) {
ret = ERR_PTR(-ENOMEM);
goto error1;
}
if (mad_reg_req) {
- reg_req = kmemdup(mad_reg_req, sizeof *reg_req, GFP_KERNEL);
+ reg_req = kmemdup(mad_reg_req, sizeof(*reg_req), GFP_KERNEL);
if (!reg_req) {
ret = ERR_PTR(-ENOMEM);
goto error3;
@@ -463,7 +463,7 @@ static int register_snoop_agent(struct ib_mad_qp_info *qp_info,
if (i == qp_info->snoop_table_size) {
/* Grow table. */
new_snoop_table = krealloc(qp_info->snoop_table,
- sizeof mad_snoop_priv *
+ sizeof(mad_snoop_priv) *
(qp_info->snoop_table_size + 1),
GFP_ATOMIC);
if (!new_snoop_table) {
@@ -511,7 +511,7 @@ struct ib_mad_agent *ib_register_mad_snoop(struct ib_device *device,
goto error1;
}
/* Allocate structures */
- mad_snoop_priv = kzalloc(sizeof *mad_snoop_priv, GFP_KERNEL);
+ mad_snoop_priv = kzalloc(sizeof(*mad_snoop_priv), GFP_KERNEL);
if (!mad_snoop_priv) {
ret = ERR_PTR(-ENOMEM);
goto error1;
@@ -695,7 +695,7 @@ static void snoop_recv(struct ib_mad_qp_info *qp_info,
static void build_smp_wc(struct ib_qp *qp, struct ib_cqe *cqe, u16 slid,
u16 pkey_index, u8 port_num, struct ib_wc *wc)
{
- memset(wc, 0, sizeof *wc);
+ memset(wc, 0, sizeof(*wc));
wc->wr_cqe = cqe;
wc->status = IB_WC_SUCCESS;
wc->opcode = IB_WC_RECV;
@@ -817,7 +817,7 @@ static int handle_outgoing_dr_smp(struct ib_mad_agent_private *mad_agent_priv,
goto out;
}
- local = kmalloc(sizeof *local, GFP_ATOMIC);
+ local = kmalloc(sizeof(*local), GFP_ATOMIC);
if (!local) {
ret = -ENOMEM;
dev_err(&device->dev, "No memory for ib_mad_local_private\n");
@@ -949,11 +949,11 @@ static int alloc_send_rmpp_list(struct ib_mad_send_wr_private *send_wr,
/* Allocate data segments. */
for (left = send_buf->data_len + pad; left > 0; left -= seg_size) {
- seg = kmalloc(sizeof (*seg) + seg_size, gfp_mask);
+ seg = kmalloc(sizeof(*seg) + seg_size, gfp_mask);
if (!seg) {
dev_err(&send_buf->mad_agent->device->dev,
"alloc_send_rmpp_segs: RMPP mem alloc failed for len %zd, gfp %#x\n",
- sizeof (*seg) + seg_size, gfp_mask);
+ sizeof(*seg) + seg_size, gfp_mask);
free_send_rmpp_list(send_wr);
return -ENOMEM;
}
@@ -1017,7 +1017,7 @@ struct ib_mad_send_buf * ib_create_send_mad(struct ib_mad_agent *mad_agent,
return ERR_PTR(-EINVAL);
size = rmpp_active ? hdr_len : mad_size;
- buf = kzalloc(sizeof *mad_send_wr + size, gfp_mask);
+ buf = kzalloc(sizeof(*mad_send_wr) + size, gfp_mask);
if (!buf)
return ERR_PTR(-ENOMEM);
@@ -1365,7 +1365,7 @@ static int method_in_use(struct ib_mad_mgmt_method_table **method,
static int allocate_method_table(struct ib_mad_mgmt_method_table **method)
{
/* Allocate management method table */
- *method = kzalloc(sizeof **method, GFP_ATOMIC);
+ *method = kzalloc(sizeof(**method), GFP_ATOMIC);
if (!*method) {
pr_err("No memory for ib_mad_mgmt_method_table\n");
return -ENOMEM;
@@ -1460,7 +1460,7 @@ static int add_nonoui_reg_req(struct ib_mad_reg_req *mad_reg_req,
class = &port_priv->version[mad_reg_req->mgmt_class_version].class;
if (!*class) {
/* Allocate management class table for "new" class version */
- *class = kzalloc(sizeof **class, GFP_ATOMIC);
+ *class = kzalloc(sizeof(**class), GFP_ATOMIC);
if (!*class) {
dev_err(&agent_priv->agent.device->dev,
"No memory for ib_mad_mgmt_class_table\n");
@@ -1527,7 +1527,7 @@ static int add_oui_reg_req(struct ib_mad_reg_req *mad_reg_req,
mad_reg_req->mgmt_class_version].vendor;
if (!*vendor_table) {
/* Allocate mgmt vendor class table for "new" class version */
- vendor = kzalloc(sizeof *vendor, GFP_ATOMIC);
+ vendor = kzalloc(sizeof(*vendor), GFP_ATOMIC);
if (!vendor) {
dev_err(&agent_priv->agent.device->dev,
"No memory for ib_mad_mgmt_vendor_class_table\n");
@@ -1538,7 +1538,7 @@ static int add_oui_reg_req(struct ib_mad_reg_req *mad_reg_req,
}
if (!(*vendor_table)->vendor_class[vclass]) {
/* Allocate table for this management vendor class */
- vendor_class = kzalloc(sizeof *vendor_class, GFP_ATOMIC);
+ vendor_class = kzalloc(sizeof(*vendor_class), GFP_ATOMIC);
if (!vendor_class) {
dev_err(&agent_priv->agent.device->dev,
"No memory for ib_mad_mgmt_vendor_class\n");
@@ -2545,7 +2545,7 @@ static bool ib_mad_send_error(struct ib_mad_port_private *port_priv,
struct ib_qp_attr *attr;
/* Transition QP to RTS and fail offending send */
- attr = kmalloc(sizeof *attr, GFP_KERNEL);
+ attr = kmalloc(sizeof(*attr), GFP_KERNEL);
if (attr) {
attr->qp_state = IB_QPS_RTS;
attr->cur_qp_state = IB_QPS_SQE;
@@ -2964,7 +2964,7 @@ static int ib_mad_port_start(struct ib_mad_port_private *port_priv)
struct ib_qp *qp;
u16 pkey_index;
- attr = kmalloc(sizeof *attr, GFP_KERNEL);
+ attr = kmalloc(sizeof(*attr), GFP_KERNEL);
if (!attr) {
dev_err(&port_priv->device->dev,
"Couldn't kmalloc ib_qp_attr\n");
@@ -3079,7 +3079,7 @@ static int create_mad_qp(struct ib_mad_qp_info *qp_info,
struct ib_qp_init_attr qp_init_attr;
int ret;
- memset(&qp_init_attr, 0, sizeof qp_init_attr);
+ memset(&qp_init_attr, 0, sizeof(qp_init_attr));
qp_init_attr.send_cq = qp_info->port_priv->cq;
qp_init_attr.recv_cq = qp_info->port_priv->cq;
qp_init_attr.sq_sig_type = IB_SIGNAL_ALL_WR;
@@ -3127,7 +3127,7 @@ static int ib_mad_port_open(struct ib_device *device,
int ret, cq_size;
struct ib_mad_port_private *port_priv;
unsigned long flags;
- char name[sizeof "ib_mad123"];
+ char name[sizeof("ib_mad123")];
int has_smi;
if (WARN_ON(rdma_max_mad_size(device, port_num) < IB_MGMT_MAD_SIZE))
@@ -3138,7 +3138,7 @@ static int ib_mad_port_open(struct ib_device *device,
return -EFAULT;
/* Create new device info */
- port_priv = kzalloc(sizeof *port_priv, GFP_KERNEL);
+ port_priv = kzalloc(sizeof(*port_priv), GFP_KERNEL);
if (!port_priv) {
dev_err(&device->dev, "No memory for ib_mad_port_private\n");
return -ENOMEM;
@@ -3180,7 +3180,7 @@ static int ib_mad_port_open(struct ib_device *device,
if (ret)
goto error7;
- snprintf(name, sizeof name, "ib_mad%d", port_num);
+ snprintf(name, sizeof(name), "ib_mad%d", port_num);
port_priv->wq = create_singlethread_workqueue(name);
if (!port_priv->wq) {
ret = -ENOMEM;
diff --git a/drivers/infiniband/core/mad_rmpp.c b/drivers/infiniband/core/mad_rmpp.c
index 382941b46e43..08cc04a5d5f4 100644
--- a/drivers/infiniband/core/mad_rmpp.c
+++ b/drivers/infiniband/core/mad_rmpp.c
@@ -287,7 +287,7 @@ create_rmpp_recv(struct ib_mad_agent_private *agent,
struct mad_rmpp_recv *rmpp_recv;
struct ib_mad_hdr *mad_hdr;
- rmpp_recv = kmalloc(sizeof *rmpp_recv, GFP_KERNEL);
+ rmpp_recv = kmalloc(sizeof(*rmpp_recv), GFP_KERNEL);
if (!rmpp_recv)
return NULL;
diff --git a/drivers/infiniband/core/multicast.c b/drivers/infiniband/core/multicast.c
index 250937cb9a1a..75417187424b 100644
--- a/drivers/infiniband/core/multicast.c
+++ b/drivers/infiniband/core/multicast.c
@@ -136,7 +136,7 @@ static struct mcast_group *mcast_find(struct mcast_port *port,
while (node) {
group = rb_entry(node, struct mcast_group, node);
- ret = memcmp(mgid->raw, group->rec.mgid.raw, sizeof *mgid);
+ ret = memcmp(mgid->raw, group->rec.mgid.raw, sizeof(*mgid));
if (!ret)
return group;
@@ -162,7 +162,7 @@ static struct mcast_group *mcast_insert(struct mcast_port *port,
cur_group = rb_entry(parent, struct mcast_group, node);
ret = memcmp(group->rec.mgid.raw, cur_group->rec.mgid.raw,
- sizeof group->rec.mgid);
+ sizeof(group->rec.mgid));
if (ret < 0)
link = &(*link)->rb_left;
else if (ret > 0)
@@ -286,7 +286,7 @@ static int cmp_rec(struct ib_sa_mcmember_rec *src,
/* MGID must already match */
if (comp_mask & IB_SA_MCMEMBER_REC_PORT_GID &&
- memcmp(&src->port_gid, &dst->port_gid, sizeof src->port_gid))
+ memcmp(&src->port_gid, &dst->port_gid, sizeof(src->port_gid)))
return -EINVAL;
if (comp_mask & IB_SA_MCMEMBER_REC_QKEY && src->qkey != dst->qkey)
return -EINVAL;
@@ -566,7 +566,7 @@ static struct mcast_group *acquire_group(struct mcast_port *port,
unsigned long flags;
int is_mgid0;
- is_mgid0 = !memcmp(&mgid0, mgid, sizeof mgid0);
+ is_mgid0 = !memcmp(&mgid0, mgid, sizeof(mgid0));
if (!is_mgid0) {
spin_lock_irqsave(&port->lock, flags);
group = mcast_find(port, mgid);
@@ -575,7 +575,7 @@ static struct mcast_group *acquire_group(struct mcast_port *port,
spin_unlock_irqrestore(&port->lock, flags);
}
- group = kzalloc(sizeof *group, gfp_mask);
+ group = kzalloc(sizeof(*group), gfp_mask);
if (!group)
return NULL;
@@ -626,7 +626,7 @@ ib_sa_join_multicast(struct ib_sa_client *client,
if (!dev)
return ERR_PTR(-ENODEV);
- member = kmalloc(sizeof *member, gfp_mask);
+ member = kmalloc(sizeof(*member), gfp_mask);
if (!member)
return ERR_PTR(-ENOMEM);
@@ -747,7 +747,7 @@ int ib_init_ah_from_mcmember(struct ib_device *device, u8 port_num,
if (ret)
return ret;
- memset(ah_attr, 0, sizeof *ah_attr);
+ memset(ah_attr, 0, sizeof(*ah_attr));
ah_attr->dlid = be16_to_cpu(rec->mlid);
ah_attr->sl = rec->sl;
ah_attr->port_num = port_num;
@@ -821,7 +821,7 @@ static void mcast_add_one(struct ib_device *device)
int i;
int count = 0;
- dev = kmalloc(sizeof *dev + device->phys_port_cnt * sizeof *port,
+ dev = kmalloc(sizeof(*dev) + device->phys_port_cnt * sizeof(*port),
GFP_KERNEL);
if (!dev)
return;
diff --git a/drivers/infiniband/core/netlink.c b/drivers/infiniband/core/netlink.c
index d47df9356779..0609194a5e4c 100644
--- a/drivers/infiniband/core/netlink.c
+++ b/drivers/infiniband/core/netlink.c
@@ -63,7 +63,7 @@ int ibnl_add_client(int index, int nops,
struct ibnl_client *cur;
struct ibnl_client *nl_client;
- nl_client = kmalloc(sizeof *nl_client, GFP_KERNEL);
+ nl_client = kmalloc(sizeof(*nl_client), GFP_KERNEL);
if (!nl_client)
return -ENOMEM;
diff --git a/drivers/infiniband/core/sa_query.c b/drivers/infiniband/core/sa_query.c
index f334090bb612..ecd4900a1548 100644
--- a/drivers/infiniband/core/sa_query.c
+++ b/drivers/infiniband/core/sa_query.c
@@ -868,7 +868,7 @@ static void update_sm_ah(struct work_struct *work)
return;
}
- new_ah = kmalloc(sizeof *new_ah, GFP_KERNEL);
+ new_ah = kmalloc(sizeof(*new_ah), GFP_KERNEL);
if (!new_ah) {
printk(KERN_WARNING "Couldn't allocate new SM AH\n");
return;
@@ -882,7 +882,7 @@ static void update_sm_ah(struct work_struct *work)
IB_DEFAULT_PKEY_FULL, &new_ah->pkey_index))
printk(KERN_ERR "Couldn't find index for default PKey\n");
- memset(&ah_attr, 0, sizeof ah_attr);
+ memset(&ah_attr, 0, sizeof(ah_attr));
ah_attr.dlid = port_attr.sm_lid;
ah_attr.sl = port_attr.sm_sl;
ah_attr.port_num = port->port_num;
@@ -1005,7 +1005,7 @@ int ib_init_ah_from_path(struct ib_device *device, u8 port_num,
int use_roce;
struct net_device *ndev = NULL;
- memset(ah_attr, 0, sizeof *ah_attr);
+ memset(ah_attr, 0, sizeof(*ah_attr));
ah_attr->dlid = be16_to_cpu(rec->dlid);
ah_attr->sl = rec->sl;
ah_attr->src_path_bits = be16_to_cpu(rec->slid) &
@@ -1137,7 +1137,7 @@ static void init_mad(struct ib_sa_mad *mad, struct ib_mad_agent *agent)
{
unsigned long flags;
- memset(mad, 0, sizeof *mad);
+ memset(mad, 0, sizeof(*mad));
mad->mad_hdr.base_version = IB_MGMT_BASE_VERSION;
mad->mad_hdr.mgmt_class = IB_MGMT_CLASS_SUBN_ADM;
@@ -1704,7 +1704,7 @@ static void ib_sa_add_one(struct ib_device *device)
s = rdma_start_port(device);
e = rdma_end_port(device);
- sa_dev = kzalloc(sizeof *sa_dev +
+ sa_dev = kzalloc(sizeof(*sa_dev) +
(e - s + 1) * sizeof (struct ib_sa_port),
GFP_KERNEL);
if (!sa_dev)
@@ -1794,7 +1794,7 @@ static int __init ib_sa_init(void)
{
int ret;
- get_random_bytes(&tid, sizeof tid);
+ get_random_bytes(&tid, sizeof(tid));
atomic_set(&ib_nl_sa_request_seq, 0);
diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c
index 3de93517efe4..b93fd7c3628c 100644
--- a/drivers/infiniband/core/sysfs.c
+++ b/drivers/infiniband/core/sysfs.c
@@ -425,8 +425,8 @@ static int get_perf_mad(struct ib_device *dev, int port_num, __be16 attr,
if (!dev->process_mad)
return -ENOSYS;
- in_mad = kzalloc(sizeof *in_mad, GFP_KERNEL);
- out_mad = kmalloc(sizeof *out_mad, GFP_KERNEL);
+ in_mad = kzalloc(sizeof(*in_mad), GFP_KERNEL);
+ out_mad = kmalloc(sizeof(*out_mad), GFP_KERNEL);
if (!in_mad || !out_mad) {
ret = -ENOMEM;
goto out;
@@ -749,7 +749,7 @@ static int add_port(struct ib_device *device, int port_num,
if (ret)
return ret;
- p = kzalloc(sizeof *p, GFP_KERNEL);
+ p = kzalloc(sizeof(*p), GFP_KERNEL);
if (!p)
return -ENOMEM;
diff --git a/drivers/infiniband/core/ucm.c b/drivers/infiniband/core/ucm.c
index 6b4e8a008bc0..fe858952da21 100644
--- a/drivers/infiniband/core/ucm.c
+++ b/drivers/infiniband/core/ucm.c
@@ -177,7 +177,7 @@ static struct ib_ucm_context *ib_ucm_ctx_alloc(struct ib_ucm_file *file)
{
struct ib_ucm_context *ctx;
- ctx = kzalloc(sizeof *ctx, GFP_KERNEL);
+ ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
if (!ctx)
return NULL;
@@ -353,7 +353,7 @@ static int ib_ucm_event_handler(struct ib_cm_id *cm_id,
ctx = cm_id->context;
- uevent = kzalloc(sizeof *uevent, GFP_KERNEL);
+ uevent = kzalloc(sizeof(*uevent), GFP_KERNEL);
if (!uevent)
goto err1;
@@ -611,7 +611,7 @@ static ssize_t ib_ucm_init_qp_attr(struct ib_ucm_file *file,
return PTR_ERR(ctx);
resp.qp_attr_mask = 0;
- memset(&qp_attr, 0, sizeof qp_attr);
+ memset(&qp_attr, 0, sizeof(qp_attr));
qp_attr.qp_state = cmd.qp_state;
result = ib_cm_init_qp_attr(ctx->cm_id, &qp_attr, &resp.qp_attr_mask);
if (result)
@@ -1255,7 +1255,7 @@ static void ib_ucm_add_one(struct ib_device *device)
if (!device->alloc_ucontext || !rdma_cap_ib_cm(device, 1))
return;
- ucm_dev = kzalloc(sizeof *ucm_dev, GFP_KERNEL);
+ ucm_dev = kzalloc(sizeof(*ucm_dev), GFP_KERNEL);
if (!ucm_dev)
return;
diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c
index 8b5a934e1133..5971b476ca29 100644
--- a/drivers/infiniband/core/ucma.c
+++ b/drivers/infiniband/core/ucma.c
@@ -62,7 +62,7 @@ static struct ctl_table ucma_ctl_table[] = {
{
.procname = "max_backlog",
.data = &max_backlog,
- .maxlen = sizeof max_backlog,
+ .maxlen = sizeof(max_backlog),
.mode = 0644,
.proc_handler = proc_dointvec,
},
@@ -379,7 +379,7 @@ static ssize_t ucma_get_event(struct ucma_file *file, const char __user *inbuf,
struct ucma_event *uevent;
int ret = 0;
- if (out_len < sizeof uevent->resp)
+ if (out_len < sizeof(uevent->resp))
return -ENOSPC;
if (copy_from_user(&cmd, inbuf, sizeof(cmd)))
@@ -414,7 +414,7 @@ static ssize_t ucma_get_event(struct ucma_file *file, const char __user *inbuf,
}
if (copy_to_user((void __user *)(unsigned long)cmd.response,
- &uevent->resp, sizeof uevent->resp)) {
+ &uevent->resp, sizeof(uevent->resp))) {
ret = -EFAULT;
goto done;
}
@@ -809,7 +809,7 @@ static ssize_t ucma_query_route(struct ucma_file *file,
if (IS_ERR(ctx))
return PTR_ERR(ctx);
- memset(&resp, 0, sizeof resp);
+ memset(&resp, 0, sizeof(resp));
addr = (struct sockaddr *) &ctx->cm_id->route.addr.src_addr;
memcpy(&resp.src_addr, addr, addr->sa_family == AF_INET ?
sizeof(struct sockaddr_in) :
@@ -862,7 +862,7 @@ static ssize_t ucma_query_addr(struct ucma_context *ctx,
if (out_len < sizeof(resp))
return -ENOSPC;
- memset(&resp, 0, sizeof resp);
+ memset(&resp, 0, sizeof(resp));
addr = (struct sockaddr *) &ctx->cm_id->route.addr.src_addr;
resp.src_size = rdma_addr_size(addr);
@@ -922,7 +922,7 @@ static ssize_t ucma_query_gid(struct ucma_context *ctx,
if (out_len < sizeof(resp))
return -ENOSPC;
- memset(&resp, 0, sizeof resp);
+ memset(&resp, 0, sizeof(resp));
ucma_query_device_addr(ctx->cm_id, &resp);
@@ -1143,7 +1143,7 @@ static ssize_t ucma_init_qp_attr(struct ucma_file *file,
return PTR_ERR(ctx);
resp.qp_attr_mask = 0;
- memset(&qp_attr, 0, sizeof qp_attr);
+ memset(&qp_attr, 0, sizeof(qp_attr));
qp_attr.qp_state = cmd.qp_state;
ret = rdma_init_qp_attr(ctx->cm_id, &qp_attr, &resp.qp_attr_mask);
if (ret)
@@ -1219,7 +1219,7 @@ static int ucma_set_ib_path(struct ucma_context *ctx,
if (ret)
return ret;
- memset(&event, 0, sizeof event);
+ memset(&event, 0, sizeof(event));
event.event = RDMA_CM_EVENT_ROUTE_RESOLVED;
return ucma_event_handler(ctx->cm_id, &event);
}
@@ -1621,7 +1621,7 @@ static int ucma_open(struct inode *inode, struct file *filp)
{
struct ucma_file *file;
- file = kmalloc(sizeof *file, GFP_KERNEL);
+ file = kmalloc(sizeof(*file), GFP_KERNEL);
if (!file)
return -ENOMEM;
diff --git a/drivers/infiniband/core/ud_header.c b/drivers/infiniband/core/ud_header.c
index 19837d270278..2fa2d6ce35a6 100644
--- a/drivers/infiniband/core/ud_header.c
+++ b/drivers/infiniband/core/ud_header.c
@@ -323,7 +323,7 @@ int ib_ud_header_init(int payload_bytes,
struct ib_ud_header *header)
{
grh_present = grh_present && !ip_version;
- memset(header, 0, sizeof *header);
+ memset(header, 0, sizeof(*header));
/*
* UDP header without IP header doesn't make sense
@@ -454,8 +454,8 @@ int ib_ud_header_pack(struct ib_ud_header *header,
len += IB_DETH_BYTES;
if (header->immediate_present) {
- memcpy(buf + len, &header->immediate_data, sizeof header->immediate_data);
- len += sizeof header->immediate_data;
+ memcpy(buf + len, &header->immediate_data, sizeof(header->immediate_data));
+ len += sizeof(header->immediate_data);
}
return len;
@@ -540,7 +540,7 @@ int ib_ud_header_unpack(void *buf,
buf += IB_DETH_BYTES;
if (header->immediate_present)
- memcpy(&header->immediate_data, buf, sizeof header->immediate_data);
+ memcpy(&header->immediate_data, buf, sizeof(header->immediate_data));
return 0;
}
diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c
index 38acb3cfc545..f53d0f3d647c 100644
--- a/drivers/infiniband/core/umem.c
+++ b/drivers/infiniband/core/umem.c
@@ -113,7 +113,7 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr,
if (!can_do_mlock())
return ERR_PTR(-EPERM);
- umem = kzalloc(sizeof *umem, GFP_KERNEL);
+ umem = kzalloc(sizeof(*umem), GFP_KERNEL);
if (!umem)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c
index 415a3185cde7..5ea53487294e 100644
--- a/drivers/infiniband/core/user_mad.c
+++ b/drivers/infiniband/core/user_mad.c
@@ -219,7 +219,7 @@ static void recv_handler(struct ib_mad_agent *agent,
if (mad_recv_wc->wc->status != IB_WC_SUCCESS)
goto err1;
- packet = kzalloc(sizeof *packet, GFP_KERNEL);
+ packet = kzalloc(sizeof(*packet), GFP_KERNEL);
if (!packet)
goto err1;
@@ -459,7 +459,7 @@ static ssize_t ib_umad_write(struct file *filp, const char __user *buf,
if (count < hdr_size(file) + IB_MGMT_RMPP_HDR)
return -EINVAL;
- packet = kzalloc(sizeof *packet + IB_MGMT_RMPP_HDR, GFP_KERNEL);
+ packet = kzalloc(sizeof(*packet) + IB_MGMT_RMPP_HDR, GFP_KERNEL);
if (!packet)
return -ENOMEM;
@@ -488,7 +488,7 @@ static ssize_t ib_umad_write(struct file *filp, const char __user *buf,
goto err_up;
}
- memset(&ah_attr, 0, sizeof ah_attr);
+ memset(&ah_attr, 0, sizeof(ah_attr));
ah_attr.dlid = be16_to_cpu(packet->mad.hdr.lid);
ah_attr.sl = packet->mad.hdr.sl;
ah_attr.src_path_bits = packet->mad.hdr.path_bits;
@@ -638,7 +638,7 @@ static int ib_umad_reg_agent(struct ib_umad_file *file, void __user *arg,
goto out;
}
- if (copy_from_user(&ureq, arg, sizeof ureq)) {
+ if (copy_from_user(&ureq, arg, sizeof(ureq))) {
ret = -EFAULT;
goto out;
}
@@ -666,7 +666,7 @@ static int ib_umad_reg_agent(struct ib_umad_file *file, void __user *arg,
memset(&req, 0, sizeof(req));
req.mgmt_class = ureq.mgmt_class;
req.mgmt_class_version = ureq.mgmt_class_version;
- memcpy(req.oui, ureq.oui, sizeof req.oui);
+ memcpy(req.oui, ureq.oui, sizeof(req.oui));
if (compat_method_mask) {
u32 *umm = (u32 *) ureq.method_mask;
@@ -677,7 +677,7 @@ static int ib_umad_reg_agent(struct ib_umad_file *file, void __user *arg,
umm[i * 2] | ((u64) umm[i * 2 + 1] << 32);
} else
memcpy(req.method_mask, ureq.method_mask,
- sizeof req.method_mask);
+ sizeof(req.method_mask));
}
agent = ib_register_mad_agent(file->port->ib_dev, file->port->port_num,
@@ -939,7 +939,7 @@ static int ib_umad_open(struct inode *inode, struct file *filp)
goto out;
ret = -ENOMEM;
- file = kzalloc(sizeof *file, GFP_KERNEL);
+ file = kzalloc(sizeof(*file), GFP_KERNEL);
if (!file)
goto out;
@@ -1284,7 +1284,7 @@ static void ib_umad_add_one(struct ib_device *device)
s = rdma_start_port(device);
e = rdma_end_port(device);
- umad_dev = kzalloc(sizeof *umad_dev +
+ umad_dev = kzalloc(sizeof(*umad_dev) +
(e - s + 1) * sizeof (struct ib_umad_port),
GFP_KERNEL);
if (!umad_dev)
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index 6ffc9c4e93af..34ca51768705 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -295,10 +295,10 @@ ssize_t ib_uverbs_get_context(struct ib_uverbs_file *file,
struct file *filp;
int ret;
- if (out_len < sizeof resp)
+ if (out_len < sizeof(resp))
return -ENOSPC;
- if (copy_from_user(&cmd, buf, sizeof cmd))
+ if (copy_from_user(&cmd, buf, sizeof(cmd)))
return -EFAULT;
mutex_lock(&file->mutex);
@@ -308,9 +308,9 @@ ssize_t ib_uverbs_get_context(struct ib_uverbs_file *file,
goto err;
}
- INIT_UDATA(&udata, buf + sizeof cmd,
- (unsigned long) cmd.response + sizeof resp,
- in_len - sizeof cmd, out_len - sizeof resp);
+ INIT_UDATA(&udata, buf + sizeof(cmd),
+ (unsigned long) cmd.response + sizeof(resp),
+ in_len - sizeof(cmd), out_len - sizeof(resp));
ucontext = ib_dev->alloc_ucontext(ib_dev, &udata);
if (IS_ERR(ucontext)) {
@@ -358,7 +358,7 @@ ssize_t ib_uverbs_get_context(struct ib_uverbs_file *file,
}
if (copy_to_user((void __user *) (unsigned long) cmd.response,
- &resp, sizeof resp)) {
+ &resp, sizeof(resp))) {
ret = -EFAULT;
goto err_file;
}
@@ -442,17 +442,17 @@ ssize_t ib_uverbs_query_device(struct ib_uverbs_file *file,
struct ib_uverbs_query_device cmd;
struct ib_uverbs_query_device_resp resp;
- if (out_len < sizeof resp)
+ if (out_len < sizeof(resp))
return -ENOSPC;
- if (copy_from_user(&cmd, buf, sizeof cmd))
+ if (copy_from_user(&cmd, buf, sizeof(cmd)))
return -EFAULT;
- memset(&resp, 0, sizeof resp);
+ memset(&resp, 0, sizeof(resp));
copy_query_dev_fields(file, ib_dev, &resp, &ib_dev->attrs);
if (copy_to_user((void __user *) (unsigned long) cmd.response,
- &resp, sizeof resp))
+ &resp, sizeof(resp)))
return -EFAULT;
return in_len;
@@ -468,17 +468,17 @@ ssize_t ib_uverbs_query_port(struct ib_uverbs_file *file,
struct ib_port_attr attr;
int ret;
- if (out_len < sizeof resp)
+ if (out_len < sizeof(resp))
return -ENOSPC;
- if (copy_from_user(&cmd, buf, sizeof cmd))
+ if (copy_from_user(&cmd, buf, sizeof(cmd)))
return -EFAULT;
ret = ib_query_port(ib_dev, cmd.port_num, &attr);
if (ret)
return ret;
- memset(&resp, 0, sizeof resp);
+ memset(&resp, 0, sizeof(resp));
resp.state = attr.state;
resp.max_mtu = attr.max_mtu;
@@ -503,7 +503,7 @@ ssize_t ib_uverbs_query_port(struct ib_uverbs_file *file,
cmd.port_num);
if (copy_to_user((void __user *) (unsigned long) cmd.response,
- &resp, sizeof resp))
+ &resp, sizeof(resp)))
return -EFAULT;
return in_len;
@@ -521,17 +521,17 @@ ssize_t ib_uverbs_alloc_pd(struct ib_uverbs_file *file,
struct ib_pd *pd;
int ret;
- if (out_len < sizeof resp)
+ if (out_len < sizeof(resp))
return -ENOSPC;
- if (copy_from_user(&cmd, buf, sizeof cmd))
+ if (copy_from_user(&cmd, buf, sizeof(cmd)))
return -EFAULT;
- INIT_UDATA(&udata, buf + sizeof cmd,
- (unsigned long) cmd.response + sizeof resp,
- in_len - sizeof cmd, out_len - sizeof resp);
+ INIT_UDATA(&udata, buf + sizeof(cmd),
+ (unsigned long) cmd.response + sizeof(resp),
+ in_len - sizeof(cmd), out_len - sizeof(resp));
- uobj = kmalloc(sizeof *uobj, GFP_KERNEL);
+ uobj = kmalloc(sizeof(*uobj), GFP_KERNEL);
if (!uobj)
return -ENOMEM;
@@ -554,11 +554,11 @@ ssize_t ib_uverbs_alloc_pd(struct ib_uverbs_file *file,
if (ret)
goto err_idr;
- memset(&resp, 0, sizeof resp);
+ memset(&resp, 0, sizeof(resp));
resp.pd_handle = uobj->id;
if (copy_to_user((void __user *) (unsigned long) cmd.response,
- &resp, sizeof resp)) {
+ &resp, sizeof(resp))) {
ret = -EFAULT;
goto err_copy;
}
@@ -594,7 +594,7 @@ ssize_t ib_uverbs_dealloc_pd(struct ib_uverbs_file *file,
struct ib_pd *pd;
int ret;
- if (copy_from_user(&cmd, buf, sizeof cmd))
+ if (copy_from_user(&cmd, buf, sizeof(cmd)))
return -EFAULT;
uobj = idr_write_uobj(&ib_uverbs_pd_idr, cmd.pd_handle, file->ucontext);
@@ -644,7 +644,7 @@ static int xrcd_table_insert(struct ib_uverbs_device *dev,
struct rb_node **p = &dev->xrcd_tree.rb_node;
struct rb_node *parent = NULL;
- entry = kmalloc(sizeof *entry, GFP_KERNEL);
+ entry = kmalloc(sizeof(*entry), GFP_KERNEL);
if (!entry)
return -ENOMEM;
@@ -730,15 +730,15 @@ ssize_t ib_uverbs_open_xrcd(struct ib_uverbs_file *file,
int ret = 0;
int new_xrcd = 0;
- if (out_len < sizeof resp)
+ if (out_len < sizeof(resp))
return -ENOSPC;
- if (copy_from_user(&cmd, buf, sizeof cmd))
+ if (copy_from_user(&cmd, buf, sizeof(cmd)))
return -EFAULT;
- INIT_UDATA(&udata, buf + sizeof cmd,
- (unsigned long) cmd.response + sizeof resp,
- in_len - sizeof cmd, out_len - sizeof resp);
+ INIT_UDATA(&udata, buf + sizeof(cmd),
+ (unsigned long) cmd.response + sizeof(resp),
+ in_len - sizeof(cmd), out_len - sizeof(resp));
mutex_lock(&file->device->xrcd_tree_mutex);
@@ -764,7 +764,7 @@ ssize_t ib_uverbs_open_xrcd(struct ib_uverbs_file *file,
}
}
- obj = kmalloc(sizeof *obj, GFP_KERNEL);
+ obj = kmalloc(sizeof(*obj), GFP_KERNEL);
if (!obj) {
ret = -ENOMEM;
goto err_tree_mutex_unlock;
@@ -795,7 +795,7 @@ ssize_t ib_uverbs_open_xrcd(struct ib_uverbs_file *file,
if (ret)
goto err_idr;
- memset(&resp, 0, sizeof resp);
+ memset(&resp, 0, sizeof(resp));
resp.xrcd_handle = obj->uobject.id;
if (inode) {
@@ -809,7 +809,7 @@ ssize_t ib_uverbs_open_xrcd(struct ib_uverbs_file *file,
}
if (copy_to_user((void __user *) (unsigned long) cmd.response,
- &resp, sizeof resp)) {
+ &resp, sizeof(resp))) {
ret = -EFAULT;
goto err_copy;
}
@@ -865,7 +865,7 @@ ssize_t ib_uverbs_close_xrcd(struct ib_uverbs_file *file,
int live;
int ret = 0;
- if (copy_from_user(&cmd, buf, sizeof cmd))
+ if (copy_from_user(&cmd, buf, sizeof(cmd)))
return -EFAULT;
mutex_lock(&file->device->xrcd_tree_mutex);
@@ -943,15 +943,15 @@ ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file,
struct ib_mr *mr;
int ret;
- if (out_len < sizeof resp)
+ if (out_len < sizeof(resp))
return -ENOSPC;
- if (copy_from_user(&cmd, buf, sizeof cmd))
+ if (copy_from_user(&cmd, buf, sizeof(cmd)))
return -EFAULT;
- INIT_UDATA(&udata, buf + sizeof cmd,
- (unsigned long) cmd.response + sizeof resp,
- in_len - sizeof cmd, out_len - sizeof resp);
+ INIT_UDATA(&udata, buf + sizeof(cmd),
+ (unsigned long) cmd.response + sizeof(resp),
+ in_len - sizeof(cmd), out_len - sizeof(resp));
if ((cmd.start & ~PAGE_MASK) != (cmd.hca_va & ~PAGE_MASK))
return -EINVAL;
@@ -960,7 +960,7 @@ ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file,
if (ret)
return ret;
- uobj = kmalloc(sizeof *uobj, GFP_KERNEL);
+ uobj = kmalloc(sizeof(*uobj), GFP_KERNEL);
if (!uobj)
return -ENOMEM;
@@ -999,13 +999,13 @@ ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file,
if (ret)
goto err_unreg;
- memset(&resp, 0, sizeof resp);
+ memset(&resp, 0, sizeof(resp));
resp.lkey = mr->lkey;
resp.rkey = mr->rkey;
resp.mr_handle = uobj->id;
if (copy_to_user((void __user *) (unsigned long) cmd.response,
- &resp, sizeof resp)) {
+ &resp, sizeof(resp))) {
ret = -EFAULT;
goto err_copy;
}
@@ -1135,7 +1135,7 @@ ssize_t ib_uverbs_dereg_mr(struct ib_uverbs_file *file,
struct ib_uobject *uobj;
int ret = -EINVAL;
- if (copy_from_user(&cmd, buf, sizeof cmd))
+ if (copy_from_user(&cmd, buf, sizeof(cmd)))
return -EFAULT;
uobj = idr_write_uobj(&ib_uverbs_mr_idr, cmd.mr_handle, file->ucontext);
@@ -1296,10 +1296,10 @@ ssize_t ib_uverbs_create_comp_channel(struct ib_uverbs_file *file,
struct file *filp;
int ret;
- if (out_len < sizeof resp)
+ if (out_len < sizeof(resp))
return -ENOSPC;
- if (copy_from_user(&cmd, buf, sizeof cmd))
+ if (copy_from_user(&cmd, buf, sizeof(cmd)))
return -EFAULT;
ret = get_unused_fd_flags(O_CLOEXEC);
@@ -1314,7 +1314,7 @@ ssize_t ib_uverbs_create_comp_channel(struct ib_uverbs_file *file,
}
if (copy_to_user((void __user *) (unsigned long) cmd.response,
- &resp, sizeof resp)) {
+ &resp, sizeof(resp))) {
put_unused_fd(resp.fd);
fput(filp);
return -EFAULT;
@@ -1347,7 +1347,7 @@ static struct ib_ucq_object *create_cq(struct ib_uverbs_file *file,
if (cmd->comp_vector >= file->device->num_comp_vectors)
return ERR_PTR(-EINVAL);
- obj = kmalloc(sizeof *obj, GFP_KERNEL);
+ obj = kmalloc(sizeof(*obj), GFP_KERNEL);
if (!obj)
return ERR_PTR(-ENOMEM);
@@ -1393,7 +1393,7 @@ static struct ib_ucq_object *create_cq(struct ib_uverbs_file *file,
if (ret)
goto err_free;
- memset(&resp, 0, sizeof resp);
+ memset(&resp, 0, sizeof(resp));
resp.base.cq_handle = obj->uobject.id;
resp.base.cqe = cq->cqe;
@@ -1541,12 +1541,12 @@ ssize_t ib_uverbs_resize_cq(struct ib_uverbs_file *file,
struct ib_cq *cq;
int ret = -EINVAL;
- if (copy_from_user(&cmd, buf, sizeof cmd))
+ if (copy_from_user(&cmd, buf, sizeof(cmd)))
return -EFAULT;
- INIT_UDATA(&udata, buf + sizeof cmd,
- (unsigned long) cmd.response + sizeof resp,
- in_len - sizeof cmd, out_len - sizeof resp);
+ INIT_UDATA(&udata, buf + sizeof(cmd),
+ (unsigned long) cmd.response + sizeof(resp),
+ in_len - sizeof(cmd), out_len - sizeof(resp));
cq = idr_read_cq(cmd.cq_handle, file->ucontext, 0);
if (!cq)
@@ -1559,7 +1559,7 @@ ssize_t ib_uverbs_resize_cq(struct ib_uverbs_file *file,
resp.cqe = cq->cqe;
if (copy_to_user((void __user *) (unsigned long) cmd.response,
- &resp, sizeof resp.cqe))
+ &resp, sizeof(resp.cqe)))
ret = -EFAULT;
out:
@@ -1588,7 +1588,7 @@ static int copy_wc_to_user(void __user *dest, struct ib_wc *wc)
tmp.port_num = wc->port_num;
tmp.reserved = 0;
- if (copy_to_user(dest, &tmp, sizeof tmp))
+ if (copy_to_user(dest, &tmp, sizeof(tmp)))
return -EFAULT;
return 0;
@@ -1607,7 +1607,7 @@ ssize_t ib_uverbs_poll_cq(struct ib_uverbs_file *file,
struct ib_wc wc;
int ret;
- if (copy_from_user(&cmd, buf, sizeof cmd))
+ if (copy_from_user(&cmd, buf, sizeof(cmd)))
return -EFAULT;
cq = idr_read_cq(cmd.cq_handle, file->ucontext, 0);
@@ -1616,9 +1616,9 @@ ssize_t ib_uverbs_poll_cq(struct ib_uverbs_file *file,
/* we copy a struct ib_uverbs_poll_cq_resp to user space */
header_ptr = (void __user *)(unsigned long) cmd.response;
- data_ptr = header_ptr + sizeof resp;
+ data_ptr = header_ptr + sizeof(resp);
- memset(&resp, 0, sizeof resp);
+ memset(&resp, 0, sizeof(resp));
while (resp.count < cmd.ne) {
ret = ib_poll_cq(cq, 1, &wc);
if (ret < 0)
@@ -1634,7 +1634,7 @@ ssize_t ib_uverbs_poll_cq(struct ib_uverbs_file *file,
++resp.count;
}
- if (copy_to_user(header_ptr, &resp, sizeof resp)) {
+ if (copy_to_user(header_ptr, &resp, sizeof(resp))) {
ret = -EFAULT;
goto out_put;
}
@@ -1654,7 +1654,7 @@ ssize_t ib_uverbs_req_notify_cq(struct ib_uverbs_file *file,
struct ib_uverbs_req_notify_cq cmd;
struct ib_cq *cq;
- if (copy_from_user(&cmd, buf, sizeof cmd))
+ if (copy_from_user(&cmd, buf, sizeof(cmd)))
return -EFAULT;
cq = idr_read_cq(cmd.cq_handle, file->ucontext, 0);
@@ -1682,7 +1682,7 @@ ssize_t ib_uverbs_destroy_cq(struct ib_uverbs_file *file,
struct ib_uverbs_event_file *ev_file;
int ret = -EINVAL;
- if (copy_from_user(&cmd, buf, sizeof cmd))
+ if (copy_from_user(&cmd, buf, sizeof(cmd)))
return -EFAULT;
uobj = idr_write_uobj(&ib_uverbs_cq_idr, cmd.cq_handle, file->ucontext);
@@ -1709,14 +1709,14 @@ ssize_t ib_uverbs_destroy_cq(struct ib_uverbs_file *file,
ib_uverbs_release_ucq(file, ev_file, obj);
- memset(&resp, 0, sizeof resp);
+ memset(&resp, 0, sizeof(resp));
resp.comp_events_reported = obj->comp_events_reported;
resp.async_events_reported = obj->async_events_reported;
put_uobj(uobj);
if (copy_to_user((void __user *) (unsigned long) cmd.response,
- &resp, sizeof resp))
+ &resp, sizeof(resp)))
return -EFAULT;
return in_len;
@@ -1748,7 +1748,7 @@ static int create_qp(struct ib_uverbs_file *file,
if (cmd->qp_type == IB_QPT_RAW_PACKET && !capable(CAP_NET_RAW))
return -EPERM;
- obj = kzalloc(sizeof *obj, GFP_KERNEL);
+ obj = kzalloc(sizeof(*obj), GFP_KERNEL);
if (!obj)
return -ENOMEM;
@@ -1875,7 +1875,7 @@ static int create_qp(struct ib_uverbs_file *file,
if (ret)
goto err_destroy;
- memset(&resp, 0, sizeof resp);
+ memset(&resp, 0, sizeof(resp));
resp.base.qpn = qp->qp_num;
resp.base.qp_handle = obj->uevent.uobject.id;
resp.base.max_recv_sge = attr.cap.max_recv_sge;
@@ -2059,17 +2059,17 @@ ssize_t ib_uverbs_open_qp(struct ib_uverbs_file *file,
struct ib_qp_open_attr attr;
int ret;
- if (out_len < sizeof resp)
+ if (out_len < sizeof(resp))
return -ENOSPC;
- if (copy_from_user(&cmd, buf, sizeof cmd))
+ if (copy_from_user(&cmd, buf, sizeof(cmd)))
return -EFAULT;
- INIT_UDATA(&udata, buf + sizeof cmd,
- (unsigned long) cmd.response + sizeof resp,
- in_len - sizeof cmd, out_len - sizeof resp);
+ INIT_UDATA(&udata, buf + sizeof(cmd),
+ (unsigned long) cmd.response + sizeof(resp),
+ in_len - sizeof(cmd), out_len - sizeof(resp));
- obj = kmalloc(sizeof *obj, GFP_KERNEL);
+ obj = kmalloc(sizeof(*obj), GFP_KERNEL);
if (!obj)
return -ENOMEM;
@@ -2104,12 +2104,12 @@ ssize_t ib_uverbs_open_qp(struct ib_uverbs_file *file,
if (ret)
goto err_destroy;
- memset(&resp, 0, sizeof resp);
+ memset(&resp, 0, sizeof(resp));
resp.qpn = qp->qp_num;
resp.qp_handle = obj->uevent.uobject.id;
if (copy_to_user((void __user *) (unsigned long) cmd.response,
- &resp, sizeof resp)) {
+ &resp, sizeof(resp))) {
ret = -EFAULT;
goto err_remove;
}
@@ -2152,11 +2152,11 @@ ssize_t ib_uverbs_query_qp(struct ib_uverbs_file *file,
struct ib_qp_init_attr *init_attr;
int ret;
- if (copy_from_user(&cmd, buf, sizeof cmd))
+ if (copy_from_user(&cmd, buf, sizeof(cmd)))
return -EFAULT;
- attr = kmalloc(sizeof *attr, GFP_KERNEL);
- init_attr = kmalloc(sizeof *init_attr, GFP_KERNEL);
+ attr = kmalloc(sizeof(*attr), GFP_KERNEL);
+ init_attr = kmalloc(sizeof(*init_attr), GFP_KERNEL);
if (!attr || !init_attr) {
ret = -ENOMEM;
goto out;
@@ -2175,7 +2175,7 @@ ssize_t ib_uverbs_query_qp(struct ib_uverbs_file *file,
if (ret)
goto out;
- memset(&resp, 0, sizeof resp);
+ memset(&resp, 0, sizeof(resp));
resp.qp_state = attr->qp_state;
resp.cur_qp_state = attr->cur_qp_state;
@@ -2231,7 +2231,7 @@ ssize_t ib_uverbs_query_qp(struct ib_uverbs_file *file,
resp.sq_sig_all = init_attr->sq_sig_type == IB_SIGNAL_ALL_WR;
if (copy_to_user((void __user *) (unsigned long) cmd.response,
- &resp, sizeof resp))
+ &resp, sizeof(resp)))
ret = -EFAULT;
out:
@@ -2266,13 +2266,13 @@ ssize_t ib_uverbs_modify_qp(struct ib_uverbs_file *file,
struct ib_qp_attr *attr;
int ret;
- if (copy_from_user(&cmd, buf, sizeof cmd))
+ if (copy_from_user(&cmd, buf, sizeof(cmd)))
return -EFAULT;
- INIT_UDATA(&udata, buf + sizeof cmd, NULL, in_len - sizeof cmd,
+ INIT_UDATA(&udata, buf + sizeof(cmd), NULL, in_len - sizeof(cmd),
out_len);
- attr = kmalloc(sizeof *attr, GFP_KERNEL);
+ attr = kmalloc(sizeof(*attr), GFP_KERNEL);
if (!attr)
return -ENOMEM;
@@ -2364,10 +2364,10 @@ ssize_t ib_uverbs_destroy_qp(struct ib_uverbs_file *file,
struct ib_uqp_object *obj;
int ret = -EINVAL;
- if (copy_from_user(&cmd, buf, sizeof cmd))
+ if (copy_from_user(&cmd, buf, sizeof(cmd)))
return -EFAULT;
- memset(&resp, 0, sizeof resp);
+ memset(&resp, 0, sizeof(resp));
uobj = idr_write_uobj(&ib_uverbs_qp_idr, cmd.qp_handle, file->ucontext);
if (!uobj)
@@ -2405,7 +2405,7 @@ ssize_t ib_uverbs_destroy_qp(struct ib_uverbs_file *file,
put_uobj(uobj);
if (copy_to_user((void __user *) (unsigned long) cmd.response,
- &resp, sizeof resp))
+ &resp, sizeof(resp)))
return -EFAULT;
return in_len;
@@ -2432,10 +2432,10 @@ ssize_t ib_uverbs_post_send(struct ib_uverbs_file *file,
ssize_t ret = -EINVAL;
size_t next_size;
- if (copy_from_user(&cmd, buf, sizeof cmd))
+ if (copy_from_user(&cmd, buf, sizeof(cmd)))
return -EFAULT;
- if (in_len < sizeof cmd + cmd.wqe_size * cmd.wr_count +
+ if (in_len < sizeof(cmd) + cmd.wqe_size * cmd.wr_count +
cmd.sge_count * sizeof (struct ib_uverbs_sge))
return -EINVAL;
@@ -2455,7 +2455,7 @@ ssize_t ib_uverbs_post_send(struct ib_uverbs_file *file,
last = NULL;
for (i = 0; i < cmd.wr_count; ++i) {
if (copy_from_user(user_wr,
- buf + sizeof cmd + i * cmd.wqe_size,
+ buf + sizeof(cmd) + i * cmd.wqe_size,
cmd.wqe_size)) {
ret = -EFAULT;
goto out_put;
@@ -2563,7 +2563,7 @@ ssize_t ib_uverbs_post_send(struct ib_uverbs_file *file,
next->sg_list = (void *) next +
ALIGN(next_size, sizeof(struct ib_sge));
if (copy_from_user(next->sg_list,
- buf + sizeof cmd +
+ buf + sizeof(cmd) +
cmd.wr_count * cmd.wqe_size +
sg_ind * sizeof (struct ib_sge),
next->num_sge * sizeof (struct ib_sge))) {
@@ -2585,7 +2585,7 @@ ssize_t ib_uverbs_post_send(struct ib_uverbs_file *file,
}
if (copy_to_user((void __user *) (unsigned long) cmd.response,
- &resp, sizeof resp))
+ &resp, sizeof(resp)))
ret = -EFAULT;
out_put:
@@ -2642,7 +2642,7 @@ static struct ib_recv_wr *ib_uverbs_unmarshall_recv(const char __user *buf,
goto err;
}
- next = kmalloc(ALIGN(sizeof *next, sizeof (struct ib_sge)) +
+ next = kmalloc(ALIGN(sizeof(*next), sizeof (struct ib_sge)) +
user_wr->num_sge * sizeof (struct ib_sge),
GFP_KERNEL);
if (!next) {
@@ -2662,7 +2662,7 @@ static struct ib_recv_wr *ib_uverbs_unmarshall_recv(const char __user *buf,
if (next->num_sge) {
next->sg_list = (void *) next +
- ALIGN(sizeof *next, sizeof (struct ib_sge));
+ ALIGN(sizeof(*next), sizeof (struct ib_sge));
if (copy_from_user(next->sg_list,
buf + wr_count * wqe_size +
sg_ind * sizeof (struct ib_sge),
@@ -2701,11 +2701,11 @@ ssize_t ib_uverbs_post_recv(struct ib_uverbs_file *file,
struct ib_qp *qp;
ssize_t ret = -EINVAL;
- if (copy_from_user(&cmd, buf, sizeof cmd))
+ if (copy_from_user(&cmd, buf, sizeof(cmd)))
return -EFAULT;
- wr = ib_uverbs_unmarshall_recv(buf + sizeof cmd,
- in_len - sizeof cmd, cmd.wr_count,
+ wr = ib_uverbs_unmarshall_recv(buf + sizeof(cmd),
+ in_len - sizeof(cmd), cmd.wr_count,
cmd.sge_count, cmd.wqe_size);
if (IS_ERR(wr))
return PTR_ERR(wr);
@@ -2727,7 +2727,7 @@ ssize_t ib_uverbs_post_recv(struct ib_uverbs_file *file,
}
if (copy_to_user((void __user *) (unsigned long) cmd.response,
- &resp, sizeof resp))
+ &resp, sizeof(resp)))
ret = -EFAULT;
out:
@@ -2751,11 +2751,11 @@ ssize_t ib_uverbs_post_srq_recv(struct ib_uverbs_file *file,
struct ib_srq *srq;
ssize_t ret = -EINVAL;
- if (copy_from_user(&cmd, buf, sizeof cmd))
+ if (copy_from_user(&cmd, buf, sizeof(cmd)))
return -EFAULT;
- wr = ib_uverbs_unmarshall_recv(buf + sizeof cmd,
- in_len - sizeof cmd, cmd.wr_count,
+ wr = ib_uverbs_unmarshall_recv(buf + sizeof(cmd),
+ in_len - sizeof(cmd), cmd.wr_count,
cmd.sge_count, cmd.wqe_size);
if (IS_ERR(wr))
return PTR_ERR(wr);
@@ -2777,7 +2777,7 @@ ssize_t ib_uverbs_post_srq_recv(struct ib_uverbs_file *file,
}
if (copy_to_user((void __user *) (unsigned long) cmd.response,
- &resp, sizeof resp))
+ &resp, sizeof(resp)))
ret = -EFAULT;
out:
@@ -2803,13 +2803,13 @@ ssize_t ib_uverbs_create_ah(struct ib_uverbs_file *file,
struct ib_ah_attr attr;
int ret;
- if (out_len < sizeof resp)
+ if (out_len < sizeof(resp))
return -ENOSPC;
- if (copy_from_user(&cmd, buf, sizeof cmd))
+ if (copy_from_user(&cmd, buf, sizeof(cmd)))
return -EFAULT;
- uobj = kmalloc(sizeof *uobj, GFP_KERNEL);
+ uobj = kmalloc(sizeof(*uobj), GFP_KERNEL);
if (!uobj)
return -ENOMEM;
@@ -2851,7 +2851,7 @@ ssize_t ib_uverbs_create_ah(struct ib_uverbs_file *file,
resp.ah_handle = uobj->id;
if (copy_to_user((void __user *) (unsigned long) cmd.response,
- &resp, sizeof resp)) {
+ &resp, sizeof(resp))) {
ret = -EFAULT;
goto err_copy;
}
@@ -2891,7 +2891,7 @@ ssize_t ib_uverbs_destroy_ah(struct ib_uverbs_file *file,
struct ib_uobject *uobj;
int ret;
- if (copy_from_user(&cmd, buf, sizeof cmd))
+ if (copy_from_user(&cmd, buf, sizeof(cmd)))
return -EFAULT;
uobj = idr_write_uobj(&ib_uverbs_ah_idr, cmd.ah_handle, file->ucontext);
@@ -2930,7 +2930,7 @@ ssize_t ib_uverbs_attach_mcast(struct ib_uverbs_file *file,
struct ib_uverbs_mcast_entry *mcast;
int ret;
- if (copy_from_user(&cmd, buf, sizeof cmd))
+ if (copy_from_user(&cmd, buf, sizeof(cmd)))
return -EFAULT;
qp = idr_write_qp(cmd.qp_handle, file->ucontext);
@@ -2941,19 +2941,19 @@ ssize_t ib_uverbs_attach_mcast(struct ib_uverbs_file *file,
list_for_each_entry(mcast, &obj->mcast_list, list)
if (cmd.mlid == mcast->lid &&
- !memcmp(cmd.gid, mcast->gid.raw, sizeof mcast->gid.raw)) {
+ !memcmp(cmd.gid, mcast->gid.raw, sizeof(mcast->gid.raw))) {
ret = 0;
goto out_put;
}
- mcast = kmalloc(sizeof *mcast, GFP_KERNEL);
+ mcast = kmalloc(sizeof(*mcast), GFP_KERNEL);
if (!mcast) {
ret = -ENOMEM;
goto out_put;
}
mcast->lid = cmd.mlid;
- memcpy(mcast->gid.raw, cmd.gid, sizeof mcast->gid.raw);
+ memcpy(mcast->gid.raw, cmd.gid, sizeof(mcast->gid.raw));
ret = ib_attach_mcast(qp, &mcast->gid, cmd.mlid);
if (!ret)
@@ -2978,7 +2978,7 @@ ssize_t ib_uverbs_detach_mcast(struct ib_uverbs_file *file,
struct ib_uverbs_mcast_entry *mcast;
int ret = -EINVAL;
- if (copy_from_user(&cmd, buf, sizeof cmd))
+ if (copy_from_user(&cmd, buf, sizeof(cmd)))
return -EFAULT;
qp = idr_write_qp(cmd.qp_handle, file->ucontext);
@@ -2993,7 +2993,7 @@ ssize_t ib_uverbs_detach_mcast(struct ib_uverbs_file *file,
list_for_each_entry(mcast, &obj->mcast_list, list)
if (cmd.mlid == mcast->lid &&
- !memcmp(cmd.gid, mcast->gid.raw, sizeof mcast->gid.raw)) {
+ !memcmp(cmd.gid, mcast->gid.raw, sizeof(mcast->gid.raw))) {
list_del(&mcast->list);
kfree(mcast);
break;
@@ -3265,7 +3265,7 @@ static int __uverbs_create_xsrq(struct ib_uverbs_file *file,
struct ib_srq_init_attr attr;
int ret;
- obj = kmalloc(sizeof *obj, GFP_KERNEL);
+ obj = kmalloc(sizeof(*obj), GFP_KERNEL);
if (!obj)
return -ENOMEM;
@@ -3333,7 +3333,7 @@ static int __uverbs_create_xsrq(struct ib_uverbs_file *file,
if (ret)
goto err_destroy;
- memset(&resp, 0, sizeof resp);
+ memset(&resp, 0, sizeof(resp));
resp.srq_handle = obj->uevent.uobject.id;
resp.max_wr = attr.attr.max_wr;
resp.max_sge = attr.attr.max_sge;
@@ -3341,7 +3341,7 @@ static int __uverbs_create_xsrq(struct ib_uverbs_file *file,
resp.srqn = srq->ext.xrc.srq_num;
if (copy_to_user((void __user *) (unsigned long) cmd->response,
- &resp, sizeof resp)) {
+ &resp, sizeof(resp))) {
ret = -EFAULT;
goto err_copy;
}
@@ -3397,10 +3397,10 @@ ssize_t ib_uverbs_create_srq(struct ib_uverbs_file *file,
struct ib_udata udata;
int ret;
- if (out_len < sizeof resp)
+ if (out_len < sizeof(resp))
return -ENOSPC;
- if (copy_from_user(&cmd, buf, sizeof cmd))
+ if (copy_from_user(&cmd, buf, sizeof(cmd)))
return -EFAULT;
xcmd.response = cmd.response;
@@ -3411,9 +3411,9 @@ ssize_t ib_uverbs_create_srq(struct ib_uverbs_file *file,
xcmd.max_sge = cmd.max_sge;
xcmd.srq_limit = cmd.srq_limit;
- INIT_UDATA(&udata, buf + sizeof cmd,
- (unsigned long) cmd.response + sizeof resp,
- in_len - sizeof cmd, out_len - sizeof resp);
+ INIT_UDATA(&udata, buf + sizeof(cmd),
+ (unsigned long) cmd.response + sizeof(resp),
+ in_len - sizeof(cmd), out_len - sizeof(resp));
ret = __uverbs_create_xsrq(file, ib_dev, &xcmd, &udata);
if (ret)
@@ -3431,15 +3431,15 @@ ssize_t ib_uverbs_create_xsrq(struct ib_uverbs_file *file,
struct ib_udata udata;
int ret;
- if (out_len < sizeof resp)
+ if (out_len < sizeof(resp))
return -ENOSPC;
- if (copy_from_user(&cmd, buf, sizeof cmd))
+ if (copy_from_user(&cmd, buf, sizeof(cmd)))
return -EFAULT;
- INIT_UDATA(&udata, buf + sizeof cmd,
- (unsigned long) cmd.response + sizeof resp,
- in_len - sizeof cmd, out_len - sizeof resp);
+ INIT_UDATA(&udata, buf + sizeof(cmd),
+ (unsigned long) cmd.response + sizeof(resp),
+ in_len - sizeof(cmd), out_len - sizeof(resp));
ret = __uverbs_create_xsrq(file, ib_dev, &cmd, &udata);
if (ret)
@@ -3459,10 +3459,10 @@ ssize_t ib_uverbs_modify_srq(struct ib_uverbs_file *file,
struct ib_srq_attr attr;
int ret;
- if (copy_from_user(&cmd, buf, sizeof cmd))
+ if (copy_from_user(&cmd, buf, sizeof(cmd)))
return -EFAULT;
- INIT_UDATA(&udata, buf + sizeof cmd, NULL, in_len - sizeof cmd,
+ INIT_UDATA(&udata, buf + sizeof(cmd), NULL, in_len - sizeof(cmd),
out_len);
srq = idr_read_srq(cmd.srq_handle, file->ucontext);
@@ -3490,10 +3490,10 @@ ssize_t ib_uverbs_query_srq(struct ib_uverbs_file *file,
struct ib_srq *srq;
int ret;
- if (out_len < sizeof resp)
+ if (out_len < sizeof(resp))
return -ENOSPC;
- if (copy_from_user(&cmd, buf, sizeof cmd))
+ if (copy_from_user(&cmd, buf, sizeof(cmd)))
return -EFAULT;
srq = idr_read_srq(cmd.srq_handle, file->ucontext);
@@ -3507,14 +3507,14 @@ ssize_t ib_uverbs_query_srq(struct ib_uverbs_file *file,
if (ret)
return ret;
- memset(&resp, 0, sizeof resp);
+ memset(&resp, 0, sizeof(resp));
resp.max_wr = attr.max_wr;
resp.max_sge = attr.max_sge;
resp.srq_limit = attr.srq_limit;
if (copy_to_user((void __user *) (unsigned long) cmd.response,
- &resp, sizeof resp))
+ &resp, sizeof(resp)))
return -EFAULT;
return in_len;
@@ -3534,7 +3534,7 @@ ssize_t ib_uverbs_destroy_srq(struct ib_uverbs_file *file,
struct ib_usrq_object *us;
enum ib_srq_type srq_type;
- if (copy_from_user(&cmd, buf, sizeof cmd))
+ if (copy_from_user(&cmd, buf, sizeof(cmd)))
return -EFAULT;
uobj = idr_write_uobj(&ib_uverbs_srq_idr, cmd.srq_handle, file->ucontext);
@@ -3566,13 +3566,13 @@ ssize_t ib_uverbs_destroy_srq(struct ib_uverbs_file *file,
ib_uverbs_release_uevent(file, obj);
- memset(&resp, 0, sizeof resp);
+ memset(&resp, 0, sizeof(resp));
resp.events_reported = obj->events_reported;
put_uobj(uobj);
if (copy_to_user((void __user *) (unsigned long) cmd.response,
- &resp, sizeof resp))
+ &resp, sizeof(resp)))
ret = -EFAULT;
return ret ? ret : in_len;
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index 39680aed99dd..03d8ffa60ba3 100644
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -487,7 +487,7 @@ void ib_uverbs_comp_handler(struct ib_cq *cq, void *cq_context)
return;
}
- entry = kmalloc(sizeof *entry, GFP_ATOMIC);
+ entry = kmalloc(sizeof(*entry), GFP_ATOMIC);
if (!entry) {
spin_unlock_irqrestore(&file->lock, flags);
return;
@@ -520,7 +520,7 @@ static void ib_uverbs_async_handler(struct ib_uverbs_file *file,
return;
}
- entry = kmalloc(sizeof *entry, GFP_ATOMIC);
+ entry = kmalloc(sizeof(*entry), GFP_ATOMIC);
if (!entry) {
spin_unlock_irqrestore(&file->async_file->lock, flags);
return;
@@ -693,10 +693,10 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf,
int srcu_key;
ssize_t ret;
- if (count < sizeof hdr)
+ if (count < sizeof(hdr))
return -EINVAL;
- if (copy_from_user(&hdr, buf, sizeof hdr))
+ if (copy_from_user(&hdr, buf, sizeof(hdr)))
return -EFAULT;
srcu_key = srcu_read_lock(&file->device->disassociate_srcu);
@@ -1080,7 +1080,7 @@ static void ib_uverbs_add_one(struct ib_device *device)
if (!device->alloc_ucontext)
return;
- uverbs_dev = kzalloc(sizeof *uverbs_dev, GFP_KERNEL);
+ uverbs_dev = kzalloc(sizeof(*uverbs_dev), GFP_KERNEL);
if (!uverbs_dev)
return;
diff --git a/drivers/infiniband/core/uverbs_marshall.c b/drivers/infiniband/core/uverbs_marshall.c
index af020f80d50f..afb79ca25bc6 100644
--- a/drivers/infiniband/core/uverbs_marshall.c
+++ b/drivers/infiniband/core/uverbs_marshall.c
@@ -36,7 +36,7 @@
void ib_copy_ah_attr_to_user(struct ib_uverbs_ah_attr *dst,
struct ib_ah_attr *src)
{
- memcpy(dst->grh.dgid, src->grh.dgid.raw, sizeof src->grh.dgid);
+ memcpy(dst->grh.dgid, src->grh.dgid.raw, sizeof(src->grh.dgid));
dst->grh.flow_label = src->grh.flow_label;
dst->grh.sgid_index = src->grh.sgid_index;
dst->grh.hop_limit = src->grh.hop_limit;
@@ -94,8 +94,8 @@ EXPORT_SYMBOL(ib_copy_qp_attr_to_user);
void ib_copy_path_rec_to_user(struct ib_user_path_rec *dst,
struct ib_sa_path_rec *src)
{
- memcpy(dst->dgid, src->dgid.raw, sizeof src->dgid);
- memcpy(dst->sgid, src->sgid.raw, sizeof src->sgid);
+ memcpy(dst->dgid, src->dgid.raw, sizeof(src->dgid));
+ memcpy(dst->sgid, src->sgid.raw, sizeof(src->sgid));
dst->dlid = src->dlid;
dst->slid = src->slid;
@@ -120,8 +120,8 @@ EXPORT_SYMBOL(ib_copy_path_rec_to_user);
void ib_copy_path_rec_from_user(struct ib_sa_path_rec *dst,
struct ib_user_path_rec *src)
{
- memcpy(dst->dgid.raw, src->dgid, sizeof dst->dgid);
- memcpy(dst->sgid.raw, src->sgid, sizeof dst->sgid);
+ memcpy(dst->dgid.raw, src->dgid, sizeof(dst->dgid));
+ memcpy(dst->sgid.raw, src->sgid, sizeof(dst->sgid));
dst->dlid = src->dlid;
dst->slid = src->slid;
diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index 5af6d024e053..bee1e89c9a09 100644
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -438,7 +438,7 @@ int ib_init_ah_from_wc(struct ib_device *device, u8 port_num,
union ib_gid dgid;
union ib_gid sgid;
- memset(ah_attr, 0, sizeof *ah_attr);
+ memset(ah_attr, 0, sizeof(*ah_attr));
if (rdma_cap_eth_ah(device, port_num)) {
if (wc->wc_flags & IB_WC_WITH_NETWORK_HDR_TYPE)
net_type = wc->network_hdr_type;
@@ -682,7 +682,7 @@ static struct ib_qp *__ib_open_qp(struct ib_qp *real_qp,
struct ib_qp *qp;
unsigned long flags;
- qp = kzalloc(sizeof *qp, GFP_KERNEL);
+ qp = kzalloc(sizeof(*qp), GFP_KERNEL);
if (!qp)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/infiniband/hw/cxgb3/cxio_hal.c b/drivers/infiniband/hw/cxgb3/cxio_hal.c
index de1c61b417d6..720372eaa958 100644
--- a/drivers/infiniband/hw/cxgb3/cxio_hal.c
+++ b/drivers/infiniband/hw/cxgb3/cxio_hal.c
@@ -221,7 +221,7 @@ static u32 get_qpid(struct cxio_rdev *rdev_p, struct cxio_ucontext *uctx)
if (!qpid)
goto out;
for (i = qpid+1; i & rdev_p->qpmask; i++) {
- entry = kmalloc(sizeof *entry, GFP_KERNEL);
+ entry = kmalloc(sizeof(*entry), GFP_KERNEL);
if (!entry)
break;
entry->qpid = i;
@@ -239,7 +239,7 @@ static void put_qpid(struct cxio_rdev *rdev_p, u32 qpid,
{
struct cxio_qpid_list *entry;
- entry = kmalloc(sizeof *entry, GFP_KERNEL);
+ entry = kmalloc(sizeof(*entry), GFP_KERNEL);
if (!entry)
return;
PDBG("%s qpid 0x%x\n", __func__, qpid);
diff --git a/drivers/infiniband/hw/cxgb3/iwch_cm.c b/drivers/infiniband/hw/cxgb3/iwch_cm.c
index f504ba73e5dc..52a451f26110 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_cm.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_cm.c
@@ -172,7 +172,7 @@ static void release_tid(struct t3cdev *tdev, u32 hwtid, struct sk_buff *skb)
{
struct cpl_tid_release *req;
- skb = get_skb(skb, sizeof *req, GFP_KERNEL);
+ skb = get_skb(skb, sizeof(*req), GFP_KERNEL);
if (!skb)
return;
req = (struct cpl_tid_release *) skb_put(skb, sizeof(*req));
diff --git a/drivers/infiniband/hw/cxgb3/iwch_provider.c b/drivers/infiniband/hw/cxgb3/iwch_provider.c
index 2734820d291b..524bd0023ef2 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_provider.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_provider.c
@@ -168,7 +168,7 @@ static struct ib_cq *iwch_create_cq(struct ib_device *ibdev,
if (ib_context) {
ucontext = to_iwch_ucontext(ib_context);
if (!t3a_device(rhp)) {
- if (ib_copy_from_udata(&ureq, udata, sizeof (ureq))) {
+ if (ib_copy_from_udata(&ureq, udata, sizeof(ureq))) {
kfree(chp);
return ERR_PTR(-EFAULT);
}
@@ -211,7 +211,7 @@ static struct ib_cq *iwch_create_cq(struct ib_device *ibdev,
if (ucontext) {
struct iwch_mm_entry *mm;
- mm = kmalloc(sizeof *mm, GFP_KERNEL);
+ mm = kmalloc(sizeof(*mm), GFP_KERNEL);
if (!mm) {
iwch_destroy_cq(&chp->ibcq);
return ERR_PTR(-ENOMEM);
@@ -224,7 +224,7 @@ static struct ib_cq *iwch_create_cq(struct ib_device *ibdev,
spin_unlock(&ucontext->mmap_lock);
mm->key = uresp.key;
mm->addr = virt_to_phys(chp->cq.queue);
- if (udata->outlen < sizeof uresp) {
+ if (udata->outlen < sizeof(uresp)) {
if (!warned++)
printk(KERN_WARNING MOD "Warning - "
"downlevel libcxgb3 (non-fatal).\n");
@@ -236,7 +236,7 @@ static struct ib_cq *iwch_create_cq(struct ib_device *ibdev,
sizeof(struct t3_cqe));
uresp.memsize = mm->len;
uresp.reserved = 0;
- resplen = sizeof uresp;
+ resplen = sizeof(uresp);
}
if (ib_copy_to_udata(udata, &uresp, resplen)) {
kfree(mm);
@@ -442,7 +442,7 @@ static struct ib_pd *iwch_allocate_pd(struct ib_device *ibdev,
php->pdid = pdid;
php->rhp = rhp;
if (context) {
- if (ib_copy_to_udata(udata, &php->pdid, sizeof (__u32))) {
+ if (ib_copy_to_udata(udata, &php->pdid, sizeof(__u32))) {
iwch_deallocate_pd(&php->ibpd);
return ERR_PTR(-EFAULT);
}
@@ -604,7 +604,7 @@ static struct ib_mr *iwch_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
for (k = 0; k < len; ++k) {
pages[i++] = cpu_to_be64(sg_dma_address(sg) +
mhp->umem->page_size * k);
- if (i == PAGE_SIZE / sizeof *pages) {
+ if (i == PAGE_SIZE / sizeof(*pages)) {
err = iwch_write_pbl(mhp, pages, i, n);
if (err)
goto pbl_done;
@@ -639,7 +639,7 @@ static struct ib_mr *iwch_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
PDBG("%s user resp pbl_addr 0x%x\n", __func__,
uresp.pbl_addr);
- if (ib_copy_to_udata(udata, &uresp, sizeof (uresp))) {
+ if (ib_copy_to_udata(udata, &uresp, sizeof(uresp))) {
iwch_dereg_mr(&mhp->ibmr);
err = -EFAULT;
goto err;
@@ -933,13 +933,13 @@ static struct ib_qp *iwch_create_qp(struct ib_pd *pd,
struct iwch_mm_entry *mm1, *mm2;
- mm1 = kmalloc(sizeof *mm1, GFP_KERNEL);
+ mm1 = kmalloc(sizeof(*mm1), GFP_KERNEL);
if (!mm1) {
iwch_destroy_qp(&qhp->ibqp);
return ERR_PTR(-ENOMEM);
}
- mm2 = kmalloc(sizeof *mm2, GFP_KERNEL);
+ mm2 = kmalloc(sizeof(*mm2), GFP_KERNEL);
if (!mm2) {
kfree(mm1);
iwch_destroy_qp(&qhp->ibqp);
@@ -956,7 +956,7 @@ static struct ib_qp *iwch_create_qp(struct ib_pd *pd,
uresp.db_key = ucontext->key;
ucontext->key += PAGE_SIZE;
spin_unlock(&ucontext->mmap_lock);
- if (ib_copy_to_udata(udata, &uresp, sizeof (uresp))) {
+ if (ib_copy_to_udata(udata, &uresp, sizeof(uresp))) {
kfree(mm1);
kfree(mm2);
iwch_destroy_qp(&qhp->ibqp);
@@ -999,7 +999,7 @@ static int iwch_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
if (!attr_mask)
return 0;
- memset(&attrs, 0, sizeof attrs);
+ memset(&attrs, 0, sizeof(attrs));
qhp = to_iwch_qp(ibqp);
rhp = qhp->rhp;
@@ -1095,7 +1095,7 @@ static int iwch_query_device(struct ib_device *ibdev, struct ib_device_attr *pro
return -EINVAL;
dev = to_iwch_dev(ibdev);
- memset(props, 0, sizeof *props);
+ memset(props, 0, sizeof(*props));
memcpy(&props->sys_image_guid, dev->rdev.t3cdev_p->lldev->dev_addr, 6);
props->hw_ver = dev->rdev.t3cdev_p->type;
props->fw_ver = fw_vers_string_to_u64(dev);
@@ -1231,7 +1231,7 @@ static int iwch_get_mib(struct ib_device *ibdev,
if (ret)
return -ENOSYS;
- memset(stats, 0, sizeof *stats);
+ memset(stats, 0, sizeof(*stats));
stats->iw.ipInReceives = ((u64) m.ipInReceive_hi << 32) +
m.ipInReceive_lo;
stats->iw.ipInHdrErrors = ((u64) m.ipInHdrErrors_hi << 32) +
diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c
index cd2ff5f9518a..9abbeedd16c0 100644
--- a/drivers/infiniband/hw/cxgb4/cm.c
+++ b/drivers/infiniband/hw/cxgb4/cm.c
@@ -223,7 +223,7 @@ static void release_tid(struct c4iw_rdev *rdev, u32 hwtid, struct sk_buff *skb)
{
struct cpl_tid_release *req;
- skb = get_skb(skb, sizeof *req, GFP_KERNEL);
+ skb = get_skb(skb, sizeof(*req), GFP_KERNEL);
if (!skb)
return;
req = (struct cpl_tid_release *) skb_put(skb, sizeof(*req));
@@ -528,7 +528,7 @@ static int send_halfclose(struct c4iw_ep *ep, gfp_t gfp)
{
struct cpl_close_con_req *req;
struct sk_buff *skb;
- int wrlen = roundup(sizeof *req, 16);
+ int wrlen = roundup(sizeof(*req), 16);
PDBG("%s ep %p tid %u\n", __func__, ep, ep->hwtid);
skb = get_skb(NULL, wrlen, gfp);
@@ -549,7 +549,7 @@ static int send_halfclose(struct c4iw_ep *ep, gfp_t gfp)
static int send_abort(struct c4iw_ep *ep, struct sk_buff *skb, gfp_t gfp)
{
struct cpl_abort_req *req;
- int wrlen = roundup(sizeof *req, 16);
+ int wrlen = roundup(sizeof(*req), 16);
PDBG("%s ep %p tid %u\n", __func__, ep, ep->hwtid);
skb = get_skb(skb, wrlen, gfp);
@@ -861,7 +861,7 @@ static void send_mpa_req(struct c4iw_ep *ep, struct sk_buff *skb,
mpalen = sizeof(*mpa) + ep->plen;
if (mpa_rev_to_use == 2)
mpalen += sizeof(struct mpa_v2_conn_params);
- wrlen = roundup(mpalen + sizeof *req, 16);
+ wrlen = roundup(mpalen + sizeof(*req), 16);
skb = get_skb(skb, wrlen, GFP_KERNEL);
if (!skb) {
connect_reply_upcall(ep, -ENOMEM);
@@ -954,7 +954,7 @@ static int send_mpa_reject(struct c4iw_ep *ep, const void *pdata, u8 plen)
mpalen = sizeof(*mpa) + plen;
if (ep->mpa_attr.version == 2 && ep->mpa_attr.enhanced_rdma_conn)
mpalen += sizeof(struct mpa_v2_conn_params);
- wrlen = roundup(mpalen + sizeof *req, 16);
+ wrlen = roundup(mpalen + sizeof(*req), 16);
skb = get_skb(NULL, wrlen, GFP_KERNEL);
if (!skb) {
@@ -1034,7 +1034,7 @@ static int send_mpa_reply(struct c4iw_ep *ep, const void *pdata, u8 plen)
mpalen = sizeof(*mpa) + plen;
if (ep->mpa_attr.version == 2 && ep->mpa_attr.enhanced_rdma_conn)
mpalen += sizeof(struct mpa_v2_conn_params);
- wrlen = roundup(mpalen + sizeof *req, 16);
+ wrlen = roundup(mpalen + sizeof(*req), 16);
skb = get_skb(NULL, wrlen, GFP_KERNEL);
if (!skb) {
@@ -1308,7 +1308,7 @@ static int update_rx_credits(struct c4iw_ep *ep, u32 credits)
{
struct cpl_rx_data_ack *req;
struct sk_buff *skb;
- int wrlen = roundup(sizeof *req, 16);
+ int wrlen = roundup(sizeof(*req), 16);
PDBG("%s ep %p tid %u credits %u\n", __func__, ep, ep->hwtid, credits);
skb = get_skb(NULL, wrlen, GFP_KERNEL);
diff --git a/drivers/infiniband/hw/cxgb4/cq.c b/drivers/infiniband/hw/cxgb4/cq.c
index cf21df4a8bf5..42b207d91f89 100644
--- a/drivers/infiniband/hw/cxgb4/cq.c
+++ b/drivers/infiniband/hw/cxgb4/cq.c
@@ -42,7 +42,7 @@ static int destroy_cq(struct c4iw_rdev *rdev, struct t4_cq *cq,
struct sk_buff *skb;
int ret;
- wr_len = sizeof *res_wr + sizeof *res;
+ wr_len = sizeof(*res_wr) + sizeof(*res);
skb = alloc_skb(wr_len, GFP_KERNEL);
if (!skb)
return -ENOMEM;
@@ -109,7 +109,7 @@ static int create_cq(struct c4iw_rdev *rdev, struct t4_cq *cq,
memset(cq->queue, 0, cq->memsize);
/* build fw_ri_res_wr */
- wr_len = sizeof *res_wr + sizeof *res;
+ wr_len = sizeof(*res_wr) + sizeof(*res);
skb = alloc_skb(wr_len, GFP_KERNEL);
if (!skb) {
@@ -915,7 +915,7 @@ struct ib_cq *c4iw_create_cq(struct ib_device *ibdev,
if (hwentries < 64)
hwentries = 64;
- memsize = hwentries * sizeof *chp->cq.queue;
+ memsize = hwentries * sizeof(*chp->cq.queue);
/*
* memsize must be a multiple of the page size if its a user cq.
@@ -943,10 +943,10 @@ struct ib_cq *c4iw_create_cq(struct ib_device *ibdev,
goto err2;
if (ucontext) {
- mm = kmalloc(sizeof *mm, GFP_KERNEL);
+ mm = kmalloc(sizeof(*mm), GFP_KERNEL);
if (!mm)
goto err3;
- mm2 = kmalloc(sizeof *mm2, GFP_KERNEL);
+ mm2 = kmalloc(sizeof(*mm2), GFP_KERNEL);
if (!mm2)
goto err4;
diff --git a/drivers/infiniband/hw/cxgb4/device.c b/drivers/infiniband/hw/cxgb4/device.c
index 8024ea4417b8..300a594acdee 100644
--- a/drivers/infiniband/hw/cxgb4/device.c
+++ b/drivers/infiniband/hw/cxgb4/device.c
@@ -317,7 +317,7 @@ static int qp_open(struct inode *inode, struct file *file)
struct c4iw_debugfs_data *qpd;
int count = 1;
- qpd = kmalloc(sizeof *qpd, GFP_KERNEL);
+ qpd = kmalloc(sizeof(*qpd), GFP_KERNEL);
if (!qpd)
return -ENOMEM;
@@ -406,7 +406,7 @@ static int stag_open(struct inode *inode, struct file *file)
int ret = 0;
int count = 1;
- stagd = kmalloc(sizeof *stagd, GFP_KERNEL);
+ stagd = kmalloc(sizeof(*stagd), GFP_KERNEL);
if (!stagd) {
ret = -ENOMEM;
goto out;
@@ -1027,7 +1027,7 @@ static void *c4iw_uld_add(const struct cxgb4_lld_info *infop)
pr_info("Chelsio T4/T5 RDMA Driver - version %s\n",
DRV_VERSION);
- ctx = kzalloc(sizeof *ctx, GFP_KERNEL);
+ ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
if (!ctx) {
ctx = ERR_PTR(-ENOMEM);
goto out;
@@ -1210,7 +1210,7 @@ static int c4iw_uld_state_change(void *handle, enum cxgb4_state new_state)
struct ib_event event;
ctx->dev->rdev.flags |= T4_FATAL_ERROR;
- memset(&event, 0, sizeof event);
+ memset(&event, 0, sizeof(event));
event.event = IB_EVENT_DEVICE_FATAL;
event.device = &ctx->dev->ibdev;
ib_dispatch_event(&event);
@@ -1429,7 +1429,7 @@ static void recover_queues(struct uld_ctx *ctx)
ctx->dev->db_state = RECOVERY;
idr_for_each(&ctx->dev->qpidr, count_qps, &count);
- qp_list.qps = kzalloc(count * sizeof *qp_list.qps, GFP_ATOMIC);
+ qp_list.qps = kzalloc(count * sizeof(*qp_list.qps), GFP_ATOMIC);
if (!qp_list.qps) {
printk(KERN_ERR MOD "%s: Fatal error - DB overflow recovery failed\n",
pci_name(ctx->lldi.pdev));
diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
index 7849890c4781..747c0f0dc13b 100644
--- a/drivers/infiniband/hw/cxgb4/mem.c
+++ b/drivers/infiniband/hw/cxgb4/mem.c
@@ -129,7 +129,7 @@ static int _c4iw_write_mem_inline(struct c4iw_rdev *rdev, u32 addr, u32 len,
copy_len = len > C4IW_MAX_INLINE_SIZE ? C4IW_MAX_INLINE_SIZE :
len;
- wr_len = roundup(sizeof *req + sizeof *sc +
+ wr_len = roundup(sizeof(*req) + sizeof(*sc) +
roundup(copy_len, T4_ULPTX_MIN_IO), 16);
skb = alloc_skb(wr_len, GFP_KERNEL);
@@ -508,7 +508,7 @@ struct ib_mr *c4iw_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
for (k = 0; k < len; ++k) {
pages[i++] = cpu_to_be64(sg_dma_address(sg) +
mhp->umem->page_size * k);
- if (i == PAGE_SIZE / sizeof *pages) {
+ if (i == PAGE_SIZE / sizeof(*pages)) {
err = write_pbl(&mhp->rhp->rdev,
pages,
mhp->attr.pbl_addr + (n << 3), i);
diff --git a/drivers/infiniband/hw/cxgb4/provider.c b/drivers/infiniband/hw/cxgb4/provider.c
index ec04272fbdc2..c0b72c9249ac 100644
--- a/drivers/infiniband/hw/cxgb4/provider.c
+++ b/drivers/infiniband/hw/cxgb4/provider.c
@@ -317,7 +317,7 @@ static int c4iw_query_device(struct ib_device *ibdev, struct ib_device_attr *pro
return -EINVAL;
dev = to_c4iw_dev(ibdev);
- memset(props, 0, sizeof *props);
+ memset(props, 0, sizeof(*props));
memcpy(&props->sys_image_guid, dev->rdev.lldi.ports[0]->dev_addr, 6);
props->hw_ver = CHELSIO_CHIP_RELEASE(dev->rdev.lldi.adapter_type);
props->fw_ver = dev->rdev.lldi.fw_vers;
@@ -452,7 +452,7 @@ static int c4iw_get_mib(struct ib_device *ibdev,
struct c4iw_dev *c4iw_dev = to_c4iw_dev(ibdev);
cxgb4_get_tcp_stats(c4iw_dev->rdev.lldi.pdev, &v4, &v6);
- memset(stats, 0, sizeof *stats);
+ memset(stats, 0, sizeof(*stats));
stats->iw.tcpInSegs = v4.tcp_in_segs + v6.tcp_in_segs;
stats->iw.tcpOutSegs = v4.tcp_out_segs + v6.tcp_out_segs;
stats->iw.tcpRetransSegs = v4.tcp_retrans_segs + v6.tcp_retrans_segs;
diff --git a/drivers/infiniband/hw/cxgb4/qp.c b/drivers/infiniband/hw/cxgb4/qp.c
index e99345eb875a..1116def7d93d 100644
--- a/drivers/infiniband/hw/cxgb4/qp.c
+++ b/drivers/infiniband/hw/cxgb4/qp.c
@@ -212,14 +212,14 @@ static int create_qp(struct c4iw_rdev *rdev, struct t4_wq *wq,
}
if (!user) {
- wq->sq.sw_sq = kzalloc(wq->sq.size * sizeof *wq->sq.sw_sq,
+ wq->sq.sw_sq = kzalloc(wq->sq.size * sizeof(*wq->sq.sw_sq),
GFP_KERNEL);
if (!wq->sq.sw_sq) {
ret = -ENOMEM;
goto free_rq_qid;
}
- wq->rq.sw_rq = kzalloc(wq->rq.size * sizeof *wq->rq.sw_rq,
+ wq->rq.sw_rq = kzalloc(wq->rq.size * sizeof(*wq->rq.sw_rq),
GFP_KERNEL);
if (!wq->rq.sw_rq) {
ret = -ENOMEM;
@@ -280,7 +280,7 @@ static int create_qp(struct c4iw_rdev *rdev, struct t4_wq *wq,
wq->rq.msn = 1;
/* build fw_ri_res_wr */
- wr_len = sizeof *res_wr + 2 * sizeof *res;
+ wr_len = sizeof(*res_wr) + 2 * sizeof(*res);
skb = alloc_skb(wr_len, GFP_KERNEL);
if (!skb) {
@@ -409,7 +409,7 @@ static int build_immd(struct t4_sq *sq, struct fw_ri_immd *immdp,
rem -= len;
}
}
- len = roundup(plen + sizeof *immdp, 16) - (plen + sizeof *immdp);
+ len = roundup(plen + sizeof(*immdp), 16) - (plen + sizeof(*immdp));
if (len)
memset(dstp, 0, len);
immdp->op = FW_RI_DATA_IMMD;
@@ -493,7 +493,7 @@ static int build_rdma_send(struct t4_sq *sq, union t4_wr *wqe,
T4_MAX_SEND_INLINE, &plen);
if (ret)
return ret;
- size = sizeof wqe->send + sizeof(struct fw_ri_immd) +
+ size = sizeof(wqe->send) + sizeof(struct fw_ri_immd) +
plen;
} else {
ret = build_isgl((__be64 *)sq->queue,
@@ -502,7 +502,7 @@ static int build_rdma_send(struct t4_sq *sq, union t4_wr *wqe,
wr->sg_list, wr->num_sge, &plen);
if (ret)
return ret;
- size = sizeof wqe->send + sizeof(struct fw_ri_isgl) +
+ size = sizeof(wqe->send) + sizeof(struct fw_ri_isgl) +
wr->num_sge * sizeof(struct fw_ri_sge);
}
} else {
@@ -510,7 +510,7 @@ static int build_rdma_send(struct t4_sq *sq, union t4_wr *wqe,
wqe->send.u.immd_src[0].r1 = 0;
wqe->send.u.immd_src[0].r2 = 0;
wqe->send.u.immd_src[0].immdlen = 0;
- size = sizeof wqe->send + sizeof(struct fw_ri_immd);
+ size = sizeof(wqe->send) + sizeof(struct fw_ri_immd);
plen = 0;
}
*len16 = DIV_ROUND_UP(size, 16);
@@ -536,7 +536,7 @@ static int build_rdma_write(struct t4_sq *sq, union t4_wr *wqe,
T4_MAX_WRITE_INLINE, &plen);
if (ret)
return ret;
- size = sizeof wqe->write + sizeof(struct fw_ri_immd) +
+ size = sizeof(wqe->write) + sizeof(struct fw_ri_immd) +
plen;
} else {
ret = build_isgl((__be64 *)sq->queue,
@@ -545,7 +545,7 @@ static int build_rdma_write(struct t4_sq *sq, union t4_wr *wqe,
wr->sg_list, wr->num_sge, &plen);
if (ret)
return ret;
- size = sizeof wqe->write + sizeof(struct fw_ri_isgl) +
+ size = sizeof(wqe->write) + sizeof(struct fw_ri_isgl) +
wr->num_sge * sizeof(struct fw_ri_sge);
}
} else {
@@ -553,7 +553,7 @@ static int build_rdma_write(struct t4_sq *sq, union t4_wr *wqe,
wqe->write.u.immd_src[0].r1 = 0;
wqe->write.u.immd_src[0].r2 = 0;
wqe->write.u.immd_src[0].immdlen = 0;
- size = sizeof wqe->write + sizeof(struct fw_ri_immd);
+ size = sizeof(wqe->write) + sizeof(struct fw_ri_immd);
plen = 0;
}
*len16 = DIV_ROUND_UP(size, 16);
@@ -586,7 +586,7 @@ static int build_rdma_read(union t4_wr *wqe, struct ib_send_wr *wr, u8 *len16)
}
wqe->read.r2 = 0;
wqe->read.r5 = 0;
- *len16 = DIV_ROUND_UP(sizeof wqe->read, 16);
+ *len16 = DIV_ROUND_UP(sizeof(wqe->read), 16);
return 0;
}
@@ -600,7 +600,7 @@ static int build_rdma_recv(struct c4iw_qp *qhp, union t4_recv_wr *wqe,
&wqe->recv.isgl, wr->sg_list, wr->num_sge, NULL);
if (ret)
return ret;
- *len16 = DIV_ROUND_UP(sizeof wqe->recv +
+ *len16 = DIV_ROUND_UP(sizeof(wqe->recv) +
wr->num_sge * sizeof(struct fw_ri_sge), 16);
return 0;
}
@@ -675,7 +675,7 @@ static int build_inv_stag(union t4_wr *wqe, struct ib_send_wr *wr,
{
wqe->inv.stag_inv = cpu_to_be32(wr->ex.invalidate_rkey);
wqe->inv.r2 = 0;
- *len16 = DIV_ROUND_UP(sizeof wqe->inv, 16);
+ *len16 = DIV_ROUND_UP(sizeof(wqe->inv), 16);
return 0;
}
@@ -1079,20 +1079,20 @@ static void post_terminate(struct c4iw_qp *qhp, struct t4_cqe *err_cqe,
PDBG("%s qhp %p qid 0x%x tid %u\n", __func__, qhp, qhp->wq.sq.qid,
qhp->ep->hwtid);
- skb = alloc_skb(sizeof *wqe, gfp);
+ skb = alloc_skb(sizeof(*wqe), gfp);
if (!skb)
return;
set_wr_txq(skb, CPL_PRIORITY_DATA, qhp->ep->txq_idx);
wqe = (struct fw_ri_wr *)__skb_put(skb, sizeof(*wqe));
- memset(wqe, 0, sizeof *wqe);
+ memset(wqe, 0, sizeof(*wqe));
wqe->op_compl = cpu_to_be32(FW_WR_OP_V(FW_RI_INIT_WR));
wqe->flowid_len16 = cpu_to_be32(
FW_WR_FLOWID_V(qhp->ep->hwtid) |
FW_WR_LEN16_V(DIV_ROUND_UP(sizeof(*wqe), 16)));
wqe->u.terminate.type = FW_RI_TYPE_TERMINATE;
- wqe->u.terminate.immdlen = cpu_to_be32(sizeof *term);
+ wqe->u.terminate.immdlen = cpu_to_be32(sizeof(*term));
term = (struct terminate_message *)wqe->u.terminate.termmsg;
if (qhp->attr.layer_etype == (LAYER_MPA|DDP_LLP)) {
term->layer_etype = qhp->attr.layer_etype;
@@ -1200,13 +1200,13 @@ static int rdma_fini(struct c4iw_dev *rhp, struct c4iw_qp *qhp,
PDBG("%s qhp %p qid 0x%x tid %u\n", __func__, qhp, qhp->wq.sq.qid,
ep->hwtid);
- skb = alloc_skb(sizeof *wqe, GFP_KERNEL);
+ skb = alloc_skb(sizeof(*wqe), GFP_KERNEL);
if (!skb)
return -ENOMEM;
set_wr_txq(skb, CPL_PRIORITY_DATA, ep->txq_idx);
wqe = (struct fw_ri_wr *)__skb_put(skb, sizeof(*wqe));
- memset(wqe, 0, sizeof *wqe);
+ memset(wqe, 0, sizeof(*wqe));
wqe->op_compl = cpu_to_be32(
FW_WR_OP_V(FW_RI_INIT_WR) |
FW_WR_COMPL_F);
@@ -1230,14 +1230,14 @@ static int rdma_fini(struct c4iw_dev *rhp, struct c4iw_qp *qhp,
static void build_rtr_msg(u8 p2p_type, struct fw_ri_init *init)
{
PDBG("%s p2p_type = %d\n", __func__, p2p_type);
- memset(&init->u, 0, sizeof init->u);
+ memset(&init->u, 0, sizeof(init->u));
switch (p2p_type) {
case FW_RI_INIT_P2PTYPE_RDMA_WRITE:
init->u.write.opcode = FW_RI_RDMA_WRITE_WR;
init->u.write.stag_sink = cpu_to_be32(1);
init->u.write.to_sink = cpu_to_be64(1);
init->u.write.u.immd_src[0].op = FW_RI_DATA_IMMD;
- init->u.write.len16 = DIV_ROUND_UP(sizeof init->u.write +
+ init->u.write.len16 = DIV_ROUND_UP(sizeof(init->u.write) +
sizeof(struct fw_ri_immd),
16);
break;
@@ -1247,7 +1247,7 @@ static void build_rtr_msg(u8 p2p_type, struct fw_ri_init *init)
init->u.read.to_src_lo = cpu_to_be32(1);
init->u.read.stag_sink = cpu_to_be32(1);
init->u.read.to_sink_lo = cpu_to_be32(1);
- init->u.read.len16 = DIV_ROUND_UP(sizeof init->u.read, 16);
+ init->u.read.len16 = DIV_ROUND_UP(sizeof(init->u.read), 16);
break;
}
}
@@ -1261,7 +1261,7 @@ static int rdma_init(struct c4iw_dev *rhp, struct c4iw_qp *qhp)
PDBG("%s qhp %p qid 0x%x tid %u ird %u ord %u\n", __func__, qhp,
qhp->wq.sq.qid, qhp->ep->hwtid, qhp->ep->ird, qhp->ep->ord);
- skb = alloc_skb(sizeof *wqe, GFP_KERNEL);
+ skb = alloc_skb(sizeof(*wqe), GFP_KERNEL);
if (!skb) {
ret = -ENOMEM;
goto out;
@@ -1275,7 +1275,7 @@ static int rdma_init(struct c4iw_dev *rhp, struct c4iw_qp *qhp)
set_wr_txq(skb, CPL_PRIORITY_DATA, qhp->ep->txq_idx);
wqe = (struct fw_ri_wr *)__skb_put(skb, sizeof(*wqe));
- memset(wqe, 0, sizeof *wqe);
+ memset(wqe, 0, sizeof(*wqe));
wqe->op_compl = cpu_to_be32(
FW_WR_OP_V(FW_RI_INIT_WR) |
FW_WR_COMPL_F);
@@ -1706,28 +1706,28 @@ struct ib_qp *c4iw_create_qp(struct ib_pd *pd, struct ib_qp_init_attr *attrs,
goto err2;
if (udata) {
- mm1 = kmalloc(sizeof *mm1, GFP_KERNEL);
+ mm1 = kmalloc(sizeof(*mm1), GFP_KERNEL);
if (!mm1) {
ret = -ENOMEM;
goto err3;
}
- mm2 = kmalloc(sizeof *mm2, GFP_KERNEL);
+ mm2 = kmalloc(sizeof(*mm2), GFP_KERNEL);
if (!mm2) {
ret = -ENOMEM;
goto err4;
}
- mm3 = kmalloc(sizeof *mm3, GFP_KERNEL);
+ mm3 = kmalloc(sizeof(*mm3), GFP_KERNEL);
if (!mm3) {
ret = -ENOMEM;
goto err5;
}
- mm4 = kmalloc(sizeof *mm4, GFP_KERNEL);
+ mm4 = kmalloc(sizeof(*mm4), GFP_KERNEL);
if (!mm4) {
ret = -ENOMEM;
goto err6;
}
if (t4_sq_onchip(&qhp->wq.sq)) {
- mm5 = kmalloc(sizeof *mm5, GFP_KERNEL);
+ mm5 = kmalloc(sizeof(*mm5), GFP_KERNEL);
if (!mm5) {
ret = -ENOMEM;
goto err7;
@@ -1758,7 +1758,7 @@ struct ib_qp *c4iw_create_qp(struct ib_pd *pd, struct ib_qp_init_attr *attrs,
uresp.rq_db_gts_key = ucontext->key;
ucontext->key += PAGE_SIZE;
spin_unlock(&ucontext->mmap_lock);
- ret = ib_copy_to_udata(udata, &uresp, sizeof uresp);
+ ret = ib_copy_to_udata(udata, &uresp, sizeof(uresp));
if (ret)
goto err8;
mm1->key = uresp.sq_key;
@@ -1832,7 +1832,7 @@ int c4iw_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
if (!attr_mask)
return 0;
- memset(&attrs, 0, sizeof attrs);
+ memset(&attrs, 0, sizeof(attrs));
qhp = to_c4iw_qp(ibqp);
rhp = qhp->rhp;
@@ -1877,8 +1877,8 @@ int c4iw_ib_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
{
struct c4iw_qp *qhp = to_c4iw_qp(ibqp);
- memset(attr, 0, sizeof *attr);
- memset(init_attr, 0, sizeof *init_attr);
+ memset(attr, 0, sizeof(*attr));
+ memset(init_attr, 0, sizeof(*init_attr));
attr->qp_state = to_ib_qp_state(qhp->attr.state);
init_attr->cap.max_send_wr = qhp->attr.sq_num_entries;
init_attr->cap.max_recv_wr = qhp->attr.rq_num_entries;
diff --git a/drivers/infiniband/hw/cxgb4/resource.c b/drivers/infiniband/hw/cxgb4/resource.c
index 67df71a7012e..991b4fe1f06f 100644
--- a/drivers/infiniband/hw/cxgb4/resource.c
+++ b/drivers/infiniband/hw/cxgb4/resource.c
@@ -115,7 +115,7 @@ u32 c4iw_get_cqid(struct c4iw_rdev *rdev, struct c4iw_dev_ucontext *uctx)
rdev->stats.qid.cur += rdev->qpmask + 1;
mutex_unlock(&rdev->stats.lock);
for (i = qid+1; i & rdev->qpmask; i++) {
- entry = kmalloc(sizeof *entry, GFP_KERNEL);
+ entry = kmalloc(sizeof(*entry), GFP_KERNEL);
if (!entry)
goto out;
entry->qid = i;
@@ -126,13 +126,13 @@ u32 c4iw_get_cqid(struct c4iw_rdev *rdev, struct c4iw_dev_ucontext *uctx)
* now put the same ids on the qp list since they all
* map to the same db/gts page.
*/
- entry = kmalloc(sizeof *entry, GFP_KERNEL);
+ entry = kmalloc(sizeof(*entry), GFP_KERNEL);
if (!entry)
goto out;
entry->qid = qid;
list_add_tail(&entry->entry, &uctx->qpids);
for (i = qid+1; i & rdev->qpmask; i++) {
- entry = kmalloc(sizeof *entry, GFP_KERNEL);
+ entry = kmalloc(sizeof(*entry), GFP_KERNEL);
if (!entry)
goto out;
entry->qid = i;
@@ -154,7 +154,7 @@ void c4iw_put_cqid(struct c4iw_rdev *rdev, u32 qid,
{
struct c4iw_qid_list *entry;
- entry = kmalloc(sizeof *entry, GFP_KERNEL);
+ entry = kmalloc(sizeof(*entry), GFP_KERNEL);
if (!entry)
return;
PDBG("%s qid 0x%x\n", __func__, qid);
@@ -189,7 +189,7 @@ u32 c4iw_get_qpid(struct c4iw_rdev *rdev, struct c4iw_dev_ucontext *uctx)
rdev->stats.qid.cur += rdev->qpmask + 1;
mutex_unlock(&rdev->stats.lock);
for (i = qid+1; i & rdev->qpmask; i++) {
- entry = kmalloc(sizeof *entry, GFP_KERNEL);
+ entry = kmalloc(sizeof(*entry), GFP_KERNEL);
if (!entry)
goto out;
entry->qid = i;
@@ -200,13 +200,13 @@ u32 c4iw_get_qpid(struct c4iw_rdev *rdev, struct c4iw_dev_ucontext *uctx)
* now put the same ids on the cq list since they all
* map to the same db/gts page.
*/
- entry = kmalloc(sizeof *entry, GFP_KERNEL);
+ entry = kmalloc(sizeof(*entry), GFP_KERNEL);
if (!entry)
goto out;
entry->qid = qid;
list_add_tail(&entry->entry, &uctx->cqids);
for (i = qid; i & rdev->qpmask; i++) {
- entry = kmalloc(sizeof *entry, GFP_KERNEL);
+ entry = kmalloc(sizeof(*entry), GFP_KERNEL);
if (!entry)
goto out;
entry->qid = i;
@@ -228,7 +228,7 @@ void c4iw_put_qpid(struct c4iw_rdev *rdev, u32 qid,
{
struct c4iw_qid_list *entry;
- entry = kmalloc(sizeof *entry, GFP_KERNEL);
+ entry = kmalloc(sizeof(*entry), GFP_KERNEL);
if (!entry)
return;
PDBG("%s qid 0x%x\n", __func__, qid);
diff --git a/drivers/infiniband/hw/mlx4/ah.c b/drivers/infiniband/hw/mlx4/ah.c
index 105246fba2e7..888afc3197bb 100644
--- a/drivers/infiniband/hw/mlx4/ah.c
+++ b/drivers/infiniband/hw/mlx4/ah.c
@@ -129,7 +129,7 @@ struct ib_ah *mlx4_ib_create_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr)
struct mlx4_ib_ah *ah;
struct ib_ah *ret;
- ah = kzalloc(sizeof *ah, GFP_ATOMIC);
+ ah = kzalloc(sizeof(*ah), GFP_ATOMIC);
if (!ah)
return ERR_PTR(-ENOMEM);
@@ -161,7 +161,7 @@ int mlx4_ib_query_ah(struct ib_ah *ibah, struct ib_ah_attr *ah_attr)
struct mlx4_ib_ah *ah = to_mah(ibah);
enum rdma_link_layer ll;
- memset(ah_attr, 0, sizeof *ah_attr);
+ memset(ah_attr, 0, sizeof(*ah_attr));
ah_attr->port_num = be32_to_cpu(ah->av.ib.port_pd) >> 24;
ll = rdma_port_get_link_layer(ibah->device, ah_attr->port_num);
if (ll == IB_LINK_LAYER_ETHERNET)
diff --git a/drivers/infiniband/hw/mlx4/alias_GUID.c b/drivers/infiniband/hw/mlx4/alias_GUID.c
index 21cb41a60fe8..c6eb1ccdac8b 100644
--- a/drivers/infiniband/hw/mlx4/alias_GUID.c
+++ b/drivers/infiniband/hw/mlx4/alias_GUID.c
@@ -513,7 +513,7 @@ static int set_guid_rec(struct ib_device *ibdev,
goto new_schedule;
}
- callback_context = kmalloc(sizeof *callback_context, GFP_KERNEL);
+ callback_context = kmalloc(sizeof(*callback_context), GFP_KERNEL);
if (!callback_context) {
err = -ENOMEM;
resched_delay = HZ * 5;
@@ -754,7 +754,7 @@ static void alias_guid_work(struct work_struct *work)
alias_guid);
struct mlx4_ib_dev *dev = container_of(ib_sriov, struct mlx4_ib_dev, sriov);
- rec = kzalloc(sizeof *rec, GFP_KERNEL);
+ rec = kzalloc(sizeof(*rec), GFP_KERNEL);
if (!rec) {
pr_err("alias_guid_work: No Memory\n");
return;
@@ -841,7 +841,7 @@ int mlx4_ib_init_alias_guid_service(struct mlx4_ib_dev *dev)
if (!mlx4_is_master(dev->dev))
return 0;
dev->sriov.alias_guid.sa_client =
- kzalloc(sizeof *dev->sriov.alias_guid.sa_client, GFP_KERNEL);
+ kzalloc(sizeof(*dev->sriov.alias_guid.sa_client), GFP_KERNEL);
if (!dev->sriov.alias_guid.sa_client)
return -ENOMEM;
@@ -865,8 +865,7 @@ int mlx4_ib_init_alias_guid_service(struct mlx4_ib_dev *dev)
/* mark each val as it was deleted */
memset(dev->sriov.alias_guid.ports_guid[i].
all_rec_per_port[j].all_recs, 0xFF,
- sizeof(dev->sriov.alias_guid.ports_guid[i].
- all_rec_per_port[j].all_recs));
+ sizeof(dev->sriov.alias_guid.ports_guid[i].all_rec_per_port[j].all_recs));
}
INIT_LIST_HEAD(&dev->sriov.alias_guid.ports_guid[i].cb_list);
/*prepare the records, set them to be allocated by sm*/
@@ -879,7 +878,7 @@ int mlx4_ib_init_alias_guid_service(struct mlx4_ib_dev *dev)
dev->sriov.alias_guid.ports_guid[i].parent = &dev->sriov.alias_guid;
dev->sriov.alias_guid.ports_guid[i].port = i;
- snprintf(alias_wq_name, sizeof alias_wq_name, "alias_guid%d", i);
+ snprintf(alias_wq_name, sizeof(alias_wq_name), "alias_guid%d", i);
dev->sriov.alias_guid.ports_guid[i].wq =
create_singlethread_workqueue(alias_wq_name);
if (!dev->sriov.alias_guid.ports_guid[i].wq) {
diff --git a/drivers/infiniband/hw/mlx4/cq.c b/drivers/infiniband/hw/mlx4/cq.c
index 9f8b516eb2b0..45c96d269165 100644
--- a/drivers/infiniband/hw/mlx4/cq.c
+++ b/drivers/infiniband/hw/mlx4/cq.c
@@ -185,7 +185,7 @@ struct ib_cq *mlx4_ib_create_cq(struct ib_device *ibdev,
if (attr->flags & ~CQ_CREATE_FLAGS_SUPPORTED)
return ERR_PTR(-EINVAL);
- cq = kmalloc(sizeof *cq, GFP_KERNEL);
+ cq = kmalloc(sizeof(*cq), GFP_KERNEL);
if (!cq)
return ERR_PTR(-ENOMEM);
@@ -202,7 +202,7 @@ struct ib_cq *mlx4_ib_create_cq(struct ib_device *ibdev,
if (context) {
struct mlx4_ib_create_cq ucmd;
- if (ib_copy_from_udata(&ucmd, udata, sizeof ucmd)) {
+ if (ib_copy_from_udata(&ucmd, udata, sizeof(ucmd))) {
err = -EFAULT;
goto err_cq;
}
@@ -251,7 +251,7 @@ struct ib_cq *mlx4_ib_create_cq(struct ib_device *ibdev,
cq->mcq.event = mlx4_ib_cq_event;
if (context)
- if (ib_copy_to_udata(udata, &cq->mcq.cqn, sizeof (__u32))) {
+ if (ib_copy_to_udata(udata, &cq->mcq.cqn, sizeof(__u32))) {
err = -EFAULT;
goto err_dbmap;
}
@@ -288,7 +288,7 @@ static int mlx4_alloc_resize_buf(struct mlx4_ib_dev *dev, struct mlx4_ib_cq *cq,
if (cq->resize_buf)
return -EBUSY;
- cq->resize_buf = kmalloc(sizeof *cq->resize_buf, GFP_ATOMIC);
+ cq->resize_buf = kmalloc(sizeof(*cq->resize_buf), GFP_ATOMIC);
if (!cq->resize_buf)
return -ENOMEM;
@@ -313,10 +313,10 @@ static int mlx4_alloc_resize_umem(struct mlx4_ib_dev *dev, struct mlx4_ib_cq *cq
if (cq->resize_umem)
return -EBUSY;
- if (ib_copy_from_udata(&ucmd, udata, sizeof ucmd))
+ if (ib_copy_from_udata(&ucmd, udata, sizeof(ucmd)))
return -EFAULT;
- cq->resize_buf = kmalloc(sizeof *cq->resize_buf, GFP_ATOMIC);
+ cq->resize_buf = kmalloc(sizeof(*cq->resize_buf), GFP_ATOMIC);
if (!cq->resize_buf)
return -ENOMEM;
@@ -964,7 +964,7 @@ void __mlx4_ib_cq_clean(struct mlx4_ib_cq *cq, u32 qpn, struct mlx4_ib_srq *srq)
dest += cqe_inc;
owner_bit = dest->owner_sr_opcode & MLX4_CQE_OWNER_MASK;
- memcpy(dest, cqe, sizeof *cqe);
+ memcpy(dest, cqe, sizeof(*cqe));
dest->owner_sr_opcode = owner_bit |
(dest->owner_sr_opcode & ~MLX4_CQE_OWNER_MASK);
}
diff --git a/drivers/infiniband/hw/mlx4/doorbell.c b/drivers/infiniband/hw/mlx4/doorbell.c
index c51740986367..e1b02c8bc69e 100644
--- a/drivers/infiniband/hw/mlx4/doorbell.c
+++ b/drivers/infiniband/hw/mlx4/doorbell.c
@@ -53,7 +53,7 @@ int mlx4_ib_db_map_user(struct mlx4_ib_ucontext *context, unsigned long virt,
if (page->user_virt == (virt & PAGE_MASK))
goto found;
- page = kmalloc(sizeof *page, GFP_KERNEL);
+ page = kmalloc(sizeof(*page), GFP_KERNEL);
if (!page) {
err = -ENOMEM;
goto out;
diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
index 26833bfa639b..a9514b28c579 100644
--- a/drivers/infiniband/hw/mlx4/mad.c
+++ b/drivers/infiniband/hw/mlx4/mad.c
@@ -193,7 +193,7 @@ static void update_sm_ah(struct mlx4_ib_dev *dev, u8 port_num, u16 lid, u8 sl)
if (!dev->send_agent[port_num - 1][0])
return;
- memset(&ah_attr, 0, sizeof ah_attr);
+ memset(&ah_attr, 0, sizeof(ah_attr));
ah_attr.dlid = lid;
ah_attr.sl = sl;
ah_attr.port_num = port_num;
@@ -371,7 +371,7 @@ static void forward_trap(struct mlx4_ib_dev *dev, u8 port_num, const struct ib_m
* it's OK for our devices).
*/
spin_lock_irqsave(&dev->sm_lock, flags);
- memcpy(send_buf->mad, mad, sizeof *mad);
+ memcpy(send_buf->mad, mad, sizeof(*mad));
if ((send_buf->ah = dev->sm_ah[port_num - 1]))
ret = ib_post_send_mad(send_buf, NULL);
else
@@ -508,7 +508,7 @@ int mlx4_ib_send_to_slave(struct mlx4_ib_dev *dev, int slave, u8 port,
/* create ah. Just need an empty one with the port num for the post send.
* The driver will set the force loopback bit in post_send */
- memset(&attr, 0, sizeof attr);
+ memset(&attr, 0, sizeof(attr));
attr.port_num = port;
if (is_eth) {
memcpy(&attr.grh.dgid.raw[0], &grh->dgid.raw[0], 16);
@@ -540,8 +540,8 @@ int mlx4_ib_send_to_slave(struct mlx4_ib_dev *dev, int slave, u8 port,
/* copy over to tunnel buffer */
if (grh)
- memcpy(&tun_mad->grh, grh, sizeof *grh);
- memcpy(&tun_mad->mad, mad, sizeof *mad);
+ memcpy(&tun_mad->grh, grh, sizeof(*grh));
+ memcpy(&tun_mad->mad, mad, sizeof(*mad));
/* adjust tunnel data */
tun_mad->hdr.pkey_index = cpu_to_be16(tun_pkey_ix);
@@ -859,7 +859,7 @@ static int iboe_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num,
}
mutex_unlock(&dev->counters_table[port_num - 1].mutex);
if (stats_avail) {
- memset(out_mad->data, 0, sizeof out_mad->data);
+ memset(out_mad->data, 0, sizeof(out_mad->data));
switch (counter_stats.counter_mode & 0xf) {
case 0:
edit_counter(&counter_stats,
@@ -1014,8 +1014,8 @@ static void handle_slaves_guid_change(struct mlx4_ib_dev *dev, u8 port_num,
if (!mlx4_is_mfunc(dev->dev) || !mlx4_is_master(dev->dev))
return;
- in_mad = kmalloc(sizeof *in_mad, GFP_KERNEL);
- out_mad = kmalloc(sizeof *out_mad, GFP_KERNEL);
+ in_mad = kmalloc(sizeof(*in_mad), GFP_KERNEL);
+ out_mad = kmalloc(sizeof(*out_mad), GFP_KERNEL);
if (!in_mad || !out_mad) {
mlx4_ib_warn(&dev->ib_dev, "failed to allocate memory for guid info mads\n");
goto out;
@@ -1026,8 +1026,8 @@ static void handle_slaves_guid_change(struct mlx4_ib_dev *dev, u8 port_num,
for (i = 0; i < 4; i++) {
if (change_bitmap && (!((change_bitmap >> (8 * i)) & 0xff)))
continue;
- memset(in_mad, 0, sizeof *in_mad);
- memset(out_mad, 0, sizeof *out_mad);
+ memset(in_mad, 0, sizeof(*in_mad));
+ memset(out_mad, 0, sizeof(*out_mad));
in_mad->base_version = 1;
in_mad->mgmt_class = IB_MGMT_CLASS_SUBN_LID_ROUTED;
@@ -1259,7 +1259,7 @@ int mlx4_ib_send_to_wire(struct mlx4_ib_dev *dev, int slave, u8 port,
sizeof (struct mlx4_mad_snd_buf),
DMA_TO_DEVICE);
- memcpy(&sqp_mad->payload, mad, sizeof *mad);
+ memcpy(&sqp_mad->payload, mad, sizeof(*mad));
ib_dma_sync_single_for_device(&dev->ib_dev,
sqp->tx_ring[wire_tx_ix].buf.map,
@@ -1634,7 +1634,7 @@ static int create_pv_sqp(struct mlx4_ib_demux_pv_ctx *ctx,
tun_qp = &ctx->qp[qp_type];
- memset(&qp_init_attr, 0, sizeof qp_init_attr);
+ memset(&qp_init_attr, 0, sizeof(qp_init_attr));
qp_init_attr.init_attr.send_cq = ctx->cq;
qp_init_attr.init_attr.recv_cq = ctx->cq;
qp_init_attr.init_attr.sq_sig_type = IB_SIGNAL_ALL_WR;
@@ -1667,7 +1667,7 @@ static int create_pv_sqp(struct mlx4_ib_demux_pv_ctx *ctx,
return ret;
}
- memset(&attr, 0, sizeof attr);
+ memset(&attr, 0, sizeof(attr));
attr.qp_state = IB_QPS_INIT;
ret = 0;
if (create_tun)
@@ -2020,7 +2020,7 @@ static int mlx4_ib_alloc_demux_ctx(struct mlx4_ib_dev *dev,
goto err_mcg;
}
- snprintf(name, sizeof name, "mlx4_ibt%d", port);
+ snprintf(name, sizeof(name), "mlx4_ibt%d", port);
ctx->wq = create_singlethread_workqueue(name);
if (!ctx->wq) {
pr_err("Failed to create tunnelling WQ for port %d\n", port);
@@ -2028,7 +2028,7 @@ static int mlx4_ib_alloc_demux_ctx(struct mlx4_ib_dev *dev,
goto err_wq;
}
- snprintf(name, sizeof name, "mlx4_ibud%d", port);
+ snprintf(name, sizeof(name), "mlx4_ibud%d", port);
ctx->ud_wq = create_singlethread_workqueue(name);
if (!ctx->ud_wq) {
pr_err("Failed to create up/down WQ for port %d\n", port);
diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index 1c7ab6cabbb8..a1b777088d86 100644
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -452,8 +452,8 @@ static int mlx4_ib_query_device(struct ib_device *ibdev,
resp.response_length = offsetof(typeof(resp), response_length) +
sizeof(resp.response_length);
- in_mad = kzalloc(sizeof *in_mad, GFP_KERNEL);
- out_mad = kmalloc(sizeof *out_mad, GFP_KERNEL);
+ in_mad = kzalloc(sizeof(*in_mad), GFP_KERNEL);
+ out_mad = kmalloc(sizeof(*out_mad), GFP_KERNEL);
if (!in_mad || !out_mad)
goto out;
@@ -465,7 +465,7 @@ static int mlx4_ib_query_device(struct ib_device *ibdev,
if (err)
goto out;
- memset(props, 0, sizeof *props);
+ memset(props, 0, sizeof(*props));
have_ib_ports = num_ib_ports(dev->dev);
@@ -588,8 +588,8 @@ static int ib_link_query_port(struct ib_device *ibdev, u8 port,
int mad_ifc_flags = MLX4_MAD_IFC_IGNORE_KEYS;
int err = -ENOMEM;
- in_mad = kzalloc(sizeof *in_mad, GFP_KERNEL);
- out_mad = kmalloc(sizeof *out_mad, GFP_KERNEL);
+ in_mad = kzalloc(sizeof(*in_mad), GFP_KERNEL);
+ out_mad = kmalloc(sizeof(*out_mad), GFP_KERNEL);
if (!in_mad || !out_mad)
goto out;
@@ -736,7 +736,7 @@ int __mlx4_ib_query_port(struct ib_device *ibdev, u8 port,
{
int err;
- memset(props, 0, sizeof *props);
+ memset(props, 0, sizeof(*props));
err = mlx4_ib_port_link_layer(ibdev, port) == IB_LINK_LAYER_INFINIBAND ?
ib_link_query_port(ibdev, port, props, netw_view) :
@@ -762,8 +762,8 @@ int __mlx4_ib_query_gid(struct ib_device *ibdev, u8 port, int index,
int clear = 0;
int mad_ifc_flags = MLX4_MAD_IFC_IGNORE_KEYS;
- in_mad = kzalloc(sizeof *in_mad, GFP_KERNEL);
- out_mad = kmalloc(sizeof *out_mad, GFP_KERNEL);
+ in_mad = kzalloc(sizeof(*in_mad), GFP_KERNEL);
+ out_mad = kmalloc(sizeof(*out_mad), GFP_KERNEL);
if (!in_mad || !out_mad)
goto out;
@@ -839,8 +839,8 @@ int __mlx4_ib_query_pkey(struct ib_device *ibdev, u8 port, u16 index,
int mad_ifc_flags = MLX4_MAD_IFC_IGNORE_KEYS;
int err = -ENOMEM;
- in_mad = kzalloc(sizeof *in_mad, GFP_KERNEL);
- out_mad = kmalloc(sizeof *out_mad, GFP_KERNEL);
+ in_mad = kzalloc(sizeof(*in_mad), GFP_KERNEL);
+ out_mad = kmalloc(sizeof(*out_mad), GFP_KERNEL);
if (!in_mad || !out_mad)
goto out;
@@ -1211,7 +1211,7 @@ static struct ib_pd *mlx4_ib_alloc_pd(struct ib_device *ibdev,
struct mlx4_ib_pd *pd;
int err;
- pd = kmalloc(sizeof *pd, GFP_KERNEL);
+ pd = kmalloc(sizeof(*pd), GFP_KERNEL);
if (!pd)
return ERR_PTR(-ENOMEM);
@@ -1250,7 +1250,7 @@ static struct ib_xrcd *mlx4_ib_alloc_xrcd(struct ib_device *ibdev,
if (!(to_mdev(ibdev)->dev->caps.flags & MLX4_DEV_CAP_FLAG_XRC))
return ERR_PTR(-ENOSYS);
- xrcd = kmalloc(sizeof *xrcd, GFP_KERNEL);
+ xrcd = kmalloc(sizeof(*xrcd), GFP_KERNEL);
if (!xrcd)
return ERR_PTR(-ENOMEM);
@@ -1298,7 +1298,7 @@ static int add_gid_entry(struct ib_qp *ibqp, union ib_gid *gid)
struct mlx4_ib_dev *mdev = to_mdev(ibqp->device);
struct mlx4_ib_gid_entry *ge;
- ge = kzalloc(sizeof *ge, GFP_KERNEL);
+ ge = kzalloc(sizeof(*ge), GFP_KERNEL);
if (!ge)
return -ENOMEM;
@@ -1916,8 +1916,8 @@ static int init_node_data(struct mlx4_ib_dev *dev)
int mad_ifc_flags = MLX4_MAD_IFC_IGNORE_KEYS;
int err = -ENOMEM;
- in_mad = kzalloc(sizeof *in_mad, GFP_KERNEL);
- out_mad = kmalloc(sizeof *out_mad, GFP_KERNEL);
+ in_mad = kzalloc(sizeof(*in_mad), GFP_KERNEL);
+ out_mad = kmalloc(sizeof(*out_mad), GFP_KERNEL);
if (!in_mad || !out_mad)
goto out;
@@ -2233,7 +2233,7 @@ static void *mlx4_ib_add(struct mlx4_dev *dev)
if (num_ports == 0)
return NULL;
- ibdev = (struct mlx4_ib_dev *) ib_alloc_device(sizeof *ibdev);
+ ibdev = (struct mlx4_ib_dev *) ib_alloc_device(sizeof(*ibdev));
if (!ibdev) {
dev_err(&dev->persist->pdev->dev,
"Device struct alloc failed\n");
@@ -2877,14 +2877,14 @@ static void mlx4_ib_event(struct mlx4_dev *dev, void *ibdev_ptr,
break;
case MLX4_DEV_EVENT_PORT_MGMT_CHANGE:
- ew = kmalloc(sizeof *ew, GFP_ATOMIC);
+ ew = kmalloc(sizeof(*ew), GFP_ATOMIC);
if (!ew) {
pr_err("failed to allocate memory for events work\n");
break;
}
INIT_WORK(&ew->work, handle_port_mgmt_change_event);
- memcpy(&ew->ib_eqe, eqe, sizeof *eqe);
+ memcpy(&ew->ib_eqe, eqe, sizeof(*eqe));
ew->ib_dev = ibdev;
/* need to queue only for port owner, which uses GEN_EQE */
if (mlx4_is_master(dev))
diff --git a/drivers/infiniband/hw/mlx4/mcg.c b/drivers/infiniband/hw/mlx4/mcg.c
index 99451d887266..d113031cfaea 100644
--- a/drivers/infiniband/hw/mlx4/mcg.c
+++ b/drivers/infiniband/hw/mlx4/mcg.c
@@ -168,7 +168,7 @@ static struct mcast_group *mcast_find(struct mlx4_ib_demux_ctx *ctx,
while (node) {
group = rb_entry(node, struct mcast_group, node);
- ret = memcmp(mgid->raw, group->rec.mgid.raw, sizeof *mgid);
+ ret = memcmp(mgid->raw, group->rec.mgid.raw, sizeof(*mgid));
if (!ret)
return group;
@@ -193,7 +193,7 @@ static struct mcast_group *mcast_insert(struct mlx4_ib_demux_ctx *ctx,
cur_group = rb_entry(parent, struct mcast_group, node);
ret = memcmp(group->rec.mgid.raw, cur_group->rec.mgid.raw,
- sizeof group->rec.mgid);
+ sizeof(group->rec.mgid));
if (ret < 0)
link = &(*link)->rb_left;
else if (ret > 0)
@@ -256,7 +256,7 @@ static int send_join_to_wire(struct mcast_group *group, struct ib_sa_mad *sa_mad
int ret;
/* we rely on a mad request as arrived from a VF */
- memcpy(&mad, sa_mad, sizeof mad);
+ memcpy(&mad, sa_mad, sizeof(mad));
/* fix port GID to be the real one (slave 0) */
sa_mad_data->port_gid.global.interface_id = group->demux->guid_cache[0];
@@ -282,7 +282,7 @@ static int send_leave_to_wire(struct mcast_group *group, u8 join_state)
struct ib_sa_mcmember_data *sa_data = (struct ib_sa_mcmember_data *)&mad.data;
int ret;
- memset(&mad, 0, sizeof mad);
+ memset(&mad, 0, sizeof(mad));
mad.mad_hdr.base_version = 1;
mad.mad_hdr.mgmt_class = IB_MGMT_CLASS_SUBN_ADM;
mad.mad_hdr.class_version = 2;
@@ -323,7 +323,7 @@ static int send_reply_to_slave(int slave, struct mcast_group *group,
struct ib_sa_mcmember_data *req_sa_data = (struct ib_sa_mcmember_data *)&req_sa_mad->data;
int ret;
- memset(&mad, 0, sizeof mad);
+ memset(&mad, 0, sizeof(mad));
mad.mad_hdr.base_version = 1;
mad.mad_hdr.mgmt_class = IB_MGMT_CLASS_SUBN_ADM;
mad.mad_hdr.class_version = 2;
@@ -343,7 +343,7 @@ static int send_reply_to_slave(int slave, struct mcast_group *group,
/* reconstruct VF's requested join_state and port_gid */
sa_data->scope_join_state &= 0xf0;
sa_data->scope_join_state |= (group->func[slave].join_state & 0x0f);
- memcpy(&sa_data->port_gid, &req_sa_data->port_gid, sizeof req_sa_data->port_gid);
+ memcpy(&sa_data->port_gid, &req_sa_data->port_gid, sizeof(req_sa_data->port_gid));
ret = send_mad_to_slave(slave, group->demux, (struct ib_mad *)&mad);
return ret;
@@ -452,7 +452,7 @@ static int release_group(struct mcast_group *group, int from_timeout_handler)
}
}
- nzgroup = memcmp(&group->rec.mgid, &mgid0, sizeof mgid0);
+ nzgroup = memcmp(&group->rec.mgid, &mgid0, sizeof(mgid0));
if (nzgroup)
del_sysfs_port_mcg_attr(ctx->dev, ctx->port, &group->dentry.attr);
if (!list_empty(&group->pending_list))
@@ -553,7 +553,7 @@ static void mlx4_ib_mcg_timeout_handler(struct work_struct *work)
--group->func[req->func].num_pend_reqs;
mutex_unlock(&group->lock);
kfree(req);
- if (memcmp(&group->rec.mgid, &mgid0, sizeof mgid0)) {
+ if (memcmp(&group->rec.mgid, &mgid0, sizeof(mgid0))) {
if (release_group(group, 1))
return;
} else {
@@ -699,7 +699,7 @@ static void mlx4_ib_mcg_work_handler(struct work_struct *work)
--rc;
} else if (!resp_join_state)
++rc;
- memcpy(&group->rec, group->response_sa_mad.data, sizeof group->rec);
+ memcpy(&group->rec, group->response_sa_mad.data, sizeof(group->rec));
}
group->state = MCAST_IDLE;
}
@@ -757,7 +757,7 @@ static struct mcast_group *search_relocate_mgid0_group(struct mlx4_ib_demux_ctx
group = list_entry(pos, struct mcast_group, mgid0_list);
mutex_lock(&group->lock);
if (group->last_req_tid == tid) {
- if (memcmp(new_mgid, &mgid0, sizeof mgid0)) {
+ if (memcmp(new_mgid, &mgid0, sizeof(mgid0))) {
group->rec.mgid = *new_mgid;
sprintf(group->name, "%016llx%016llx",
be64_to_cpu(group->rec.mgid.global.subnet_prefix),
@@ -818,7 +818,7 @@ static struct mcast_group *acquire_group(struct mlx4_ib_demux_ctx *ctx,
int is_mgid0;
int i;
- is_mgid0 = !memcmp(&mgid0, mgid, sizeof mgid0);
+ is_mgid0 = !memcmp(&mgid0, mgid, sizeof(mgid0));
if (!is_mgid0) {
group = mcast_find(ctx, mgid);
if (group)
@@ -828,7 +828,7 @@ static struct mcast_group *acquire_group(struct mlx4_ib_demux_ctx *ctx,
if (!create)
return ERR_PTR(-ENOENT);
- group = kzalloc(sizeof *group, gfp_mask);
+ group = kzalloc(sizeof(*group), gfp_mask);
if (!group)
return ERR_PTR(-ENOMEM);
@@ -949,7 +949,7 @@ int mlx4_ib_mcg_multiplex_handler(struct ib_device *ibdev, int port,
case IB_MGMT_METHOD_SET:
may_create = 1;
case IB_SA_METHOD_DELETE:
- req = kzalloc(sizeof *req, GFP_KERNEL);
+ req = kzalloc(sizeof(*req), GFP_KERNEL);
if (!req)
return -ENOMEM;
@@ -1142,7 +1142,7 @@ void mlx4_ib_mcg_port_cleanup(struct mlx4_ib_demux_ctx *ctx, int destroy_wq)
return;
}
- work = kmalloc(sizeof *work, GFP_KERNEL);
+ work = kmalloc(sizeof(*work), GFP_KERNEL);
if (!work) {
ctx->flushing = 0;
mcg_warn("failed allocating work for cleanup\n");
@@ -1204,7 +1204,7 @@ static int push_deleteing_req(struct mcast_group *group, int slave)
if (!group->func[slave].join_state)
return 0;
- req = kzalloc(sizeof *req, GFP_KERNEL);
+ req = kzalloc(sizeof(*req), GFP_KERNEL);
if (!req) {
mcg_warn_group(group, "failed allocation - may leave stall groups\n");
return -ENOMEM;
diff --git a/drivers/infiniband/hw/mlx4/mr.c b/drivers/infiniband/hw/mlx4/mr.c
index 242b94ec105b..f6a7b85623c7 100644
--- a/drivers/infiniband/hw/mlx4/mr.c
+++ b/drivers/infiniband/hw/mlx4/mr.c
@@ -428,7 +428,7 @@ struct ib_fmr *mlx4_ib_fmr_alloc(struct ib_pd *pd, int acc,
struct mlx4_ib_fmr *fmr;
int err = -ENOMEM;
- fmr = kmalloc(sizeof *fmr, GFP_KERNEL);
+ fmr = kmalloc(sizeof(*fmr), GFP_KERNEL);
if (!fmr)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c
index bc5536f00b6c..65a1c32d37de 100644
--- a/drivers/infiniband/hw/mlx4/qp.c
+++ b/drivers/infiniband/hw/mlx4/qp.c
@@ -251,9 +251,9 @@ static void post_nop_wqe(struct mlx4_ib_qp *qp, int n, int size)
s = sizeof(struct mlx4_wqe_ctrl_seg);
if (qp->ibqp.qp_type == IB_QPT_UD) {
- struct mlx4_wqe_datagram_seg *dgram = wqe + sizeof *ctrl;
+ struct mlx4_wqe_datagram_seg *dgram = wqe + sizeof(*ctrl);
struct mlx4_av *av = (struct mlx4_av *)dgram->av;
- memset(dgram, 0, sizeof *dgram);
+ memset(dgram, 0, sizeof(*dgram));
av->port_pd = cpu_to_be32((qp->port << 24) | to_mpd(qp->ibqp.pd)->pdn);
s += sizeof(struct mlx4_wqe_datagram_seg);
}
@@ -261,7 +261,7 @@ static void post_nop_wqe(struct mlx4_ib_qp *qp, int n, int size)
/* Pad the remainder of the WQE with an inline data segment. */
if (size > s) {
inl = wqe + s;
- inl->byte_count = cpu_to_be32(1 << 31 | (size - s - sizeof *inl));
+ inl->byte_count = cpu_to_be32(1 << 31 | (size - s - sizeof(*inl)));
}
ctrl->srcrb_flags = 0;
ctrl->fence_size = size / 16;
@@ -728,7 +728,7 @@ static int create_qp_common(struct mlx4_ib_dev *dev, struct ib_pd *pd,
if (pd->uobject) {
struct mlx4_ib_create_qp ucmd;
- if (ib_copy_from_udata(&ucmd, udata, sizeof ucmd)) {
+ if (ib_copy_from_udata(&ucmd, udata, sizeof(ucmd))) {
err = -EFAULT;
goto err;
}
@@ -1166,7 +1166,7 @@ static struct ib_qp *_mlx4_ib_create_qp(struct ib_pd *pd,
case IB_QPT_RC:
case IB_QPT_UC:
case IB_QPT_RAW_PACKET:
- qp = kzalloc(sizeof *qp, gfp);
+ qp = kzalloc(sizeof(*qp), gfp);
if (!qp)
return ERR_PTR(-ENOMEM);
qp->pri.vid = 0xFFFF;
@@ -1618,7 +1618,7 @@ static int __mlx4_ib_modify_qp(struct ib_qp *ibqp,
IB_LINK_LAYER_ETHERNET)
return -ENOTSUPP;
- context = kzalloc(sizeof *context, GFP_KERNEL);
+ context = kzalloc(sizeof(*context), GFP_KERNEL);
if (!context)
return -ENOMEM;
@@ -2278,7 +2278,7 @@ static int build_sriov_qp0_header(struct mlx4_ib_sqp *sqp,
struct mlx4_ib_dev *mdev = to_mdev(sqp->qp.ibqp.device);
struct ib_device *ib_dev = &mdev->ib_dev;
struct mlx4_wqe_mlx_seg *mlx = wqe;
- struct mlx4_wqe_inline_seg *inl = wqe + sizeof *mlx;
+ struct mlx4_wqe_inline_seg *inl = wqe + sizeof(*mlx);
struct mlx4_ib_ah *ah = to_mah(wr->ah);
u16 pkey;
u32 qkey;
@@ -2391,7 +2391,7 @@ static int build_mlx_header(struct mlx4_ib_sqp *sqp, struct ib_ud_wr *wr,
struct ib_device *ib_dev = sqp->qp.ibqp.device;
struct mlx4_wqe_mlx_seg *mlx = wqe;
struct mlx4_wqe_ctrl_seg *ctrl = wqe;
- struct mlx4_wqe_inline_seg *inl = wqe + sizeof *mlx;
+ struct mlx4_wqe_inline_seg *inl = wqe + sizeof(*mlx);
struct mlx4_ib_ah *ah = to_mah(wr->ah);
union ib_gid sgid;
u16 pkey;
@@ -2764,7 +2764,7 @@ static void build_tunnel_header(struct ib_ud_wr *wr, void *wqe, unsigned *mlx_se
int spc;
int i;
- memcpy(&hdr.av, &ah->av, sizeof hdr.av);
+ memcpy(&hdr.av, &ah->av, sizeof(hdr.av));
hdr.remote_qpn = cpu_to_be32(wr->remote_qpn);
hdr.pkey_index = cpu_to_be16(wr->pkey_index);
hdr.qkey = cpu_to_be32(wr->remote_qkey);
@@ -2773,10 +2773,10 @@ static void build_tunnel_header(struct ib_ud_wr *wr, void *wqe, unsigned *mlx_se
spc = MLX4_INLINE_ALIGN -
((unsigned long) (inl + 1) & (MLX4_INLINE_ALIGN - 1));
- if (sizeof (hdr) <= spc) {
- memcpy(inl + 1, &hdr, sizeof (hdr));
+ if (sizeof(hdr) <= spc) {
+ memcpy(inl + 1, &hdr, sizeof(hdr));
wmb();
- inl->byte_count = cpu_to_be32(1 << 31 | sizeof (hdr));
+ inl->byte_count = cpu_to_be32(1 << 31 | sizeof(hdr));
i = 1;
} else {
memcpy(inl + 1, &hdr, spc);
@@ -2784,14 +2784,14 @@ static void build_tunnel_header(struct ib_ud_wr *wr, void *wqe, unsigned *mlx_se
inl->byte_count = cpu_to_be32(1 << 31 | spc);
inl = (void *) (inl + 1) + spc;
- memcpy(inl + 1, (void *) &hdr + spc, sizeof (hdr) - spc);
+ memcpy(inl + 1, (void *) &hdr + spc, sizeof(hdr) - spc);
wmb();
- inl->byte_count = cpu_to_be32(1 << 31 | (sizeof (hdr) - spc));
+ inl->byte_count = cpu_to_be32(1 << 31 | (sizeof(hdr) - spc));
i = 2;
}
*mlx_seg_len =
- ALIGN(i * sizeof (struct mlx4_wqe_inline_seg) + sizeof (hdr), 16);
+ ALIGN(i * sizeof (struct mlx4_wqe_inline_seg) + sizeof(hdr), 16);
}
static void set_mlx_icrc_seg(void *dseg)
@@ -2843,7 +2843,7 @@ static int build_lso_seg(struct mlx4_wqe_lso_seg *wqe, struct ib_ud_wr *wr,
struct mlx4_ib_qp *qp, unsigned *lso_seg_len,
__be32 *lso_hdr_sz, __be32 *blh)
{
- unsigned halign = ALIGN(sizeof *wqe + wr->hlen, 16);
+ unsigned halign = ALIGN(sizeof(*wqe) + wr->hlen, 16);
if (unlikely(halign > MLX4_IB_CACHE_LINE_SIZE))
*blh = cpu_to_be32(1 << 6);
@@ -2966,8 +2966,8 @@ int mlx4_ib_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
ctrl->imm = send_ieth(wr);
- wqe += sizeof *ctrl;
- size = sizeof *ctrl / 16;
+ wqe += sizeof(*ctrl);
+ size = sizeof(*ctrl) / 16;
switch (qp->mlx4_ib_qp_type) {
case MLX4_IB_QPT_RC:
@@ -3348,7 +3348,7 @@ static void to_ib_ah_attr(struct mlx4_ib_dev *ibdev, struct ib_ah_attr *ib_ah_at
struct mlx4_dev *dev = ibdev->dev;
int is_eth;
- memset(ib_ah_attr, 0, sizeof *ib_ah_attr);
+ memset(ib_ah_attr, 0, sizeof(*ib_ah_attr));
ib_ah_attr->port_num = path->sched_queue & 0x40 ? 2 : 1;
if (ib_ah_attr->port_num == 0 || ib_ah_attr->port_num > dev->caps.num_ports)
@@ -3374,7 +3374,7 @@ static void to_ib_ah_attr(struct mlx4_ib_dev *ibdev, struct ib_ah_attr *ib_ah_at
ib_ah_attr->grh.flow_label =
be32_to_cpu(path->tclass_flowlabel) & 0xfffff;
memcpy(ib_ah_attr->grh.dgid.raw,
- path->rgid, sizeof ib_ah_attr->grh.dgid.raw);
+ path->rgid, sizeof(ib_ah_attr->grh.dgid.raw));
}
}
diff --git a/drivers/infiniband/hw/mlx4/srq.c b/drivers/infiniband/hw/mlx4/srq.c
index 0597f3eef5d0..5f7fdb8fcfbf 100644
--- a/drivers/infiniband/hw/mlx4/srq.c
+++ b/drivers/infiniband/hw/mlx4/srq.c
@@ -89,7 +89,7 @@ struct ib_srq *mlx4_ib_create_srq(struct ib_pd *pd,
init_attr->attr.max_sge > dev->dev->caps.max_srq_sge)
return ERR_PTR(-EINVAL);
- srq = kmalloc(sizeof *srq, GFP_KERNEL);
+ srq = kmalloc(sizeof(*srq), GFP_KERNEL);
if (!srq)
return ERR_PTR(-ENOMEM);
@@ -109,7 +109,7 @@ struct ib_srq *mlx4_ib_create_srq(struct ib_pd *pd,
if (pd->uobject) {
struct mlx4_ib_create_srq ucmd;
- if (ib_copy_from_udata(&ucmd, udata, sizeof ucmd)) {
+ if (ib_copy_from_udata(&ucmd, udata, sizeof(ucmd))) {
err = -EFAULT;
goto err_srq;
}
@@ -197,7 +197,7 @@ struct ib_srq *mlx4_ib_create_srq(struct ib_pd *pd,
srq->ibsrq.ext.xrc.srq_num = srq->msrq.srqn;
if (pd->uobject)
- if (ib_copy_to_udata(udata, &srq->msrq.srqn, sizeof (__u32))) {
+ if (ib_copy_to_udata(udata, &srq->msrq.srqn, sizeof(__u32))) {
err = -EFAULT;
goto err_wrid;
}
diff --git a/drivers/infiniband/hw/mlx4/sysfs.c b/drivers/infiniband/hw/mlx4/sysfs.c
index 69fb5ba94d0f..29a2d42323da 100644
--- a/drivers/infiniband/hw/mlx4/sysfs.c
+++ b/drivers/infiniband/hw/mlx4/sysfs.c
@@ -514,8 +514,8 @@ alloc_group_attrs(ssize_t (*show)(struct mlx4_port *,
GFP_KERNEL);
if (!element)
goto err;
- if (snprintf(element->name, sizeof (element->name),
- "%d", i) >= sizeof (element->name)) {
+ if (snprintf(element->name, sizeof(element->name),
+ "%d", i) >= sizeof(element->name)) {
kfree(element);
goto err;
}
@@ -643,7 +643,7 @@ static int add_port(struct mlx4_ib_dev *dev, int port_num, int slave)
int is_eth = rdma_port_get_link_layer(&dev->ib_dev, port_num) ==
IB_LINK_LAYER_ETHERNET;
- p = kzalloc(sizeof *p, GFP_KERNEL);
+ p = kzalloc(sizeof(*p), GFP_KERNEL);
if (!p)
return -ENOMEM;
@@ -713,7 +713,7 @@ static int register_one_pkey_tree(struct mlx4_ib_dev *dev, int slave)
struct mlx4_port *mport;
struct mlx4_active_ports actv_ports;
- get_name(dev, name, slave, sizeof name);
+ get_name(dev, name, slave, sizeof(name));
dev->pkeys.device_parent[slave] =
kobject_create_and_add(name, kobject_get(dev->iov_parent));
diff --git a/drivers/infiniband/hw/mthca/mthca_allocator.c b/drivers/infiniband/hw/mthca/mthca_allocator.c
index b4e0cf4e95cd..01eef569c2e3 100644
--- a/drivers/infiniband/hw/mthca/mthca_allocator.c
+++ b/drivers/infiniband/hw/mthca/mthca_allocator.c
@@ -162,7 +162,7 @@ int mthca_array_init(struct mthca_array *array, int nent)
int npage = (nent * sizeof (void *) + PAGE_SIZE - 1) / PAGE_SIZE;
int i;
- array->page_list = kmalloc(npage * sizeof *array->page_list, GFP_KERNEL);
+ array->page_list = kmalloc(npage * sizeof(*array->page_list), GFP_KERNEL);
if (!array->page_list)
return -ENOMEM;
@@ -220,7 +220,7 @@ int mthca_buf_alloc(struct mthca_dev *dev, int size, int max_direct,
npages *= 2;
}
- dma_list = kmalloc(npages * sizeof *dma_list, GFP_KERNEL);
+ dma_list = kmalloc(npages * sizeof(*dma_list), GFP_KERNEL);
if (!dma_list)
goto err_free;
@@ -231,11 +231,11 @@ int mthca_buf_alloc(struct mthca_dev *dev, int size, int max_direct,
npages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
shift = PAGE_SHIFT;
- dma_list = kmalloc(npages * sizeof *dma_list, GFP_KERNEL);
+ dma_list = kmalloc(npages * sizeof(*dma_list), GFP_KERNEL);
if (!dma_list)
return -ENOMEM;
- buf->page_list = kmalloc(npages * sizeof *buf->page_list,
+ buf->page_list = kmalloc(npages * sizeof(*buf->page_list),
GFP_KERNEL);
if (!buf->page_list)
goto err_out;
diff --git a/drivers/infiniband/hw/mthca/mthca_av.c b/drivers/infiniband/hw/mthca/mthca_av.c
index bcac294042f5..46bb2b52a731 100644
--- a/drivers/infiniband/hw/mthca/mthca_av.c
+++ b/drivers/infiniband/hw/mthca/mthca_av.c
@@ -161,7 +161,7 @@ int mthca_create_ah(struct mthca_dev *dev,
ah->type = MTHCA_AH_PCI_POOL;
if (mthca_is_memfree(dev)) {
- ah->av = kmalloc(sizeof *ah->av, GFP_ATOMIC);
+ ah->av = kmalloc(sizeof(*ah->av), GFP_ATOMIC);
if (!ah->av)
return -ENOMEM;
@@ -175,7 +175,7 @@ int mthca_create_ah(struct mthca_dev *dev,
if (index == -1)
goto on_hca_fail;
- av = kmalloc(sizeof *av, GFP_ATOMIC);
+ av = kmalloc(sizeof(*av), GFP_ATOMIC);
if (!av)
goto on_hca_fail;
@@ -298,7 +298,7 @@ int mthca_ah_query(struct ib_ah *ibah, struct ib_ah_attr *attr)
if (ah->type == MTHCA_AH_ON_HCA)
return -ENOSYS;
- memset(attr, 0, sizeof *attr);
+ memset(attr, 0, sizeof(*attr));
attr->dlid = be16_to_cpu(ah->av->dlid);
attr->sl = be32_to_cpu(ah->av->sl_tclass_flowlabel) >> 28;
attr->port_num = be32_to_cpu(ah->av->port_pd) >> 24;
diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
index c7f49bbb0c72..cb62eaa3ca42 100644
--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
@@ -609,7 +609,7 @@ struct mthca_mailbox *mthca_alloc_mailbox(struct mthca_dev *dev,
{
struct mthca_mailbox *mailbox;
- mailbox = kmalloc(sizeof *mailbox, gfp_mask);
+ mailbox = kmalloc(sizeof(*mailbox), gfp_mask);
if (!mailbox)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/infiniband/hw/mthca/mthca_cq.c b/drivers/infiniband/hw/mthca/mthca_cq.c
index a6531ffe29a6..b08be138d095 100644
--- a/drivers/infiniband/hw/mthca/mthca_cq.c
+++ b/drivers/infiniband/hw/mthca/mthca_cq.c
@@ -824,7 +824,7 @@ int mthca_init_cq(struct mthca_dev *dev, int nent,
init_waitqueue_head(&cq->wait);
mutex_init(&cq->mutex);
- memset(cq_context, 0, sizeof *cq_context);
+ memset(cq_context, 0, sizeof(*cq_context));
cq_context->flags = cpu_to_be32(MTHCA_CQ_STATUS_OK |
MTHCA_CQ_STATE_DISARMED |
MTHCA_CQ_FLAG_TR);
diff --git a/drivers/infiniband/hw/mthca/mthca_eq.c b/drivers/infiniband/hw/mthca/mthca_eq.c
index 690201738993..927ac756af95 100644
--- a/drivers/infiniband/hw/mthca/mthca_eq.c
+++ b/drivers/infiniband/hw/mthca/mthca_eq.c
@@ -479,7 +479,7 @@ static int mthca_create_eq(struct mthca_dev *dev,
eq->nent = roundup_pow_of_two(max(nent, 2));
npages = ALIGN(eq->nent * MTHCA_EQ_ENTRY_SIZE, PAGE_SIZE) / PAGE_SIZE;
- eq->page_list = kmalloc(npages * sizeof *eq->page_list,
+ eq->page_list = kmalloc(npages * sizeof(*eq->page_list),
GFP_KERNEL);
if (!eq->page_list)
goto err_out;
@@ -487,7 +487,7 @@ static int mthca_create_eq(struct mthca_dev *dev,
for (i = 0; i < npages; ++i)
eq->page_list[i].buf = NULL;
- dma_list = kmalloc(npages * sizeof *dma_list, GFP_KERNEL);
+ dma_list = kmalloc(npages * sizeof(*dma_list), GFP_KERNEL);
if (!dma_list)
goto err_out_free;
@@ -524,7 +524,7 @@ static int mthca_create_eq(struct mthca_dev *dev,
if (err)
goto err_out_free_eq;
- memset(eq_context, 0, sizeof *eq_context);
+ memset(eq_context, 0, sizeof(*eq_context));
eq_context->flags = cpu_to_be32(MTHCA_EQ_STATUS_OK |
MTHCA_EQ_OWNER_HW |
MTHCA_EQ_STATE_ARMED |
diff --git a/drivers/infiniband/hw/mthca/mthca_mad.c b/drivers/infiniband/hw/mthca/mthca_mad.c
index 7c3f2fb44ba5..7da71b822f04 100644
--- a/drivers/infiniband/hw/mthca/mthca_mad.c
+++ b/drivers/infiniband/hw/mthca/mthca_mad.c
@@ -52,7 +52,7 @@ static int mthca_update_rate(struct mthca_dev *dev, u8 port_num)
struct ib_port_attr *tprops = NULL;
int ret;
- tprops = kmalloc(sizeof *tprops, GFP_KERNEL);
+ tprops = kmalloc(sizeof(*tprops), GFP_KERNEL);
if (!tprops)
return -ENOMEM;
@@ -81,7 +81,7 @@ static void update_sm_ah(struct mthca_dev *dev,
if (!dev->send_agent[port_num - 1][0])
return;
- memset(&ah_attr, 0, sizeof ah_attr);
+ memset(&ah_attr, 0, sizeof(ah_attr));
ah_attr.dlid = lid;
ah_attr.sl = sl;
ah_attr.port_num = port_num;
@@ -181,7 +181,7 @@ static void forward_trap(struct mthca_dev *dev,
* it's OK for our devices).
*/
spin_lock_irqsave(&dev->sm_lock, flags);
- memcpy(send_buf->mad, mad, sizeof *mad);
+ memcpy(send_buf->mad, mad, sizeof(*mad));
if ((send_buf->ah = dev->sm_ah[port_num - 1]))
ret = ib_post_send_mad(send_buf, NULL);
else
diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
index ded76c101dde..03a0ef0c7782 100644
--- a/drivers/infiniband/hw/mthca/mthca_main.c
+++ b/drivers/infiniband/hw/mthca/mthca_main.c
@@ -683,7 +683,7 @@ static int mthca_init_hca(struct mthca_dev *mdev)
mdev->eq_table.inta_pin = adapter.inta_pin;
if (!mthca_is_memfree(mdev))
mdev->rev_id = adapter.revision_id;
- memcpy(mdev->board_id, adapter.board_id, sizeof mdev->board_id);
+ memcpy(mdev->board_id, adapter.board_id, sizeof(mdev->board_id));
return 0;
@@ -964,7 +964,7 @@ static int __mthca_init_one(struct pci_dev *pdev, int hca_type)
/* We can handle large RDMA requests, so allow larger segments. */
dma_set_max_seg_size(&pdev->dev, 1024 * 1024 * 1024);
- mdev = (struct mthca_dev *) ib_alloc_device(sizeof *mdev);
+ mdev = (struct mthca_dev *) ib_alloc_device(sizeof(*mdev));
if (!mdev) {
dev_err(&pdev->dev, "Device struct alloc failed, "
"aborting.\n");
diff --git a/drivers/infiniband/hw/mthca/mthca_mcg.c b/drivers/infiniband/hw/mthca/mthca_mcg.c
index 6304ae8f4a6c..9cb36a345fc2 100644
--- a/drivers/infiniband/hw/mthca/mthca_mcg.c
+++ b/drivers/infiniband/hw/mthca/mthca_mcg.c
@@ -157,7 +157,7 @@ int mthca_multicast_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
mthca_err(dev, "READ_MGM failed (%d)\n", err);
goto out;
}
- memset(mgm, 0, sizeof *mgm);
+ memset(mgm, 0, sizeof(*mgm));
memcpy(mgm->gid, gid->raw, 16);
}
diff --git a/drivers/infiniband/hw/mthca/mthca_memfree.c b/drivers/infiniband/hw/mthca/mthca_memfree.c
index 7d2e42dd6926..fcd43f68d9e3 100644
--- a/drivers/infiniband/hw/mthca/mthca_memfree.c
+++ b/drivers/infiniband/hw/mthca/mthca_memfree.c
@@ -145,7 +145,7 @@ struct mthca_icm *mthca_alloc_icm(struct mthca_dev *dev, int npages,
/* We use sg_set_buf for coherent allocs, which assumes low memory */
BUG_ON(coherent && (gfp_mask & __GFP_HIGHMEM));
- icm = kmalloc(sizeof *icm, gfp_mask & ~(__GFP_HIGHMEM | __GFP_NOWARN));
+ icm = kmalloc(sizeof(*icm), gfp_mask & ~(__GFP_HIGHMEM | __GFP_NOWARN));
if (!icm)
return icm;
@@ -156,7 +156,7 @@ struct mthca_icm *mthca_alloc_icm(struct mthca_dev *dev, int npages,
while (npages > 0) {
if (!chunk) {
- chunk = kmalloc(sizeof *chunk,
+ chunk = kmalloc(sizeof(*chunk),
gfp_mask & ~(__GFP_HIGHMEM | __GFP_NOWARN));
if (!chunk)
goto fail;
@@ -367,7 +367,7 @@ struct mthca_icm_table *mthca_alloc_icm_table(struct mthca_dev *dev,
obj_per_chunk = MTHCA_TABLE_CHUNK_SIZE / obj_size;
num_icm = DIV_ROUND_UP(nobj, obj_per_chunk);
- table = kmalloc(sizeof *table + num_icm * sizeof *table->icm, GFP_KERNEL);
+ table = kmalloc(sizeof(*table) + num_icm * sizeof(*table->icm), GFP_KERNEL);
if (!table)
return NULL;
@@ -530,7 +530,7 @@ struct mthca_user_db_table *mthca_init_user_db_tab(struct mthca_dev *dev)
return NULL;
npages = dev->uar_table.uarc_size / MTHCA_ICM_PAGE_SIZE;
- db_tab = kmalloc(sizeof *db_tab + npages * sizeof *db_tab->page, GFP_KERNEL);
+ db_tab = kmalloc(sizeof(*db_tab) + npages * sizeof(*db_tab->page), GFP_KERNEL);
if (!db_tab)
return ERR_PTR(-ENOMEM);
@@ -704,7 +704,7 @@ int mthca_init_db_tab(struct mthca_dev *dev)
if (!mthca_is_memfree(dev))
return 0;
- dev->db_tab = kmalloc(sizeof *dev->db_tab, GFP_KERNEL);
+ dev->db_tab = kmalloc(sizeof(*dev->db_tab), GFP_KERNEL);
if (!dev->db_tab)
return -ENOMEM;
@@ -715,7 +715,7 @@ int mthca_init_db_tab(struct mthca_dev *dev)
dev->db_tab->min_group2 = dev->db_tab->npages - 1;
dev->db_tab->page = kmalloc(dev->db_tab->npages *
- sizeof *dev->db_tab->page,
+ sizeof(*dev->db_tab->page),
GFP_KERNEL);
if (!dev->db_tab->page) {
kfree(dev->db_tab);
diff --git a/drivers/infiniband/hw/mthca/mthca_mr.c b/drivers/infiniband/hw/mthca/mthca_mr.c
index ed9a989e501b..3b4cc911771c 100644
--- a/drivers/infiniband/hw/mthca/mthca_mr.c
+++ b/drivers/infiniband/hw/mthca/mthca_mr.c
@@ -146,7 +146,7 @@ static int mthca_buddy_init(struct mthca_buddy *buddy, int max_order)
buddy->bits = kzalloc((buddy->max_order + 1) * sizeof (long *),
GFP_KERNEL);
- buddy->num_free = kcalloc((buddy->max_order + 1), sizeof *buddy->num_free,
+ buddy->num_free = kcalloc((buddy->max_order + 1), sizeof(*buddy->num_free),
GFP_KERNEL);
if (!buddy->bits || !buddy->num_free)
goto err_out;
@@ -214,7 +214,7 @@ static struct mthca_mtt *__mthca_alloc_mtt(struct mthca_dev *dev, int size,
if (size <= 0)
return ERR_PTR(-EINVAL);
- mtt = kmalloc(sizeof *mtt, GFP_KERNEL);
+ mtt = kmalloc(sizeof(*mtt), GFP_KERNEL);
if (!mtt)
return ERR_PTR(-ENOMEM);
@@ -470,7 +470,7 @@ int mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
mpt_entry->length = cpu_to_be64(total_size);
memset(&mpt_entry->lkey, 0,
- sizeof *mpt_entry - offsetof(struct mthca_mpt_entry, lkey));
+ sizeof(*mpt_entry) - offsetof(struct mthca_mpt_entry, lkey));
if (mr->mtt)
mpt_entry->mtt_seg =
@@ -580,7 +580,7 @@ int mthca_fmr_alloc(struct mthca_dev *dev, u32 pd,
/* For Arbel, all MTTs must fit in the same page. */
if (mthca_is_memfree(dev) &&
- mr->attr.max_pages * sizeof *mr->mem.arbel.mtts > PAGE_SIZE)
+ mr->attr.max_pages * sizeof(*mr->mem.arbel.mtts) > PAGE_SIZE)
return -EINVAL;
mr->maps = 0;
@@ -602,7 +602,7 @@ int mthca_fmr_alloc(struct mthca_dev *dev, u32 pd,
BUG_ON(!mr->mem.arbel.mpt);
} else
mr->mem.tavor.mpt = dev->mr_table.tavor_fmr.mpt_base +
- sizeof *(mr->mem.tavor.mpt) * idx;
+ sizeof(*(mr->mem.tavor.mpt)) * idx;
mr->mtt = __mthca_alloc_mtt(dev, list_len, dev->mr_table.fmr_mtt_buddy);
if (IS_ERR(mr->mtt)) {
@@ -637,7 +637,7 @@ int mthca_fmr_alloc(struct mthca_dev *dev, u32 pd,
mpt_entry->key = cpu_to_be32(key);
mpt_entry->pd = cpu_to_be32(pd);
memset(&mpt_entry->start, 0,
- sizeof *mpt_entry - offsetof(struct mthca_mpt_entry, start));
+ sizeof(*mpt_entry) - offsetof(struct mthca_mpt_entry, start));
mpt_entry->mtt_seg = cpu_to_be64(dev->mr_table.mtt_base + mtt_seg);
if (0) {
diff --git a/drivers/infiniband/hw/mthca/mthca_profile.c b/drivers/infiniband/hw/mthca/mthca_profile.c
index 15d064479ef6..d7f759c507c6 100644
--- a/drivers/infiniband/hw/mthca/mthca_profile.c
+++ b/drivers/infiniband/hw/mthca/mthca_profile.c
@@ -79,7 +79,7 @@ s64 mthca_make_profile(struct mthca_dev *dev,
struct mthca_resource *profile;
int i, j;
- profile = kzalloc(MTHCA_RES_NUM * sizeof *profile, GFP_KERNEL);
+ profile = kzalloc(MTHCA_RES_NUM * sizeof(*profile), GFP_KERNEL);
if (!profile)
return -ENOMEM;
diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
index 9866c35cc977..5955f2c12f7c 100644
--- a/drivers/infiniband/hw/mthca/mthca_provider.c
+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
@@ -68,12 +68,12 @@ static int mthca_query_device(struct ib_device *ibdev, struct ib_device_attr *pr
if (uhw->inlen || uhw->outlen)
return -EINVAL;
- in_mad = kzalloc(sizeof *in_mad, GFP_KERNEL);
- out_mad = kmalloc(sizeof *out_mad, GFP_KERNEL);
+ in_mad = kzalloc(sizeof(*in_mad), GFP_KERNEL);
+ out_mad = kmalloc(sizeof(*out_mad), GFP_KERNEL);
if (!in_mad || !out_mad)
goto out;
- memset(props, 0, sizeof *props);
+ memset(props, 0, sizeof(*props));
props->fw_ver = mdev->fw_ver;
@@ -141,12 +141,12 @@ static int mthca_query_port(struct ib_device *ibdev,
struct ib_smp *out_mad = NULL;
int err = -ENOMEM;
- in_mad = kzalloc(sizeof *in_mad, GFP_KERNEL);
- out_mad = kmalloc(sizeof *out_mad, GFP_KERNEL);
+ in_mad = kzalloc(sizeof(*in_mad), GFP_KERNEL);
+ out_mad = kmalloc(sizeof(*out_mad), GFP_KERNEL);
if (!in_mad || !out_mad)
goto out;
- memset(props, 0, sizeof *props);
+ memset(props, 0, sizeof(*props));
init_query_mad(in_mad);
in_mad->attr_id = IB_SMP_ATTR_PORT_INFO;
@@ -236,8 +236,8 @@ static int mthca_query_pkey(struct ib_device *ibdev,
struct ib_smp *out_mad = NULL;
int err = -ENOMEM;
- in_mad = kzalloc(sizeof *in_mad, GFP_KERNEL);
- out_mad = kmalloc(sizeof *out_mad, GFP_KERNEL);
+ in_mad = kzalloc(sizeof(*in_mad), GFP_KERNEL);
+ out_mad = kmalloc(sizeof(*out_mad), GFP_KERNEL);
if (!in_mad || !out_mad)
goto out;
@@ -265,8 +265,8 @@ static int mthca_query_gid(struct ib_device *ibdev, u8 port,
struct ib_smp *out_mad = NULL;
int err = -ENOMEM;
- in_mad = kzalloc(sizeof *in_mad, GFP_KERNEL);
- out_mad = kmalloc(sizeof *out_mad, GFP_KERNEL);
+ in_mad = kzalloc(sizeof(*in_mad), GFP_KERNEL);
+ out_mad = kmalloc(sizeof(*out_mad), GFP_KERNEL);
if (!in_mad || !out_mad)
goto out;
@@ -308,7 +308,7 @@ static struct ib_ucontext *mthca_alloc_ucontext(struct ib_device *ibdev,
if (!(to_mdev(ibdev)->active))
return ERR_PTR(-EAGAIN);
- memset(&uresp, 0, sizeof uresp);
+ memset(&uresp, 0, sizeof(uresp));
uresp.qp_tab_size = to_mdev(ibdev)->limits.num_qps;
if (mthca_is_memfree(to_mdev(ibdev)))
@@ -316,7 +316,7 @@ static struct ib_ucontext *mthca_alloc_ucontext(struct ib_device *ibdev,
else
uresp.uarc_size = 0;
- context = kmalloc(sizeof *context, GFP_KERNEL);
+ context = kmalloc(sizeof(*context), GFP_KERNEL);
if (!context)
return ERR_PTR(-ENOMEM);
@@ -334,7 +334,7 @@ static struct ib_ucontext *mthca_alloc_ucontext(struct ib_device *ibdev,
return ERR_PTR(err);
}
- if (ib_copy_to_udata(udata, &uresp, sizeof uresp)) {
+ if (ib_copy_to_udata(udata, &uresp, sizeof(uresp))) {
mthca_cleanup_user_db_tab(to_mdev(ibdev), &context->uar, context->db_tab);
mthca_uar_free(to_mdev(ibdev), &context->uar);
kfree(context);
@@ -379,7 +379,7 @@ static struct ib_pd *mthca_alloc_pd(struct ib_device *ibdev,
struct mthca_pd *pd;
int err;
- pd = kmalloc(sizeof *pd, GFP_KERNEL);
+ pd = kmalloc(sizeof(*pd), GFP_KERNEL);
if (!pd)
return ERR_PTR(-ENOMEM);
@@ -390,7 +390,7 @@ static struct ib_pd *mthca_alloc_pd(struct ib_device *ibdev,
}
if (context) {
- if (ib_copy_to_udata(udata, &pd->pd_num, sizeof (__u32))) {
+ if (ib_copy_to_udata(udata, &pd->pd_num, sizeof(__u32))) {
mthca_pd_free(to_mdev(ibdev), pd);
kfree(pd);
return ERR_PTR(-EFAULT);
@@ -414,7 +414,7 @@ static struct ib_ah *mthca_ah_create(struct ib_pd *pd,
int err;
struct mthca_ah *ah;
- ah = kmalloc(sizeof *ah, GFP_ATOMIC);
+ ah = kmalloc(sizeof(*ah), GFP_ATOMIC);
if (!ah)
return ERR_PTR(-ENOMEM);
@@ -447,14 +447,14 @@ static struct ib_srq *mthca_create_srq(struct ib_pd *pd,
if (init_attr->srq_type != IB_SRQT_BASIC)
return ERR_PTR(-ENOSYS);
- srq = kmalloc(sizeof *srq, GFP_KERNEL);
+ srq = kmalloc(sizeof(*srq), GFP_KERNEL);
if (!srq)
return ERR_PTR(-ENOMEM);
if (pd->uobject) {
context = to_mucontext(pd->uobject->context);
- if (ib_copy_from_udata(&ucmd, udata, sizeof ucmd)) {
+ if (ib_copy_from_udata(&ucmd, udata, sizeof(ucmd))) {
err = -EFAULT;
goto err_free;
}
@@ -480,7 +480,7 @@ static struct ib_srq *mthca_create_srq(struct ib_pd *pd,
if (err)
goto err_free;
- if (context && ib_copy_to_udata(udata, &srq->srqn, sizeof (__u32))) {
+ if (context && ib_copy_to_udata(udata, &srq->srqn, sizeof(__u32))) {
mthca_free_srq(to_mdev(pd->device), srq);
err = -EFAULT;
goto err_free;
@@ -529,14 +529,14 @@ static struct ib_qp *mthca_create_qp(struct ib_pd *pd,
{
struct mthca_ucontext *context;
- qp = kmalloc(sizeof *qp, GFP_KERNEL);
+ qp = kmalloc(sizeof(*qp), GFP_KERNEL);
if (!qp)
return ERR_PTR(-ENOMEM);
if (pd->uobject) {
context = to_mucontext(pd->uobject->context);
- if (ib_copy_from_udata(&ucmd, udata, sizeof ucmd)) {
+ if (ib_copy_from_udata(&ucmd, udata, sizeof(ucmd))) {
kfree(qp);
return ERR_PTR(-EFAULT);
}
@@ -663,7 +663,7 @@ static struct ib_cq *mthca_create_cq(struct ib_device *ibdev,
return ERR_PTR(-EINVAL);
if (context) {
- if (ib_copy_from_udata(&ucmd, udata, sizeof ucmd))
+ if (ib_copy_from_udata(&ucmd, udata, sizeof(ucmd)))
return ERR_PTR(-EFAULT);
err = mthca_map_user_db(to_mdev(ibdev), &to_mucontext(context)->uar,
@@ -679,7 +679,7 @@ static struct ib_cq *mthca_create_cq(struct ib_device *ibdev,
goto err_unmap_set;
}
- cq = kmalloc(sizeof *cq, GFP_KERNEL);
+ cq = kmalloc(sizeof(*cq), GFP_KERNEL);
if (!cq) {
err = -ENOMEM;
goto err_unmap_arm;
@@ -701,7 +701,7 @@ static struct ib_cq *mthca_create_cq(struct ib_device *ibdev,
if (err)
goto err_free;
- if (context && ib_copy_to_udata(udata, &cq->cqn, sizeof (__u32))) {
+ if (context && ib_copy_to_udata(udata, &cq->cqn, sizeof(__u32))) {
mthca_free_cq(to_mdev(ibdev), cq);
err = -EFAULT;
goto err_free;
@@ -738,7 +738,7 @@ static int mthca_alloc_resize_buf(struct mthca_dev *dev, struct mthca_cq *cq,
goto unlock;
}
- cq->resize_buf = kmalloc(sizeof *cq->resize_buf, GFP_ATOMIC);
+ cq->resize_buf = kmalloc(sizeof(*cq->resize_buf), GFP_ATOMIC);
if (!cq->resize_buf) {
ret = -ENOMEM;
goto unlock;
@@ -797,7 +797,7 @@ static int mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *uda
goto out;
lkey = cq->resize_buf->buf.mr.ibmr.lkey;
} else {
- if (ib_copy_from_udata(&ucmd, udata, sizeof ucmd)) {
+ if (ib_copy_from_udata(&ucmd, udata, sizeof(ucmd))) {
ret = -EFAULT;
goto out;
}
@@ -880,7 +880,7 @@ static struct ib_mr *mthca_get_dma_mr(struct ib_pd *pd, int acc)
struct mthca_mr *mr;
int err;
- mr = kmalloc(sizeof *mr, GFP_KERNEL);
+ mr = kmalloc(sizeof(*mr), GFP_KERNEL);
if (!mr)
return ERR_PTR(-ENOMEM);
@@ -911,7 +911,7 @@ static struct ib_mr *mthca_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
int err = 0;
int write_mtt_size;
- if (udata->inlen - sizeof (struct ib_uverbs_cmd_hdr) < sizeof ucmd) {
+ if (udata->inlen - sizeof (struct ib_uverbs_cmd_hdr) < sizeof(ucmd)) {
if (!to_mucontext(pd->uobject->context)->reg_mr_warned) {
mthca_warn(dev, "Process '%s' did not pass in MR attrs.\n",
current->comm);
@@ -919,10 +919,10 @@ static struct ib_mr *mthca_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
}
++to_mucontext(pd->uobject->context)->reg_mr_warned;
ucmd.mr_attrs = 0;
- } else if (ib_copy_from_udata(&ucmd, udata, sizeof ucmd))
+ } else if (ib_copy_from_udata(&ucmd, udata, sizeof(ucmd)))
return ERR_PTR(-EFAULT);
- mr = kmalloc(sizeof *mr, GFP_KERNEL);
+ mr = kmalloc(sizeof(*mr), GFP_KERNEL);
if (!mr)
return ERR_PTR(-ENOMEM);
@@ -951,7 +951,7 @@ static struct ib_mr *mthca_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
i = n = 0;
- write_mtt_size = min(mthca_write_mtt_size(dev), (int) (PAGE_SIZE / sizeof *pages));
+ write_mtt_size = min(mthca_write_mtt_size(dev), (int) (PAGE_SIZE / sizeof(*pages)));
for_each_sg(mr->umem->sg_head.sgl, sg, mr->umem->nmap, entry) {
len = sg_dma_len(sg) >> shift;
@@ -1016,11 +1016,11 @@ static struct ib_fmr *mthca_alloc_fmr(struct ib_pd *pd, int mr_access_flags,
struct mthca_fmr *fmr;
int err;
- fmr = kmalloc(sizeof *fmr, GFP_KERNEL);
+ fmr = kmalloc(sizeof(*fmr), GFP_KERNEL);
if (!fmr)
return ERR_PTR(-ENOMEM);
- memcpy(&fmr->attr, fmr_attr, sizeof *fmr_attr);
+ memcpy(&fmr->attr, fmr_attr, sizeof(*fmr_attr));
err = mthca_fmr_alloc(to_mdev(pd->device), to_mpd(pd)->pd_num,
convert_access(mr_access_flags), fmr);
@@ -1137,8 +1137,8 @@ static int mthca_init_node_data(struct mthca_dev *dev)
struct ib_smp *out_mad = NULL;
int err = -ENOMEM;
- in_mad = kzalloc(sizeof *in_mad, GFP_KERNEL);
- out_mad = kmalloc(sizeof *out_mad, GFP_KERNEL);
+ in_mad = kzalloc(sizeof(*in_mad), GFP_KERNEL);
+ out_mad = kmalloc(sizeof(*out_mad), GFP_KERNEL);
if (!in_mad || !out_mad)
goto out;
diff --git a/drivers/infiniband/hw/mthca/mthca_qp.c b/drivers/infiniband/hw/mthca/mthca_qp.c
index 96e5fb91fb48..648c82727995 100644
--- a/drivers/infiniband/hw/mthca/mthca_qp.c
+++ b/drivers/infiniband/hw/mthca/mthca_qp.c
@@ -311,7 +311,7 @@ static void init_port(struct mthca_dev *dev, int port)
int err;
struct mthca_init_ib_param param;
- memset(¶m, 0, sizeof param);
+ memset(¶m, 0, sizeof(param));
param.port_width = dev->limits.port_width_cap;
param.vl_cap = dev->limits.vl_cap;
@@ -396,7 +396,7 @@ static int to_ib_qp_access_flags(int mthca_flags)
static void to_ib_ah_attr(struct mthca_dev *dev, struct ib_ah_attr *ib_ah_attr,
struct mthca_qp_path *path)
{
- memset(ib_ah_attr, 0, sizeof *ib_ah_attr);
+ memset(ib_ah_attr, 0, sizeof(*ib_ah_attr));
ib_ah_attr->port_num = (be32_to_cpu(path->port_pkey) >> 24) & 0x3;
if (ib_ah_attr->port_num == 0 || ib_ah_attr->port_num > dev->limits.num_ports)
@@ -417,7 +417,7 @@ static void to_ib_ah_attr(struct mthca_dev *dev, struct ib_ah_attr *ib_ah_attr,
ib_ah_attr->grh.flow_label =
be32_to_cpu(path->sl_tclass_flowlabel) & 0xfffff;
memcpy(ib_ah_attr->grh.dgid.raw,
- path->rgid, sizeof ib_ah_attr->grh.dgid.raw);
+ path->rgid, sizeof(ib_ah_attr->grh.dgid.raw));
}
}
@@ -559,7 +559,7 @@ static int __mthca_modify_qp(struct ib_qp *ibqp,
}
qp_param = mailbox->buf;
qp_context = &qp_param->context;
- memset(qp_param, 0, sizeof *qp_param);
+ memset(qp_param, 0, sizeof(*qp_param));
qp_context->flags = cpu_to_be32((to_mthca_state(new_state) << 28) |
(to_mthca_st(qp->transport) << 16));
diff --git a/drivers/infiniband/hw/mthca/mthca_srq.c b/drivers/infiniband/hw/mthca/mthca_srq.c
index d22f970480c0..eb0c642d0154 100644
--- a/drivers/infiniband/hw/mthca/mthca_srq.c
+++ b/drivers/infiniband/hw/mthca/mthca_srq.c
@@ -97,7 +97,7 @@ static void mthca_tavor_init_srq_context(struct mthca_dev *dev,
struct mthca_srq *srq,
struct mthca_tavor_srq_context *context)
{
- memset(context, 0, sizeof *context);
+ memset(context, 0, sizeof(*context));
context->wqe_base_ds = cpu_to_be64(1 << (srq->wqe_shift - 4));
context->state_pd = cpu_to_be32(pd->pd_num);
@@ -117,7 +117,7 @@ static void mthca_arbel_init_srq_context(struct mthca_dev *dev,
{
int logsize, max;
- memset(context, 0, sizeof *context);
+ memset(context, 0, sizeof(*context));
/*
* Put max in a temporary variable to work around gcc bug
@@ -155,7 +155,7 @@ static int mthca_alloc_srq_buf(struct mthca_dev *dev, struct mthca_pd *pd,
if (pd->ibpd.uobject)
return 0;
- srq->wrid = kmalloc(srq->max * sizeof (u64), GFP_KERNEL);
+ srq->wrid = kmalloc(srq->max * sizeof(u64), GFP_KERNEL);
if (!srq->wrid)
return -ENOMEM;
diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
index cb9f0f27308d..e73ab04ce8dd 100644
--- a/drivers/infiniband/hw/nes/nes_cm.c
+++ b/drivers/infiniband/hw/nes/nes_cm.c
@@ -3000,7 +3000,7 @@ int nes_cm_disconn(struct nes_qp *nesqp)
{
struct disconn_work *work;
- work = kzalloc(sizeof *work, GFP_ATOMIC);
+ work = kzalloc(sizeof(*work), GFP_ATOMIC);
if (!work)
return -ENOMEM; /* Timer will clean up */
diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c
index 4713dd7ed764..3b8b7b216ce9 100644
--- a/drivers/infiniband/hw/nes/nes_hw.c
+++ b/drivers/infiniband/hw/nes/nes_hw.c
@@ -386,7 +386,7 @@ struct nes_adapter *nes_init_adapter(struct nes_device *nesdev, u8 hw_rev) {
nes_init_csr_ne020(nesdev, hw_rev, port_count);
memset(nesadapter->pft_mcast_map, 255,
- sizeof nesadapter->pft_mcast_map);
+ sizeof(nesadapter->pft_mcast_map));
/* populate the new nesadapter */
nesadapter->devfn = nesdev->pcidev->devfn;
diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c
index 416645259b0f..5e20fc7224b4 100644
--- a/drivers/infiniband/hw/nes/nes_mgt.c
+++ b/drivers/infiniband/hw/nes/nes_mgt.c
@@ -273,7 +273,7 @@ static int get_fpdu_info(struct nes_device *nesdev, struct nes_qp *nesqp,
/* See if we have all of the fpdu */
frag_tot = 0;
- memset(&frags, 0, sizeof frags);
+ memset(&frags, 0, sizeof(frags));
for (i = 0; i < MAX_FPDU_FRAGS; i++) {
frags[i].physaddr = cb->busaddr;
frags[i].physaddr += skb->data - cb->data_start;
@@ -728,7 +728,7 @@ static int nes_change_quad_hash(struct nes_device *nesdev,
goto chg_qh_err;
}
- qh_chg = kmalloc(sizeof *qh_chg, GFP_ATOMIC);
+ qh_chg = kmalloc(sizeof(*qh_chg), GFP_ATOMIC);
if (qh_chg == NULL) {
nes_debug(NES_DBG_PAU, "Failed to get a cqp_request.\n");
ret = -ENOMEM;
diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
index 8c4daf7f22ec..09f64b0a9030 100644
--- a/drivers/infiniband/hw/nes/nes_verbs.c
+++ b/drivers/infiniband/hw/nes/nes_verbs.c
@@ -566,7 +566,7 @@ static struct ib_ucontext *nes_alloc_ucontext(struct ib_device *ibdev,
}
- memset(&uresp, 0, sizeof uresp);
+ memset(&uresp, 0, sizeof(uresp));
uresp.max_qps = nesibdev->max_qp;
uresp.max_pds = nesibdev->max_pd;
@@ -574,7 +574,7 @@ static struct ib_ucontext *nes_alloc_ucontext(struct ib_device *ibdev,
uresp.virtwq = nesadapter->virtwq;
uresp.kernel_ver = NES_ABI_KERNEL_VER;
- nes_ucontext = kzalloc(sizeof *nes_ucontext, GFP_KERNEL);
+ nes_ucontext = kzalloc(sizeof(*nes_ucontext), GFP_KERNEL);
if (!nes_ucontext)
return ERR_PTR(-ENOMEM);
@@ -585,7 +585,7 @@ static struct ib_ucontext *nes_alloc_ucontext(struct ib_device *ibdev,
PAGE_SIZE;
- if (ib_copy_to_udata(udata, &uresp, sizeof uresp)) {
+ if (ib_copy_to_udata(udata, &uresp, sizeof(uresp))) {
kfree(nes_ucontext);
return ERR_PTR(-EFAULT);
}
@@ -1297,7 +1297,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
uresp.actual_rq_size = rq_size;
uresp.qp_id = nesqp->hwqp.qp_id;
uresp.nes_drv_opt = nes_drv_opt;
- if (ib_copy_to_udata(udata, &uresp, sizeof uresp)) {
+ if (ib_copy_to_udata(udata, &uresp, sizeof(uresp))) {
nes_free_resource(nesadapter, nesadapter->allocated_qps, qp_num);
nes_free_qp_mem(nesdev, nesqp,virt_wqs);
kfree(nesqp->allocated_buffer);
@@ -1680,7 +1680,7 @@ static struct ib_cq *nes_create_cq(struct ib_device *ibdev,
resp.cq_id = nescq->hw_cq.cq_number;
resp.cq_size = nescq->hw_cq.cq_size;
resp.mmap_db_index = 0;
- if (ib_copy_to_udata(udata, &resp, sizeof resp - sizeof resp.reserved)) {
+ if (ib_copy_to_udata(udata, &resp, sizeof(resp) - sizeof(resp.reserved))) {
nes_free_resource(nesadapter, nesadapter->allocated_cqs, cq_num);
kfree(nescq);
return ERR_PTR(-EFAULT);
@@ -3502,7 +3502,7 @@ static int nes_poll_cq(struct ib_cq *ibcq, int num_entries, struct ib_wc *entry)
if (u64temp) {
nesqp = (struct nes_qp *)(unsigned long)u64temp;
- memset(entry, 0, sizeof *entry);
+ memset(entry, 0, sizeof(*entry));
if (cqe.cqe_words[NES_CQE_ERROR_CODE_IDX] == 0) {
entry->status = IB_WC_SUCCESS;
} else {
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_stats.c b/drivers/infiniband/hw/ocrdma/ocrdma_stats.c
index 86c303a620c1..7bbbdec1f7f0 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_stats.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_stats.c
@@ -677,7 +677,7 @@ int ocrdma_pma_counters(struct ocrdma_dev *dev,
{
struct ib_pma_portcounters *pma_cnt;
- memset(out_mad->data, 0, sizeof out_mad->data);
+ memset(out_mad->data, 0, sizeof(out_mad->data));
pma_cnt = (void *)(out_mad->data + 40);
ocrdma_update_stats(dev);
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index d4c687b548d8..c28b66fd12db 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -106,7 +106,7 @@ int ocrdma_query_device(struct ib_device *ibdev, struct ib_device_attr *attr,
if (uhw->inlen || uhw->outlen)
return -EINVAL;
- memset(attr, 0, sizeof *attr);
+ memset(attr, 0, sizeof(*attr));
memcpy(&attr->fw_ver, &dev->attr.fw_ver[0],
min(sizeof(dev->attr.fw_ver), sizeof(attr->fw_ver)));
ocrdma_get_guid(dev, (u8 *)&attr->sys_image_guid);
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index 917e46ea3bf6..fa09406f0033 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -354,14 +354,14 @@ static int ipoib_cm_nonsrq_init_rx(struct net_device *dev, struct ib_cm_id *cm_i
int ret;
int i;
- rx->rx_ring = vzalloc(ipoib_recvq_size * sizeof *rx->rx_ring);
+ rx->rx_ring = vzalloc(ipoib_recvq_size * sizeof(*rx->rx_ring));
if (!rx->rx_ring) {
printk(KERN_WARNING "%s: failed to allocate CM non-SRQ ring (%d entries)\n",
priv->ca->name, ipoib_recvq_size);
return -ENOMEM;
}
- t = kmalloc(sizeof *t, GFP_KERNEL);
+ t = kmalloc(sizeof(*t), GFP_KERNEL);
if (!t) {
ret = -ENOMEM;
goto err_free;
@@ -428,7 +428,7 @@ static int ipoib_cm_send_rep(struct net_device *dev, struct ib_cm_id *cm_id,
data.mtu = cpu_to_be32(IPOIB_CM_BUF_SIZE);
rep.private_data = &data;
- rep.private_data_len = sizeof data;
+ rep.private_data_len = sizeof(data);
rep.flow_control = 0;
rep.rnr_retry_count = req->rnr_retry_count;
rep.srq = ipoib_cm_has_srq(dev);
@@ -446,7 +446,7 @@ static int ipoib_cm_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *even
int ret;
ipoib_dbg(priv, "REQ arrived\n");
- p = kzalloc(sizeof *p, GFP_KERNEL);
+ p = kzalloc(sizeof(*p), GFP_KERNEL);
if (!p)
return -ENOMEM;
p->dev = dev;
@@ -654,7 +654,7 @@ void ipoib_cm_handle_rx_wc(struct net_device *dev, struct ib_wc *wc)
}
ipoib_cm_dma_unmap_rx(priv, frags, rx_ring[wr_id].mapping);
- memcpy(rx_ring[wr_id].mapping, mapping, (frags + 1) * sizeof *mapping);
+ memcpy(rx_ring[wr_id].mapping, mapping, (frags + 1) * sizeof(*mapping));
ipoib_dbg_data(priv, "received %d bytes, SLID 0x%04x\n",
wc->byte_len, wc->slid);
@@ -1061,7 +1061,7 @@ static int ipoib_cm_send_req(struct net_device *dev,
req.qp_num = qp->qp_num;
req.qp_type = qp->qp_type;
req.private_data = &data;
- req.private_data_len = sizeof data;
+ req.private_data_len = sizeof(data);
req.flow_control = 0;
req.starting_psn = 0; /* FIXME */
@@ -1111,14 +1111,14 @@ static int ipoib_cm_tx_init(struct ipoib_cm_tx *p, u32 qpn,
struct ipoib_dev_priv *priv = netdev_priv(p->dev);
int ret;
- p->tx_ring = __vmalloc(ipoib_sendq_size * sizeof *p->tx_ring,
+ p->tx_ring = __vmalloc(ipoib_sendq_size * sizeof(*p->tx_ring),
GFP_NOIO, PAGE_KERNEL);
if (!p->tx_ring) {
ipoib_warn(priv, "failed to allocate tx ring\n");
ret = -ENOMEM;
goto err_tx;
}
- memset(p->tx_ring, 0, ipoib_sendq_size * sizeof *p->tx_ring);
+ memset(p->tx_ring, 0, ipoib_sendq_size * sizeof(*p->tx_ring));
p->qp = ipoib_cm_create_tx_qp(p->dev, p);
if (IS_ERR(p->qp)) {
@@ -1270,7 +1270,7 @@ struct ipoib_cm_tx *ipoib_cm_create_tx(struct net_device *dev, struct ipoib_path
struct ipoib_dev_priv *priv = netdev_priv(dev);
struct ipoib_cm_tx *tx;
- tx = kzalloc(sizeof *tx, GFP_ATOMIC);
+ tx = kzalloc(sizeof(*tx), GFP_ATOMIC);
if (!tx)
return NULL;
@@ -1320,7 +1320,7 @@ static void ipoib_cm_tx_start(struct work_struct *work)
list_del_init(&p->list);
neigh = p->neigh;
qpn = IPOIB_QPN(neigh->daddr);
- memcpy(&pathrec, &p->path->pathrec, sizeof pathrec);
+ memcpy(&pathrec, &p->path->pathrec, sizeof(pathrec));
spin_unlock_irqrestore(&priv->lock, flags);
netif_tx_unlock_bh(dev);
@@ -1508,7 +1508,7 @@ static void ipoib_cm_create_srq(struct net_device *dev, int max_sge)
return;
}
- priv->cm.srq_ring = vzalloc(ipoib_recvq_size * sizeof *priv->cm.srq_ring);
+ priv->cm.srq_ring = vzalloc(ipoib_recvq_size * sizeof(*priv->cm.srq_ring));
if (!priv->cm.srq_ring) {
printk(KERN_WARNING "%s: failed to allocate CM SRQ ring (%d entries)\n",
priv->ca->name, ipoib_recvq_size);
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_fs.c b/drivers/infiniband/ulp/ipoib/ipoib_fs.c
index 6bd5740e2691..c65de8155d8d 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_fs.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_fs.c
@@ -97,7 +97,7 @@ static void ipoib_mcg_seq_stop(struct seq_file *file, void *iter_ptr)
static int ipoib_mcg_seq_show(struct seq_file *file, void *iter_ptr)
{
struct ipoib_mcast_iter *iter = iter_ptr;
- char gid_buf[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"];
+ char gid_buf[sizeof("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")];
union ib_gid mgid;
unsigned long created;
unsigned int queuelen, complete, send_only;
@@ -196,7 +196,7 @@ static void ipoib_path_seq_stop(struct seq_file *file, void *iter_ptr)
static int ipoib_path_seq_show(struct seq_file *file, void *iter_ptr)
{
struct ipoib_path_iter *iter = iter_ptr;
- char gid_buf[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"];
+ char gid_buf[sizeof("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")];
struct ipoib_path path;
int rate;
@@ -262,15 +262,15 @@ static const struct file_operations ipoib_path_fops = {
void ipoib_create_debug_files(struct net_device *dev)
{
struct ipoib_dev_priv *priv = netdev_priv(dev);
- char name[IFNAMSIZ + sizeof "_path"];
+ char name[IFNAMSIZ + sizeof("_path")];
- snprintf(name, sizeof name, "%s_mcg", dev->name);
+ snprintf(name, sizeof(name), "%s_mcg", dev->name);
priv->mcg_dentry = debugfs_create_file(name, S_IFREG | S_IRUGO,
ipoib_root, dev, &ipoib_mcg_fops);
if (!priv->mcg_dentry)
ipoib_warn(priv, "failed to create mcg debug file\n");
- snprintf(name, sizeof name, "%s_path", dev->name);
+ snprintf(name, sizeof(name), "%s_path", dev->name);
priv->path_dentry = debugfs_create_file(name, S_IFREG | S_IRUGO,
ipoib_root, dev, &ipoib_path_fops);
if (!priv->path_dentry)
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
index 5ea0c14070d1..35f341ecdc07 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
@@ -59,7 +59,7 @@ struct ipoib_ah *ipoib_create_ah(struct net_device *dev,
struct ipoib_ah *ah;
struct ib_ah *vah;
- ah = kmalloc(sizeof *ah, GFP_KERNEL);
+ ah = kmalloc(sizeof(*ah), GFP_KERNEL);
if (!ah)
return ERR_PTR(-ENOMEM);
@@ -211,7 +211,7 @@ static void ipoib_ib_handle_rx_wc(struct net_device *dev, struct ib_wc *wc)
goto repost;
memcpy(mapping, priv->rx_ring[wr_id].mapping,
- IPOIB_UD_RX_SG * sizeof *mapping);
+ IPOIB_UD_RX_SG * sizeof(*mapping));
/*
* If we can't allocate a new RX buffer, dump
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 25509bbd4a05..443928f3cbee 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -559,7 +559,7 @@ struct ipoib_path_iter *ipoib_path_iter_init(struct net_device *dev)
{
struct ipoib_path_iter *iter;
- iter = kmalloc(sizeof *iter, GFP_KERNEL);
+ iter = kmalloc(sizeof(*iter), GFP_KERNEL);
if (!iter)
return NULL;
@@ -761,7 +761,7 @@ static struct ipoib_path *path_rec_create(struct net_device *dev, void *gid)
if (!priv->broadcast)
return NULL;
- path = kzalloc(sizeof *path, GFP_ATOMIC);
+ path = kzalloc(sizeof(*path), GFP_ATOMIC);
if (!path)
return NULL;
@@ -1050,7 +1050,7 @@ static int ipoib_hard_header(struct sk_buff *skb,
struct ipoib_header *header;
struct ipoib_cb *cb = ipoib_skb_cb(skb);
- header = (struct ipoib_header *) skb_push(skb, sizeof *header);
+ header = (struct ipoib_header *) skb_push(skb, sizeof(*header));
header->proto = htons(type);
header->reserved = 0;
@@ -1062,7 +1062,7 @@ static int ipoib_hard_header(struct sk_buff *skb,
*/
memcpy(cb->hwaddr, daddr, INFINIBAND_ALEN);
- return sizeof *header;
+ return sizeof(*header);
}
static void ipoib_set_mcast_list(struct net_device *dev)
@@ -1216,7 +1216,7 @@ static struct ipoib_neigh *ipoib_neigh_ctor(u8 *daddr,
{
struct ipoib_neigh *neigh;
- neigh = kzalloc(sizeof *neigh, GFP_ATOMIC);
+ neigh = kzalloc(sizeof(*neigh), GFP_ATOMIC);
if (!neigh)
return NULL;
@@ -1515,7 +1515,7 @@ int ipoib_dev_init(struct net_device *dev, struct ib_device *ca, int port)
struct ipoib_dev_priv *priv = netdev_priv(dev);
/* Allocate RX/TX "rings" to hold queued skbs */
- priv->rx_ring = kzalloc(ipoib_recvq_size * sizeof *priv->rx_ring,
+ priv->rx_ring = kzalloc(ipoib_recvq_size * sizeof(*priv->rx_ring),
GFP_KERNEL);
if (!priv->rx_ring) {
printk(KERN_WARNING "%s: failed to allocate RX ring (%d entries)\n",
@@ -1523,7 +1523,7 @@ int ipoib_dev_init(struct net_device *dev, struct ib_device *ca, int port)
goto out;
}
- priv->tx_ring = vzalloc(ipoib_sendq_size * sizeof *priv->tx_ring);
+ priv->tx_ring = vzalloc(ipoib_sendq_size * sizeof(*priv->tx_ring));
if (!priv->tx_ring) {
printk(KERN_WARNING "%s: failed to allocate TX ring (%d entries)\n",
ca->name, ipoib_sendq_size);
@@ -1903,7 +1903,7 @@ static void ipoib_add_one(struct ib_device *device)
int p;
int count = 0;
- dev_list = kmalloc(sizeof *dev_list, GFP_KERNEL);
+ dev_list = kmalloc(sizeof(*dev_list), GFP_KERNEL);
if (!dev_list)
return;
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
index 050dfa175d16..0b0d9aa28df2 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -137,7 +137,7 @@ static struct ipoib_mcast *ipoib_mcast_alloc(struct net_device *dev,
{
struct ipoib_mcast *mcast;
- mcast = kzalloc(sizeof *mcast, can_sleep ? GFP_KERNEL : GFP_ATOMIC);
+ mcast = kzalloc(sizeof(*mcast), can_sleep ? GFP_KERNEL : GFP_ATOMIC);
if (!mcast)
return NULL;
@@ -894,7 +894,7 @@ void ipoib_mcast_restart_task(struct work_struct *work)
if (!ipoib_mcast_addr_is_valid(ha->addr, dev->broadcast))
continue;
- memcpy(mgid.raw, ha->addr + 4, sizeof mgid);
+ memcpy(mgid.raw, ha->addr + 4, sizeof(mgid));
mcast = __ipoib_mcast_find(dev, &mgid);
if (!mcast || test_bit(IPOIB_MCAST_FLAG_SENDONLY, &mcast->flags)) {
@@ -983,7 +983,7 @@ struct ipoib_mcast_iter *ipoib_mcast_iter_init(struct net_device *dev)
{
struct ipoib_mcast_iter *iter;
- iter = kmalloc(sizeof *iter, GFP_KERNEL);
+ iter = kmalloc(sizeof(*iter), GFP_KERNEL);
if (!iter)
return NULL;
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_verbs.c b/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
index d48c5bae7877..a0ecc0d907a7 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
@@ -51,7 +51,7 @@ int ipoib_mcast_attach(struct net_device *dev, u16 mlid, union ib_gid *mgid, int
if (set_qkey) {
ret = -ENOMEM;
- qp_attr = kmalloc(sizeof *qp_attr, GFP_KERNEL);
+ qp_attr = kmalloc(sizeof(*qp_attr), GFP_KERNEL);
if (!qp_attr)
goto out;
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
index fca1a882de27..6df51bc0b9f2 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
@@ -129,7 +129,7 @@ int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey)
ppriv = netdev_priv(pdev);
- snprintf(intf_name, sizeof intf_name, "%s.%04x",
+ snprintf(intf_name, sizeof(intf_name), "%s.%04x",
ppriv->dev->name, pkey);
priv = ipoib_intf_alloc(intf_name);
if (!priv)
diff --git a/drivers/infiniband/ulp/iser/iser_verbs.c b/drivers/infiniband/ulp/iser/iser_verbs.c
index 40c0f4978e2f..2c8a65ed5b1d 100644
--- a/drivers/infiniband/ulp/iser/iser_verbs.c
+++ b/drivers/infiniband/ulp/iser/iser_verbs.c
@@ -439,7 +439,7 @@ static int iser_create_ib_conn_res(struct ib_conn *ib_conn)
device = ib_conn->device;
ib_dev = device->ib_device;
- memset(&init_attr, 0, sizeof init_attr);
+ memset(&init_attr, 0, sizeof(init_attr));
mutex_lock(&ig.connlist_mutex);
/* select the CQ with the minimal number of usages */
@@ -516,7 +516,7 @@ struct iser_device *iser_device_find_by_ib_device(struct rdma_cm_id *cma_id)
if (device->ib_device->node_guid == cma_id->device->node_guid)
goto inc_refcnt;
- device = kzalloc(sizeof *device, GFP_KERNEL);
+ device = kzalloc(sizeof(*device), GFP_KERNEL);
if (device == NULL)
goto out;
@@ -805,7 +805,7 @@ static void iser_route_handler(struct rdma_cm_id *cma_id)
if (ret)
goto failure;
- memset(&conn_param, 0, sizeof conn_param);
+ memset(&conn_param, 0, sizeof(conn_param));
conn_param.responder_resources = device->ib_device->attrs.max_qp_rd_atom;
conn_param.initiator_depth = 1;
conn_param.retry_count = 7;
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index 03022f6420d7..2057b1543764 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -203,8 +203,8 @@ static int srp_target_is_topspin(struct srp_target_port *target)
static const u8 cisco_oui[3] = { 0x00, 0x1b, 0x0d };
return topspin_workarounds &&
- (!memcmp(&target->ioc_guid, topspin_oui, sizeof topspin_oui) ||
- !memcmp(&target->ioc_guid, cisco_oui, sizeof cisco_oui));
+ (!memcmp(&target->ioc_guid, topspin_oui, sizeof(topspin_oui)) ||
+ !memcmp(&target->ioc_guid, cisco_oui, sizeof(cisco_oui)));
}
static struct srp_iu *srp_alloc_iu(struct srp_host *host, size_t size,
@@ -213,7 +213,7 @@ static struct srp_iu *srp_alloc_iu(struct srp_host *host, size_t size,
{
struct srp_iu *iu;
- iu = kmalloc(sizeof *iu, gfp_mask);
+ iu = kmalloc(sizeof(*iu), gfp_mask);
if (!iu)
goto out;
@@ -262,7 +262,7 @@ static int srp_init_qp(struct srp_target_port *target,
struct ib_qp_attr *attr;
int ret;
- attr = kmalloc(sizeof *attr, GFP_KERNEL);
+ attr = kmalloc(sizeof(*attr), GFP_KERNEL);
if (!attr)
return -ENOMEM;
@@ -504,7 +504,7 @@ static int srp_create_ch_ib(struct srp_rdma_ch *ch)
const int m = dev->use_fast_reg ? 3 : 1;
int ret;
- init_attr = kzalloc(sizeof *init_attr, GFP_KERNEL);
+ init_attr = kzalloc(sizeof(*init_attr), GFP_KERNEL);
if (!init_attr)
return -ENOMEM;
@@ -719,7 +719,7 @@ static int srp_send_req(struct srp_rdma_ch *ch, bool multich)
} *req = NULL;
int status;
- req = kzalloc(sizeof *req, GFP_KERNEL);
+ req = kzalloc(sizeof(*req), GFP_KERNEL);
if (!req)
return -ENOMEM;
@@ -729,7 +729,7 @@ static int srp_send_req(struct srp_rdma_ch *ch, bool multich)
req->param.qp_num = ch->qp->qp_num;
req->param.qp_type = ch->qp->qp_type;
req->param.private_data = &req->priv;
- req->param.private_data_len = sizeof req->priv;
+ req->param.private_data_len = sizeof(req->priv);
req->param.flow_control = 1;
get_random_bytes(&req->param.starting_psn, 4);
@@ -2084,7 +2084,7 @@ static int srp_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *scmnd)
scmnd->host_scribble = (void *) req;
cmd = iu->buf;
- memset(cmd, 0, sizeof *cmd);
+ memset(cmd, 0, sizeof(*cmd));
cmd->opcode = SRP_CMD;
int_to_scsilun(scmnd->device->lun, &cmd->lun);
@@ -2267,7 +2267,7 @@ static void srp_cm_rep_handler(struct ib_cm_id *cm_id,
}
ret = -ENOMEM;
- qp_attr = kmalloc(sizeof *qp_attr, GFP_KERNEL);
+ qp_attr = kmalloc(sizeof(*qp_attr), GFP_KERNEL);
if (!qp_attr)
goto error;
@@ -2496,10 +2496,10 @@ static int srp_send_tsk_mgmt(struct srp_rdma_ch *ch, u64 req_tag, u64 lun,
return -1;
}
- ib_dma_sync_single_for_cpu(dev, iu->dma, sizeof *tsk_mgmt,
+ ib_dma_sync_single_for_cpu(dev, iu->dma, sizeof(*tsk_mgmt),
DMA_TO_DEVICE);
tsk_mgmt = iu->buf;
- memset(tsk_mgmt, 0, sizeof *tsk_mgmt);
+ memset(tsk_mgmt, 0, sizeof(*tsk_mgmt));
tsk_mgmt->opcode = SRP_TSK_MGMT;
int_to_scsilun(lun, &tsk_mgmt->lun);
@@ -2507,7 +2507,7 @@ static int srp_send_tsk_mgmt(struct srp_rdma_ch *ch, u64 req_tag, u64 lun,
tsk_mgmt->tsk_mgmt_func = func;
tsk_mgmt->task_tag = req_tag;
- ib_dma_sync_single_for_device(dev, iu->dma, sizeof *tsk_mgmt,
+ ib_dma_sync_single_for_device(dev, iu->dma, sizeof(*tsk_mgmt),
DMA_TO_DEVICE);
if (srp_post_send(ch, iu, sizeof(*tsk_mgmt))) {
srp_put_tx_iu(ch, iu, SRP_IU_TSK_MGMT);
@@ -3204,7 +3204,7 @@ static ssize_t srp_create_target(struct device *dev,
target_host->max_channel = 0;
target_host->max_id = 1;
target_host->max_lun = -1LL;
- target_host->max_cmd_len = sizeof ((struct srp_cmd *) (void *) 0L)->cdb;
+ target_host->max_cmd_len = sizeof(((struct srp_cmd *)(void *)0L)->cdb);
target = host_to_target(target_host);
@@ -3400,7 +3400,7 @@ static struct srp_host *srp_add_port(struct srp_device *device, u8 port)
{
struct srp_host *host;
- host = kzalloc(sizeof *host, GFP_KERNEL);
+ host = kzalloc(sizeof(*host), GFP_KERNEL);
if (!host)
return NULL;
@@ -3442,7 +3442,7 @@ static void srp_add_one(struct ib_device *device)
int mr_page_shift, p;
u64 max_pages_per_mr;
- srp_dev = kmalloc(sizeof *srp_dev, GFP_KERNEL);
+ srp_dev = kmalloc(sizeof(*srp_dev), GFP_KERNEL);
if (!srp_dev)
return;
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index 0c37fee363b1..f65ae6029612 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -281,7 +281,7 @@ static void srpt_get_class_port_info(struct ib_dm_mad *mad)
struct ib_class_port_info *cif;
cif = (struct ib_class_port_info *)mad->data;
- memset(cif, 0, sizeof *cif);
+ memset(cif, 0, sizeof(*cif));
cif->base_version = 1;
cif->class_version = 1;
cif->resp_time_value = 20;
@@ -340,7 +340,7 @@ static void srpt_get_ioc(struct srpt_port *sport, u32 slot,
return;
}
- memset(iocp, 0, sizeof *iocp);
+ memset(iocp, 0, sizeof(*iocp));
strcpy(iocp->id_string, SRPT_ID_STRING);
iocp->guid = cpu_to_be64(srpt_service_guid);
iocp->vendor_id = cpu_to_be32(sdev->device->attrs.vendor_id);
@@ -390,7 +390,7 @@ static void srpt_get_svc_entries(u64 ioc_guid,
}
svc_entries = (struct ib_dm_svc_entries *)mad->data;
- memset(svc_entries, 0, sizeof *svc_entries);
+ memset(svc_entries, 0, sizeof(*svc_entries));
svc_entries->service_entries[0].id = cpu_to_be64(ioc_guid);
snprintf(svc_entries->service_entries[0].name,
sizeof(svc_entries->service_entries[0].name),
@@ -484,7 +484,7 @@ static void srpt_mad_recv_handler(struct ib_mad_agent *mad_agent,
rsp->ah = ah;
dm_mad = rsp->mad;
- memcpy(dm_mad, mad_wc->recv_buf.mad, sizeof *dm_mad);
+ memcpy(dm_mad, mad_wc->recv_buf.mad, sizeof(*dm_mad));
dm_mad->mad_hdr.method = IB_MGMT_METHOD_GET_RESP;
dm_mad->mad_hdr.status = 0;
@@ -532,7 +532,7 @@ static int srpt_refresh_port(struct srpt_port *sport)
struct ib_port_attr port_attr;
int ret;
- memset(&port_modify, 0, sizeof port_modify);
+ memset(&port_modify, 0, sizeof(port_modify));
port_modify.set_port_cap_mask = IB_PORT_DEVICE_MGMT_SUP;
port_modify.clr_port_cap_mask = 0;
@@ -553,7 +553,7 @@ static int srpt_refresh_port(struct srpt_port *sport)
goto err_query_port;
if (!sport->mad_agent) {
- memset(®_req, 0, sizeof reg_req);
+ memset(®_req, 0, sizeof(reg_req));
reg_req.mgmt_class = IB_MGMT_CLASS_DEVICE_MGMT;
reg_req.mgmt_class_version = IB_MGMT_BASE_VERSION;
set_bit(IB_MGMT_METHOD_GET, reg_req.method_mask);
@@ -903,14 +903,14 @@ static int srpt_get_desc_tbl(struct srpt_send_ioctx *ioctx,
db = (struct srp_direct_buf *)(srp_cmd->add_data
+ add_cdb_offset);
- memcpy(ioctx->rbufs, db, sizeof *db);
+ memcpy(ioctx->rbufs, db, sizeof(*db));
*data_len = be32_to_cpu(db->len);
} else if (((srp_cmd->buf_fmt & 0xf) == SRP_DATA_DESC_INDIRECT) ||
((srp_cmd->buf_fmt >> 4) == SRP_DATA_DESC_INDIRECT)) {
idb = (struct srp_indirect_buf *)(srp_cmd->add_data
+ add_cdb_offset);
- ioctx->n_rbuf = be32_to_cpu(idb->table_desc.len) / sizeof *db;
+ ioctx->n_rbuf = be32_to_cpu(idb->table_desc.len) / sizeof(*db);
if (ioctx->n_rbuf >
(srp_cmd->data_out_desc_cnt + srp_cmd->data_in_desc_cnt)) {
@@ -929,7 +929,7 @@ static int srpt_get_desc_tbl(struct srpt_send_ioctx *ioctx,
ioctx->rbufs = &ioctx->single_rbuf;
else {
ioctx->rbufs =
- kmalloc(ioctx->n_rbuf * sizeof *db, GFP_ATOMIC);
+ kmalloc(ioctx->n_rbuf * sizeof(*db), GFP_ATOMIC);
if (!ioctx->rbufs) {
ioctx->n_rbuf = 0;
ret = -ENOMEM;
@@ -938,7 +938,7 @@ static int srpt_get_desc_tbl(struct srpt_send_ioctx *ioctx,
}
db = idb->desc_list;
- memcpy(ioctx->rbufs, db, ioctx->n_rbuf * sizeof *db);
+ memcpy(ioctx->rbufs, db, ioctx->n_rbuf * sizeof(*db));
*data_len = be32_to_cpu(idb->len);
}
out:
@@ -956,7 +956,7 @@ static int srpt_init_ch_qp(struct srpt_rdma_ch *ch, struct ib_qp *qp)
struct ib_qp_attr *attr;
int ret;
- attr = kzalloc(sizeof *attr, GFP_KERNEL);
+ attr = kzalloc(sizeof(*attr), GFP_KERNEL);
if (!attr)
return -ENOMEM;
@@ -1464,7 +1464,7 @@ static int srpt_build_cmd_rsp(struct srpt_rdma_ch *ch,
sense_data_len = ioctx->cmd.scsi_sense_length;
WARN_ON(sense_data_len > sizeof(ioctx->sense_data));
- memset(srp_rsp, 0, sizeof *srp_rsp);
+ memset(srp_rsp, 0, sizeof(*srp_rsp));
srp_rsp->opcode = SRP_RSP;
srp_rsp->req_lim_delta =
cpu_to_be32(1 + atomic_xchg(&ch->req_lim_delta, 0));
@@ -1514,7 +1514,7 @@ static int srpt_build_tskmgmt_rsp(struct srpt_rdma_ch *ch,
srp_rsp = ioctx->ioctx.buf;
BUG_ON(!srp_rsp);
- memset(srp_rsp, 0, sizeof *srp_rsp);
+ memset(srp_rsp, 0, sizeof(*srp_rsp));
srp_rsp->opcode = SRP_RSP;
srp_rsp->req_lim_delta =
@@ -1950,7 +1950,7 @@ static int srpt_create_ch_ib(struct srpt_rdma_ch *ch)
WARN_ON(ch->rq_size < 1);
ret = -ENOMEM;
- qp_init = kzalloc(sizeof *qp_init, GFP_KERNEL);
+ qp_init = kzalloc(sizeof(*qp_init), GFP_KERNEL);
if (!qp_init)
goto out;
@@ -2266,9 +2266,9 @@ static int srpt_cm_req_recv(struct ib_cm_id *cm_id,
be64_to_cpu(*(__be64 *)&sdev->port[param->port - 1].gid.raw[0]),
be64_to_cpu(*(__be64 *)&sdev->port[param->port - 1].gid.raw[8]));
- rsp = kzalloc(sizeof *rsp, GFP_KERNEL);
- rej = kzalloc(sizeof *rej, GFP_KERNEL);
- rep_param = kzalloc(sizeof *rep_param, GFP_KERNEL);
+ rsp = kzalloc(sizeof(*rsp), GFP_KERNEL);
+ rej = kzalloc(sizeof(*rej), GFP_KERNEL);
+ rep_param = kzalloc(sizeof(*rep_param), GFP_KERNEL);
if (!rsp || !rej || !rep_param) {
ret = -ENOMEM;
@@ -2340,7 +2340,7 @@ static int srpt_cm_req_recv(struct ib_cm_id *cm_id,
goto reject;
}
- ch = kzalloc(sizeof *ch, GFP_KERNEL);
+ ch = kzalloc(sizeof(*ch), GFP_KERNEL);
if (!ch) {
rej->reason = cpu_to_be32(
SRP_LOGIN_REJ_INSUFFICIENT_RESOURCES);
@@ -2453,7 +2453,7 @@ static int srpt_cm_req_recv(struct ib_cm_id *cm_id,
/* create cm reply */
rep_param->qp_num = ch->qp->qp_num;
rep_param->private_data = (void *)rsp;
- rep_param->private_data_len = sizeof *rsp;
+ rep_param->private_data_len = sizeof(*rsp);
rep_param->rnr_retry_count = 7;
rep_param->flow_control = 1;
rep_param->failover_accepted = 0;
@@ -2497,7 +2497,7 @@ static int srpt_cm_req_recv(struct ib_cm_id *cm_id,
| SRP_BUF_FORMAT_INDIRECT);
ib_send_cm_rej(cm_id, IB_CM_REJ_CONSUMER_DEFINED, NULL, 0,
- (void *)rej, sizeof *rej);
+ (void *)rej, sizeof(*rej));
out:
kfree(rep_param);
@@ -3003,7 +3003,7 @@ static void srpt_add_one(struct ib_device *device)
pr_debug("device = %p, device->dma_ops = %p\n", device,
device->dma_ops);
- sdev = kzalloc(sizeof *sdev, GFP_KERNEL);
+ sdev = kzalloc(sizeof(*sdev), GFP_KERNEL);
if (!sdev)
goto err;
diff --git a/drivers/input/keyboard/lm8323.c b/drivers/input/keyboard/lm8323.c
index 21bea52d4365..bb1f3ed5134d 100644
--- a/drivers/input/keyboard/lm8323.c
+++ b/drivers/input/keyboard/lm8323.c
@@ -655,7 +655,7 @@ static int lm8323_probe(struct i2c_client *client,
return -EINVAL;
}
- lm = kzalloc(sizeof *lm, GFP_KERNEL);
+ lm = kzalloc(sizeof(*lm), GFP_KERNEL);
idev = input_allocate_device();
if (!lm || !idev) {
err = -ENOMEM;
diff --git a/drivers/input/misc/dm355evm_keys.c b/drivers/input/misc/dm355evm_keys.c
index b6b7bd4e5462..a890dd6a8626 100644
--- a/drivers/input/misc/dm355evm_keys.c
+++ b/drivers/input/misc/dm355evm_keys.c
@@ -179,7 +179,7 @@ static int dm355evm_keys_probe(struct platform_device *pdev)
int status;
/* allocate instance struct and input dev */
- keys = kzalloc(sizeof *keys, GFP_KERNEL);
+ keys = kzalloc(sizeof(*keys), GFP_KERNEL);
input = input_allocate_device();
if (!keys || !input) {
status = -ENOMEM;
diff --git a/drivers/input/touchscreen/ad7877.c b/drivers/input/touchscreen/ad7877.c
index 9c250ae780d9..7e6e7760723e 100644
--- a/drivers/input/touchscreen/ad7877.c
+++ b/drivers/input/touchscreen/ad7877.c
@@ -215,7 +215,7 @@ static int ad7877_read(struct spi_device *spi, u16 reg)
struct ser_req *req;
int status, ret;
- req = kzalloc(sizeof *req, GFP_KERNEL);
+ req = kzalloc(sizeof(*req), GFP_KERNEL);
if (!req)
return -ENOMEM;
@@ -246,7 +246,7 @@ static int ad7877_write(struct spi_device *spi, u16 reg, u16 val)
struct ser_req *req;
int status;
- req = kzalloc(sizeof *req, GFP_KERNEL);
+ req = kzalloc(sizeof(*req), GFP_KERNEL);
if (!req)
return -ENOMEM;
@@ -273,7 +273,7 @@ static int ad7877_read_adc(struct spi_device *spi, unsigned command)
int sample;
int i;
- req = kzalloc(sizeof *req, GFP_KERNEL);
+ req = kzalloc(sizeof(*req), GFP_KERNEL);
if (!req)
return -ENOMEM;
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index a61b2153ab8c..33fa0c7c21db 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -316,7 +316,7 @@ static int ads7846_read12_ser(struct device *dev, unsigned command)
struct ser_req *req;
int status;
- req = kzalloc(sizeof *req, GFP_KERNEL);
+ req = kzalloc(sizeof(*req), GFP_KERNEL);
if (!req)
return -ENOMEM;
@@ -390,7 +390,7 @@ static int ads7845_read12_ser(struct device *dev, unsigned command)
struct ads7845_ser_req *req;
int status;
- req = kzalloc(sizeof *req, GFP_KERNEL);
+ req = kzalloc(sizeof(*req), GFP_KERNEL);
if (!req)
return -ENOMEM;
diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
index aecec6d32463..b9f4120f84aa 100644
--- a/drivers/isdn/gigaset/bas-gigaset.c
+++ b/drivers/isdn/gigaset/bas-gigaset.c
@@ -2200,7 +2200,7 @@ static int gigaset_initcshw(struct cardstate *cs)
{
struct bas_cardstate *ucs;
- cs->hw.bas = ucs = kmalloc(sizeof *ucs, GFP_KERNEL);
+ cs->hw.bas = ucs = kmalloc(sizeof(*ucs), GFP_KERNEL);
if (!ucs) {
pr_err("out of memory\n");
return -ENOMEM;
diff --git a/drivers/isdn/gigaset/capi.c b/drivers/isdn/gigaset/capi.c
index ccec7778cad2..bf9678697cbd 100644
--- a/drivers/isdn/gigaset/capi.c
+++ b/drivers/isdn/gigaset/capi.c
@@ -1370,7 +1370,7 @@ static void do_connect_req(struct gigaset_capi_ctr *iif,
cmsg->adr.adrPLCI |= (bcs->channel + 1) << 8;
/* build command table */
- commands = kzalloc(AT_NUM * (sizeof *commands), GFP_KERNEL);
+ commands = kzalloc(AT_NUM * (sizeof(*commands)), GFP_KERNEL);
if (!commands)
goto oom;
diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c
index 7c7814497e3e..c3b25307fec9 100644
--- a/drivers/isdn/gigaset/common.c
+++ b/drivers/isdn/gigaset/common.c
@@ -53,7 +53,7 @@ void gigaset_dbg_buffer(enum debuglevel level, const unsigned char *msg,
{
unsigned char outbuf[80];
unsigned char c;
- size_t space = sizeof outbuf - 1;
+ size_t space = sizeof(outbuf) - 1;
unsigned char *out = outbuf;
size_t numin = len;
@@ -1077,7 +1077,7 @@ struct gigaset_driver *gigaset_initdriver(unsigned minor, unsigned minors,
unsigned long flags;
unsigned i;
- drv = kmalloc(sizeof *drv, GFP_KERNEL);
+ drv = kmalloc(sizeof(*drv), GFP_KERNEL);
if (!drv)
return NULL;
@@ -1090,7 +1090,7 @@ struct gigaset_driver *gigaset_initdriver(unsigned minor, unsigned minors,
drv->owner = owner;
INIT_LIST_HEAD(&drv->list);
- drv->cs = kmalloc(minors * sizeof *drv->cs, GFP_KERNEL);
+ drv->cs = kmalloc(minors * sizeof(*drv->cs), GFP_KERNEL);
if (!drv->cs)
goto error;
diff --git a/drivers/isdn/gigaset/ev-layer.c b/drivers/isdn/gigaset/ev-layer.c
index 1cfcea62aed9..c6a59ff091b4 100644
--- a/drivers/isdn/gigaset/ev-layer.c
+++ b/drivers/isdn/gigaset/ev-layer.c
@@ -1472,7 +1472,7 @@ static void do_action(int action, struct cardstate *cs,
else if (cs->gotfwver != 1) {
cs->cmd_result = -ENOENT;
} else {
- memcpy(ev->arg, cs->fwver, sizeof cs->fwver);
+ memcpy(ev->arg, cs->fwver, sizeof(cs->fwver));
cs->cmd_result = 0;
}
cs->waiting = 0;
diff --git a/drivers/isdn/gigaset/i4l.c b/drivers/isdn/gigaset/i4l.c
index 2d75329007f1..c51642cd4460 100644
--- a/drivers/isdn/gigaset/i4l.c
+++ b/drivers/isdn/gigaset/i4l.c
@@ -243,7 +243,7 @@ static int command_from_LL(isdn_ctrl *cntrl)
dev_kfree_skb(bcs->rx_skb);
gigaset_new_rx_skb(bcs);
- commands = kzalloc(AT_NUM * (sizeof *commands), GFP_ATOMIC);
+ commands = kzalloc(AT_NUM * (sizeof(*commands)), GFP_ATOMIC);
if (!commands) {
gigaset_free_channel(bcs);
dev_err(cs->dev, "ISDN_CMD_DIAL: out of memory\n");
@@ -487,12 +487,12 @@ int gigaset_isdn_icall(struct at_state_t *at_state)
}
if (at_state->str_var[STR_NMBR]) {
strlcpy(response.parm.setup.phone, at_state->str_var[STR_NMBR],
- sizeof response.parm.setup.phone);
+ sizeof(response.parm.setup.phone));
} else
response.parm.setup.phone[0] = 0;
if (at_state->str_var[STR_ZCPN]) {
strlcpy(response.parm.setup.eazmsn, at_state->str_var[STR_ZCPN],
- sizeof response.parm.setup.eazmsn);
+ sizeof(response.parm.setup.eazmsn));
} else
response.parm.setup.eazmsn[0] = 0;
@@ -624,14 +624,14 @@ int gigaset_isdn_regdev(struct cardstate *cs, const char *isdnid)
{
isdn_if *iif;
- iif = kmalloc(sizeof *iif, GFP_KERNEL);
+ iif = kmalloc(sizeof(*iif), GFP_KERNEL);
if (!iif) {
pr_err("out of memory\n");
return -ENOMEM;
}
- if (snprintf(iif->id, sizeof iif->id, "%s_%u", isdnid, cs->minor_index)
- >= sizeof iif->id) {
+ if (snprintf(iif->id, sizeof(iif->id), "%s_%u", isdnid, cs->minor_index)
+ >= sizeof(iif->id)) {
pr_err("ID too long: %s\n", isdnid);
kfree(iif);
return -EINVAL;
diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
index 600c79b030cd..0b10a0d0e30a 100644
--- a/drivers/isdn/gigaset/interface.c
+++ b/drivers/isdn/gigaset/interface.c
@@ -67,10 +67,10 @@ static int if_version(struct cardstate *cs, unsigned arg[4])
switch (cmd) {
case GIGVER_DRIVER:
- memcpy(arg, version, sizeof version);
+ memcpy(arg, version, sizeof(version));
return 0;
case GIGVER_COMPAT:
- memcpy(arg, compat, sizeof compat);
+ memcpy(arg, compat, sizeof(compat));
return 0;
case GIGVER_FWBASE:
cs->waiting = 1;
@@ -212,13 +212,13 @@ static int if_ioctl(struct tty_struct *tty,
break;
case GIGASET_VERSION:
retval = copy_from_user(version,
- (unsigned __user *) arg, sizeof version)
+ (unsigned __user *) arg, sizeof(version))
? -EFAULT : 0;
if (retval >= 0)
retval = if_version(cs, version);
if (retval >= 0)
retval = copy_to_user((unsigned __user *) arg,
- version, sizeof version)
+ version, sizeof(version))
? -EFAULT : 0;
break;
default:
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
index 2175225af742..7678e414a08e 100644
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.c
@@ -3427,7 +3427,7 @@ isdn_tty_parse_at(modem_info *info)
isdn_tty_modem_result(RESULT_NO_CARRIER, info);
return;
}
- isdn_tty_getdial(++p, ds, sizeof ds);
+ isdn_tty_getdial(++p, ds, sizeof(ds));
p += strlen(p);
if (!strlen(m->msn))
isdn_tty_modem_result(RESULT_NO_MSN_EAZ, info);
diff --git a/drivers/md/dm-bufio.c b/drivers/md/dm-bufio.c
index cd77216beff1..f3467958f282 100644
--- a/drivers/md/dm-bufio.c
+++ b/drivers/md/dm-bufio.c
@@ -1852,8 +1852,8 @@ static int __init dm_bufio_init(void)
dm_bufio_allocated_vmalloc = 0;
dm_bufio_current_allocated = 0;
- memset(&dm_bufio_caches, 0, sizeof dm_bufio_caches);
- memset(&dm_bufio_cache_names, 0, sizeof dm_bufio_cache_names);
+ memset(&dm_bufio_caches, 0, sizeof(dm_bufio_caches));
+ memset(&dm_bufio_cache_names, 0, sizeof(dm_bufio_cache_names));
mem = (__u64)((totalram_pages - totalhigh_pages) *
DM_BUFIO_MEMORY_PERCENT / 100) << PAGE_SHIFT;
diff --git a/drivers/md/dm-kcopyd.c b/drivers/md/dm-kcopyd.c
index 1452ed9aacb4..93d49354ce72 100644
--- a/drivers/md/dm-kcopyd.c
+++ b/drivers/md/dm-kcopyd.c
@@ -727,7 +727,7 @@ int dm_kcopyd_copy(struct dm_kcopyd_client *kc, struct dm_io_region *from,
job->pages = NULL;
job->rw = READ;
} else {
- memset(&job->source, 0, sizeof job->source);
+ memset(&job->source, 0, sizeof(job->source));
job->source.count = job->dests[0].count;
job->pages = &zero_page_list;
diff --git a/drivers/media/dvb-core/dvb_net.c b/drivers/media/dvb-core/dvb_net.c
index ce6a711b42d4..8f535e7ee2a1 100644
--- a/drivers/media/dvb-core/dvb_net.c
+++ b/drivers/media/dvb-core/dvb_net.c
@@ -577,8 +577,8 @@ static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len )
__be16 utype = htons(priv->ule_sndu_type);
const u8 *tail;
struct kvec iov[3] = {
- { &ulen, sizeof ulen },
- { &utype, sizeof utype },
+ { &ulen, sizeof(ulen) },
+ { &utype, sizeof(utype) },
{ priv->ule_skb->data, priv->ule_skb->len - 4 }
};
u32 ule_crc = ~0L, expected_crc;
diff --git a/drivers/media/i2c/tvp5150.c b/drivers/media/i2c/tvp5150.c
index 6c3769d44b75..799bf8545e13 100644
--- a/drivers/media/i2c/tvp5150.c
+++ b/drivers/media/i2c/tvp5150.c
@@ -593,7 +593,7 @@ static int tvp5150_g_sliced_vbi_cap(struct v4l2_subdev *sd,
int line;
v4l2_dbg(1, debug, sd, "g_sliced_vbi_cap\n");
- memset(cap, 0, sizeof *cap);
+ memset(cap, 0, sizeof(*cap));
while (regs->reg != (u16)-1 ) {
for (line=regs->type.ini_line;line<=regs->type.end_line;line++) {
diff --git a/drivers/media/pci/ngene/ngene-dvb.c b/drivers/media/pci/ngene/ngene-dvb.c
index 59bb2858c8d0..7ce12f15bd55 100644
--- a/drivers/media/pci/ngene/ngene-dvb.c
+++ b/drivers/media/pci/ngene/ngene-dvb.c
@@ -138,7 +138,7 @@ void *tsin_exchange(void *priv, void *buf, u32 len, u32 clock, u32 flags)
if (dev->ci.en && chan->number == 2) {
while (len >= 188) {
- if (memcmp(buf, fill_ts, sizeof fill_ts) != 0) {
+ if (memcmp(buf, fill_ts, sizeof(fill_ts)) != 0) {
if (dvb_ringbuffer_free(&dev->tsin_rbuf) >= 188) {
dvb_ringbuffer_write(&dev->tsin_rbuf, buf, 188);
wake_up(&dev->tsin_rbuf.queue);
diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c
index a63c1366a64e..063e348187f5 100644
--- a/drivers/media/pci/saa7134/saa7134-video.c
+++ b/drivers/media/pci/saa7134/saa7134-video.c
@@ -673,8 +673,8 @@ static int setup_clipping(struct saa7134_dev *dev, struct v4l2_clip *clips,
row[rows].disable = (1 << i);
rows++;
}
- sort(col, cols, sizeof col[0], cliplist_cmp, NULL);
- sort(row, rows, sizeof row[0], cliplist_cmp, NULL);
+ sort(col, cols, sizeof(col[0]), cliplist_cmp, NULL);
+ sort(row, rows, sizeof(row[0]), cliplist_cmp, NULL);
set_cliplist(dev,0x380,col,cols,"cols");
set_cliplist(dev,0x384,row,rows,"rows");
return 0;
diff --git a/drivers/media/pci/ttpci/av7110_ir.c b/drivers/media/pci/ttpci/av7110_ir.c
index 0e763a784e2b..842d2a92bf30 100644
--- a/drivers/media/pci/ttpci/av7110_ir.c
+++ b/drivers/media/pci/ttpci/av7110_ir.c
@@ -273,7 +273,7 @@ static ssize_t av7110_ir_proc_write(struct file *file, const char __user *buffer
{
char *page;
u32 ir_config;
- int size = sizeof ir_config + sizeof av_list[0]->ir.key_map;
+ int size = sizeof(ir_config) + sizeof(av_list[0]->ir.key_map);
int i;
if (count < size)
@@ -288,11 +288,11 @@ static ssize_t av7110_ir_proc_write(struct file *file, const char __user *buffer
return -EFAULT;
}
- memcpy(&ir_config, page, sizeof ir_config);
+ memcpy(&ir_config, page, sizeof(ir_config));
for (i = 0; i < av_cnt; i++) {
/* keymap */
- memcpy(av_list[i]->ir.key_map, page + sizeof ir_config,
+ memcpy(av_list[i]->ir.key_map, page + sizeof(ir_config),
sizeof(av_list[i]->ir.key_map));
/* protocol, inversion, address */
ir_protocol[i] = ir_config & 0x0001;
@@ -362,7 +362,7 @@ int av7110_ir_init(struct av7110 *av7110)
}
input_dev->dev.parent = &av7110->dev->pci->dev;
/* initial keymap */
- memcpy(av7110->ir.key_map, default_key_map, sizeof av7110->ir.key_map);
+ memcpy(av7110->ir.key_map, default_key_map, sizeof(av7110->ir.key_map));
input_register_keys(&av7110->ir);
err = input_register_device(input_dev);
if (err) {
diff --git a/drivers/media/pci/ttpci/av7110_v4l.c b/drivers/media/pci/ttpci/av7110_v4l.c
index 479aff02db81..cd1ff925518f 100644
--- a/drivers/media/pci/ttpci/av7110_v4l.c
+++ b/drivers/media/pci/ttpci/av7110_v4l.c
@@ -562,7 +562,7 @@ static int vidioc_g_fmt_sliced_vbi_out(struct file *file, void *fh,
dprintk(2, "VIDIOC_G_FMT:\n");
if (FW_VERSION(av7110->arm_app) < 0x2623)
return -EINVAL;
- memset(&f->fmt.sliced, 0, sizeof f->fmt.sliced);
+ memset(&f->fmt.sliced, 0, sizeof(f->fmt.sliced));
if (av7110->wssMode) {
f->fmt.sliced.service_set = V4L2_SLICED_WSS_625;
f->fmt.sliced.service_lines[0][23] = V4L2_SLICED_WSS_625;
@@ -624,7 +624,7 @@ static ssize_t av7110_vbi_write(struct file *file, const char __user *data, size
int rc;
dprintk(2, "%s\n", __func__);
- if (FW_VERSION(av7110->arm_app) < 0x2623 || !av7110->wssMode || count != sizeof d)
+ if (FW_VERSION(av7110->arm_app) < 0x2623 || !av7110->wssMode || count != sizeof(d))
return -EINVAL;
if (copy_from_user(&d, data, count))
return -EFAULT;
diff --git a/drivers/media/platform/m2m-deinterlace.c b/drivers/media/platform/m2m-deinterlace.c
index 7383818c2be6..c5ed8938b8e3 100644
--- a/drivers/media/platform/m2m-deinterlace.c
+++ b/drivers/media/platform/m2m-deinterlace.c
@@ -908,7 +908,7 @@ static int deinterlace_open(struct file *file)
struct deinterlace_dev *pcdev = video_drvdata(file);
struct deinterlace_ctx *ctx = NULL;
- ctx = kzalloc(sizeof *ctx, GFP_KERNEL);
+ ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
if (!ctx)
return -ENOMEM;
diff --git a/drivers/media/platform/mx2_emmaprp.c b/drivers/media/platform/mx2_emmaprp.c
index 3c4012d42d69..43661330afb9 100644
--- a/drivers/media/platform/mx2_emmaprp.c
+++ b/drivers/media/platform/mx2_emmaprp.c
@@ -789,7 +789,7 @@ static int emmaprp_open(struct file *file)
struct emmaprp_dev *pcdev = video_drvdata(file);
struct emmaprp_ctx *ctx;
- ctx = kzalloc(sizeof *ctx, GFP_KERNEL);
+ ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
if (!ctx)
return -ENOMEM;
diff --git a/drivers/media/rc/ir-rc6-decoder.c b/drivers/media/rc/ir-rc6-decoder.c
index e0e2edefa651..15b806f43f97 100644
--- a/drivers/media/rc/ir-rc6-decoder.c
+++ b/drivers/media/rc/ir-rc6-decoder.c
@@ -195,7 +195,7 @@ static int ir_rc6_decode(struct rc_dev *dev, struct ir_raw_event ev)
case STATE_BODY_BIT_START:
if (eq_margin(ev.duration, RC6_BIT_START, RC6_UNIT / 2)) {
/* Discard LSB's that won't fit in data->body */
- if (data->count++ < CHAR_BIT * sizeof data->body) {
+ if (data->count++ < CHAR_BIT * sizeof(data->body)) {
data->body <<= 1;
if (ev.pulse)
data->body |= 1;
@@ -235,7 +235,7 @@ static int ir_rc6_decode(struct rc_dev *dev, struct ir_raw_event ev)
break;
case RC6_MODE_6A:
- if (data->count > CHAR_BIT * sizeof data->body) {
+ if (data->count > CHAR_BIT * sizeof(data->body)) {
IR_dprintk(1, "RC6 too many (%u) data bits\n",
data->count);
goto out;
diff --git a/drivers/media/usb/gspca/etoms.c b/drivers/media/usb/gspca/etoms.c
index 26c9ee1f1045..8e7b06093f62 100644
--- a/drivers/media/usb/gspca/etoms.c
+++ b/drivers/media/usb/gspca/etoms.c
@@ -418,7 +418,7 @@ static void setcolors(struct gspca_dev *gspca_dev, s32 val)
/* I2cc[1] = I2cc[2] = green; */
if (sd->sensor == SENSOR_PAS106) {
i2c_w(gspca_dev, PAS106_REG13, &i2cflags, 1, 3);
- i2c_w(gspca_dev, PAS106_REG9, I2cc, sizeof I2cc, 1);
+ i2c_w(gspca_dev, PAS106_REG9, I2cc, sizeof(I2cc), 1);
}
/* PDEBUG(D_CONF , "Etoms red %d blue %d green %d",
I2cc[3], I2cc[0], green); */
@@ -511,22 +511,22 @@ static void Et_init1(struct gspca_dev *gspca_dev)
/* set the sensor */
if (gspca_dev->cam.cam_mode[(int) gspca_dev->curr_mode].priv) {
I2c0[0] = 0x06;
- i2c_w(gspca_dev, PAS106_REG2, I2c0, sizeof I2c0, 1);
- i2c_w(gspca_dev, PAS106_REG9, I2c2, sizeof I2c2, 1);
+ i2c_w(gspca_dev, PAS106_REG2, I2c0, sizeof(I2c0), 1);
+ i2c_w(gspca_dev, PAS106_REG9, I2c2, sizeof(I2c2), 1);
value = 0x06;
i2c_w(gspca_dev, PAS106_REG2, &value, 1, 1);
- i2c_w(gspca_dev, PAS106_REG3, I2c3, sizeof I2c3, 1);
+ i2c_w(gspca_dev, PAS106_REG3, I2c3, sizeof(I2c3), 1);
/* value = 0x1f; */
value = 0x04;
i2c_w(gspca_dev, PAS106_REG0e, &value, 1, 1);
} else {
I2c0[0] = 0x0a;
- i2c_w(gspca_dev, PAS106_REG2, I2c0, sizeof I2c0, 1);
- i2c_w(gspca_dev, PAS106_REG9, I2c2, sizeof I2c2, 1);
+ i2c_w(gspca_dev, PAS106_REG2, I2c0, sizeof(I2c0), 1);
+ i2c_w(gspca_dev, PAS106_REG9, I2c2, sizeof(I2c2), 1);
value = 0x0a;
i2c_w(gspca_dev, PAS106_REG2, &value, 1, 1);
- i2c_w(gspca_dev, PAS106_REG3, I2c3, sizeof I2c3, 1);
+ i2c_w(gspca_dev, PAS106_REG3, I2c3, sizeof(I2c3), 1);
value = 0x04;
/* value = 0x10; */
i2c_w(gspca_dev, PAS106_REG0e, &value, 1, 1);
@@ -540,7 +540,7 @@ static void Et_init1(struct gspca_dev *gspca_dev)
/* value = 0x22; */
/* i2c_w(gspca_dev, PAS106_REG5, &value, 1, 1); */
/* magnetude and sign bit for DAC */
- i2c_w(gspca_dev, PAS106_REG7, I2c4, sizeof I2c4, 1);
+ i2c_w(gspca_dev, PAS106_REG7, I2c4, sizeof(I2c4), 1);
/* now set by fifo the whole colors setting */
reg_w(gspca_dev, ET_G_RED, GainRGBG, 6);
setcolors(gspca_dev, getcolors(gspca_dev));
diff --git a/drivers/media/usb/gspca/gspca.c b/drivers/media/usb/gspca/gspca.c
index af5cd8213e8b..4889f9db5357 100644
--- a/drivers/media/usb/gspca/gspca.c
+++ b/drivers/media/usb/gspca/gspca.c
@@ -1321,12 +1321,12 @@ static int vidioc_querycap(struct file *file, void *priv,
struct gspca_dev *gspca_dev = video_drvdata(file);
strlcpy((char *) cap->driver, gspca_dev->sd_desc->name,
- sizeof cap->driver);
+ sizeof(cap->driver));
if (gspca_dev->dev->product != NULL) {
strlcpy((char *) cap->card, gspca_dev->dev->product,
- sizeof cap->card);
+ sizeof(cap->card));
} else {
- snprintf((char *) cap->card, sizeof cap->card,
+ snprintf((char *) cap->card, sizeof(cap->card),
"USB Camera (%04x:%04x)",
le16_to_cpu(gspca_dev->dev->descriptor.idVendor),
le16_to_cpu(gspca_dev->dev->descriptor.idProduct));
@@ -1350,7 +1350,7 @@ static int vidioc_enum_input(struct file *file, void *priv,
input->type = V4L2_INPUT_TYPE_CAMERA;
input->status = gspca_dev->cam.input_flags;
strlcpy(input->name, gspca_dev->sd_desc->name,
- sizeof input->name);
+ sizeof(input->name));
return 0;
}
@@ -1445,7 +1445,7 @@ static int vidioc_querybuf(struct file *file, void *priv,
return -EINVAL;
frame = &gspca_dev->frame[v4l2_buf->index];
- memcpy(v4l2_buf, &frame->v4l2_buf, sizeof *v4l2_buf);
+ memcpy(v4l2_buf, &frame->v4l2_buf, sizeof(*v4l2_buf));
return 0;
}
@@ -1721,7 +1721,7 @@ static int vidioc_dqbuf(struct file *file, void *priv,
gspca_dev->fr_o = (i + 1) % GSPCA_MAX_FRAMES;
frame->v4l2_buf.flags &= ~V4L2_BUF_FLAG_DONE;
- memcpy(v4l2_buf, &frame->v4l2_buf, sizeof *v4l2_buf);
+ memcpy(v4l2_buf, &frame->v4l2_buf, sizeof(*v4l2_buf));
PDEBUG(D_FRAM, "dqbuf %d", j);
ret = 0;
@@ -1822,7 +1822,7 @@ static int read_alloc(struct gspca_dev *gspca_dev,
if (gspca_dev->nframes == 0) {
struct v4l2_requestbuffers rb;
- memset(&rb, 0, sizeof rb);
+ memset(&rb, 0, sizeof(rb));
rb.count = gspca_dev->nbufread;
rb.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
rb.memory = GSPCA_MEMORY_READ;
@@ -1831,7 +1831,7 @@ static int read_alloc(struct gspca_dev *gspca_dev,
PDEBUG(D_STREAM, "read reqbuf err %d", ret);
goto out;
}
- memset(&v4l2_buf, 0, sizeof v4l2_buf);
+ memset(&v4l2_buf, 0, sizeof(v4l2_buf));
v4l2_buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
v4l2_buf.memory = GSPCA_MEMORY_READ;
for (i = 0; i < gspca_dev->nbufread; i++) {
@@ -1913,7 +1913,7 @@ static ssize_t dev_read(struct file *file, char __user *data,
timestamp.tv_sec--;
n = 2;
for (;;) {
- memset(&v4l2_buf, 0, sizeof v4l2_buf);
+ memset(&v4l2_buf, 0, sizeof(v4l2_buf));
v4l2_buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
v4l2_buf.memory = GSPCA_MEMORY_READ;
ret = vidioc_dqbuf(file, gspca_dev, &v4l2_buf);
@@ -2021,8 +2021,8 @@ int gspca_dev_probe2(struct usb_interface *intf,
sd_desc->name, id->idVendor, id->idProduct);
/* create the device */
- if (dev_size < sizeof *gspca_dev)
- dev_size = sizeof *gspca_dev;
+ if (dev_size < sizeof(*gspca_dev))
+ dev_size = sizeof(*gspca_dev);
gspca_dev = kzalloc(dev_size, GFP_KERNEL);
if (!gspca_dev) {
pr_err("couldn't kzalloc gspca struct\n");
diff --git a/drivers/media/usb/gspca/jeilinj.c b/drivers/media/usb/gspca/jeilinj.c
index 19736e237b37..3cc14adcf99e 100644
--- a/drivers/media/usb/gspca/jeilinj.c
+++ b/drivers/media/usb/gspca/jeilinj.c
@@ -488,7 +488,7 @@ static int sd_get_jcomp(struct gspca_dev *gspca_dev,
{
struct sd *sd = (struct sd *) gspca_dev;
- memset(jcomp, 0, sizeof *jcomp);
+ memset(jcomp, 0, sizeof(*jcomp));
jcomp->quality = v4l2_ctrl_g_ctrl(sd->jpegqual);
jcomp->jpeg_markers = V4L2_JPEG_MARKER_DHT
| V4L2_JPEG_MARKER_DQT;
diff --git a/drivers/media/usb/gspca/mars.c b/drivers/media/usb/gspca/mars.c
index 779a8785f421..ea31bdf72cc6 100644
--- a/drivers/media/usb/gspca/mars.c
+++ b/drivers/media/usb/gspca/mars.c
@@ -333,7 +333,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
/*jfm: win trace - many writes here to reg 0x64*/
/* initialize the MI sensor */
- for (i = 0; i < sizeof mi_data; i++)
+ for (i = 0; i < sizeof(mi_data); i++)
mi_w(gspca_dev, i + 1, mi_data[i]);
data[0] = 0x00;
diff --git a/drivers/media/usb/gspca/mr97310a.c b/drivers/media/usb/gspca/mr97310a.c
index f006e29ca019..357af10d0d61 100644
--- a/drivers/media/usb/gspca/mr97310a.c
+++ b/drivers/media/usb/gspca/mr97310a.c
@@ -1032,15 +1032,15 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
/* finish decoding current frame */
n = sof - data;
- if (n > sizeof pac_sof_marker)
- n -= sizeof pac_sof_marker;
+ if (n > sizeof(pac_sof_marker))
+ n -= sizeof(pac_sof_marker);
else
n = 0;
gspca_frame_add(gspca_dev, LAST_PACKET,
data, n);
/* Start next frame. */
gspca_frame_add(gspca_dev, FIRST_PACKET,
- pac_sof_marker, sizeof pac_sof_marker);
+ pac_sof_marker, sizeof(pac_sof_marker));
len -= sof - data;
data = sof;
}
diff --git a/drivers/media/usb/gspca/ov519.c b/drivers/media/usb/gspca/ov519.c
index c95f32a0c02b..ec278c2868d7 100644
--- a/drivers/media/usb/gspca/ov519.c
+++ b/drivers/media/usb/gspca/ov519.c
@@ -4803,7 +4803,7 @@ static int sd_get_jcomp(struct gspca_dev *gspca_dev,
if (sd->bridge != BRIDGE_W9968CF)
return -ENOTTY;
- memset(jcomp, 0, sizeof *jcomp);
+ memset(jcomp, 0, sizeof(*jcomp));
jcomp->quality = v4l2_ctrl_g_ctrl(sd->jpegqual);
jcomp->jpeg_markers = V4L2_JPEG_MARKER_DHT | V4L2_JPEG_MARKER_DQT |
V4L2_JPEG_MARKER_DRI;
diff --git a/drivers/media/usb/gspca/pac207.c b/drivers/media/usb/gspca/pac207.c
index 07529e5a0c56..9e97a4f175a9 100644
--- a/drivers/media/usb/gspca/pac207.c
+++ b/drivers/media/usb/gspca/pac207.c
@@ -379,8 +379,8 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
/* finish decoding current frame */
n = sof - data;
- if (n > sizeof pac_sof_marker)
- n -= sizeof pac_sof_marker;
+ if (n > sizeof(pac_sof_marker))
+ n -= sizeof(pac_sof_marker);
else
n = 0;
gspca_frame_add(gspca_dev, LAST_PACKET,
diff --git a/drivers/media/usb/gspca/pac7302.c b/drivers/media/usb/gspca/pac7302.c
index 8b08bd0172f4..010f5eddbc05 100644
--- a/drivers/media/usb/gspca/pac7302.c
+++ b/drivers/media/usb/gspca/pac7302.c
@@ -801,11 +801,11 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
* image, the 14th and 15th byte after the EOF seem to
* correspond to the center of the image.
*/
- lum_offset = 61 + sizeof pac_sof_marker;
+ lum_offset = 61 + sizeof(pac_sof_marker);
footer_length = 74;
/* Finish decoding current frame */
- n = (sof - data) - (footer_length + sizeof pac_sof_marker);
+ n = (sof - data) - (footer_length + sizeof(pac_sof_marker));
if (n < 0) {
gspca_dev->image_len += n;
n = 0;
@@ -832,7 +832,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
/* Start the new frame with the jpeg header */
/* The PAC7302 has the image rotated 90 degrees */
gspca_frame_add(gspca_dev, FIRST_PACKET,
- jpeg_header, sizeof jpeg_header);
+ jpeg_header, sizeof(jpeg_header));
}
gspca_frame_add(gspca_dev, INTER_PACKET, data, len);
}
diff --git a/drivers/media/usb/gspca/pac7311.c b/drivers/media/usb/gspca/pac7311.c
index 25f86b1e74a8..b58c078e481e 100644
--- a/drivers/media/usb/gspca/pac7311.c
+++ b/drivers/media/usb/gspca/pac7311.c
@@ -584,11 +584,11 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
* image, the 14th and 15th byte after the EOF seem to
* correspond to the center of the image.
*/
- lum_offset = 24 + sizeof pac_sof_marker;
+ lum_offset = 24 + sizeof(pac_sof_marker);
footer_length = 26;
/* Finish decoding current frame */
- n = (sof - data) - (footer_length + sizeof pac_sof_marker);
+ n = (sof - data) - (footer_length + sizeof(pac_sof_marker));
if (n < 0) {
gspca_dev->image_len += n;
n = 0;
diff --git a/drivers/media/usb/gspca/sn9c2028.c b/drivers/media/usb/gspca/sn9c2028.c
index 4f2050a5ec94..9cee0b9d7983 100644
--- a/drivers/media/usb/gspca/sn9c2028.c
+++ b/drivers/media/usb/gspca/sn9c2028.c
@@ -910,14 +910,14 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
/* finish decoding current frame */
n = sof - data;
- if (n > sizeof sn9c2028_sof_marker)
- n -= sizeof sn9c2028_sof_marker;
+ if (n > sizeof(sn9c2028_sof_marker))
+ n -= sizeof(sn9c2028_sof_marker);
else
n = 0;
gspca_frame_add(gspca_dev, LAST_PACKET, data, n);
/* Start next frame. */
gspca_frame_add(gspca_dev, FIRST_PACKET,
- sn9c2028_sof_marker, sizeof sn9c2028_sof_marker);
+ sn9c2028_sof_marker, sizeof(sn9c2028_sof_marker));
len -= sof - data;
data = sof;
}
diff --git a/drivers/media/usb/gspca/sonixj.c b/drivers/media/usb/gspca/sonixj.c
index fd1c8706d86a..a0be6743456e 100644
--- a/drivers/media/usb/gspca/sonixj.c
+++ b/drivers/media/usb/gspca/sonixj.c
@@ -1862,7 +1862,7 @@ static void setcontrast(struct gspca_dev *gspca_dev)
contrast[3] = 0;
contrast[4] = k2 / 5; /* blue */
contrast[5] = 0;
- reg_w(gspca_dev, 0x84, contrast, sizeof contrast);
+ reg_w(gspca_dev, 0x84, contrast, sizeof(contrast));
}
static void setcolors(struct gspca_dev *gspca_dev)
@@ -1890,7 +1890,7 @@ static void setcolors(struct gspca_dev *gspca_dev)
reg8a[i * 2] = v;
reg8a[i * 2 + 1] = (v >> 8) & 0x0f;
}
- reg_w(gspca_dev, 0x8a, reg8a, sizeof reg8a);
+ reg_w(gspca_dev, 0x8a, reg8a, sizeof(reg8a));
}
static void setredblue(struct gspca_dev *gspca_dev)
@@ -1944,10 +1944,10 @@ static void setgamma(struct gspca_dev *gspca_dev)
}
val = sd->gamma->val;
- for (i = 0; i < sizeof gamma; i++)
+ for (i = 0; i < sizeof(gamma); i++)
gamma[i] = gamma_base[i]
+ delta[i] * (val - GAMMA_DEF) / 32;
- reg_w(gspca_dev, 0x20, gamma, sizeof gamma);
+ reg_w(gspca_dev, 0x20, gamma, sizeof(gamma));
}
static void setexposure(struct gspca_dev *gspca_dev)
@@ -2241,7 +2241,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
}
reg_w(gspca_dev, 0x9a, reg9a, 6);
- reg_w(gspca_dev, 0xd4, regd4, sizeof regd4);
+ reg_w(gspca_dev, 0xd4, regd4, sizeof(regd4));
reg_w(gspca_dev, 0x03, &sn9c1xx[3], 0x0f);
@@ -2334,7 +2334,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
/*fixme: 8 times with all zeroes and 1 or 2 times with normal values */
for (i = 0; i < 8; i++)
- reg_w(gspca_dev, 0x84, reg84, sizeof reg84);
+ reg_w(gspca_dev, 0x84, reg84, sizeof(reg84));
switch (sd->sensor) {
case SENSOR_ADCM1700:
case SENSOR_OV7660:
@@ -2360,7 +2360,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
}
setsharpness(gspca_dev);
- reg_w(gspca_dev, 0x84, reg84, sizeof reg84);
+ reg_w(gspca_dev, 0x84, reg84, sizeof(reg84));
reg_w1(gspca_dev, 0x05, 0x20); /* red */
reg_w1(gspca_dev, 0x07, 0x20); /* green */
reg_w1(gspca_dev, 0x06, 0x20); /* blue */
diff --git a/drivers/media/usb/gspca/sq930x.c b/drivers/media/usb/gspca/sq930x.c
index e274cf19a3ea..54418fe3fd4b 100644
--- a/drivers/media/usb/gspca/sq930x.c
+++ b/drivers/media/usb/gspca/sq930x.c
@@ -683,7 +683,7 @@ static void mt9v111_init(struct gspca_dev *gspca_dev)
{0x02, 0x01, 0xae, 0x01, 0x00, 0x00, 0x00},
};
- reg_wb(gspca_dev, 0x001b, 0x0000, cmd_001b, sizeof cmd_001b);
+ reg_wb(gspca_dev, 0x001b, 0x0000, cmd_001b, sizeof(cmd_001b));
for (i = 0; i < ARRAY_SIZE(cmd_011b); i++) {
reg_wb(gspca_dev, 0x001b, 0x0000, cmd_011b[i],
ARRAY_SIZE(cmd_011b[0]));
diff --git a/drivers/media/usb/gspca/t613.c b/drivers/media/usb/gspca/t613.c
index e2cc4e5a0ccb..8bb1b4de1711 100644
--- a/drivers/media/usb/gspca/t613.c
+++ b/drivers/media/usb/gspca/t613.c
@@ -150,7 +150,7 @@ static const struct additional_sensor_data sensor_data[] = {
.n3 =
{0x61, 0x68, 0x65, 0x0a, 0x60, 0x04},
.n4 = n4_om6802,
- .n4sz = sizeof n4_om6802,
+ .n4sz = sizeof(n4_om6802),
.reg80 = 0x3c,
.reg8e = 0x33,
.nset8 = {0xa8, 0xf0, 0xc6, 0x88, 0xc0, 0x00},
@@ -172,7 +172,7 @@ static const struct additional_sensor_data sensor_data[] = {
.n3 =
{0x61, 0xc2, 0x65, 0x88, 0x60, 0x00},
.n4 = n4_other,
- .n4sz = sizeof n4_other,
+ .n4sz = sizeof(n4_other),
.reg80 = 0xac,
.reg8e = 0xb8,
.nset8 = {0xa8, 0xa8, 0xc6, 0xda, 0xc0, 0x00},
@@ -194,7 +194,7 @@ static const struct additional_sensor_data sensor_data[] = {
.n3 =
{0x61, 0xc2, 0x65, 0x0d, 0x60, 0x08},
.n4 = n4_tas5130a,
- .n4sz = sizeof n4_tas5130a,
+ .n4sz = sizeof(n4_tas5130a),
.reg80 = 0x3c,
.reg8e = 0xb4,
.nset8 = {0xa8, 0xf0, 0xc6, 0xda, 0xc0, 0x00},
@@ -215,7 +215,7 @@ static const struct additional_sensor_data sensor_data[] = {
[SENSOR_LT168G] = {
.n3 = {0x61, 0xc2, 0x65, 0x68, 0x60, 0x00},
.n4 = n4_lt168g,
- .n4sz = sizeof n4_lt168g,
+ .n4sz = sizeof(n4_lt168g),
.reg80 = 0x7c,
.reg8e = 0xb3,
.nset8 = {0xa8, 0xf0, 0xc6, 0xba, 0xc0, 0x00},
@@ -412,7 +412,7 @@ static void om6802_sensor_init(struct gspca_dev *gspca_dev)
0x00 /* table end */
};
- reg_w_buf(gspca_dev, sensor_reset, sizeof sensor_reset);
+ reg_w_buf(gspca_dev, sensor_reset, sizeof(sensor_reset));
msleep(100);
i = 4;
while (--i > 0) {
@@ -433,7 +433,7 @@ static void om6802_sensor_init(struct gspca_dev *gspca_dev)
val[3] = *p++;
if (*p == 0)
reg_w(gspca_dev, 0x3c80);
- reg_w_buf(gspca_dev, val, sizeof val);
+ reg_w_buf(gspca_dev, val, sizeof(val));
i = 4;
while (--i >= 0) {
msleep(15);
@@ -469,7 +469,7 @@ static void setbrightness(struct gspca_dev *gspca_dev, s32 brightness)
set6[3] = 0x00 + ((brightness - 7) * 0x10);
}
- reg_w_buf(gspca_dev, set6, sizeof set6);
+ reg_w_buf(gspca_dev, set6, sizeof(set6));
}
static void setcontrast(struct gspca_dev *gspca_dev, s32 contrast)
@@ -496,7 +496,7 @@ static void setgamma(struct gspca_dev *gspca_dev, s32 val)
{
PDEBUG(D_CONF, "Gamma: %d", val);
reg_w_ixbuf(gspca_dev, 0x90,
- gamma_table[val], sizeof gamma_table[0]);
+ gamma_table[val], sizeof(gamma_table[0]));
}
static void setawb_n_RGB(struct gspca_dev *gspca_dev)
@@ -527,7 +527,7 @@ static void setawb_n_RGB(struct gspca_dev *gspca_dev)
if (!sd->awb->val)
all_gain_reg[7] &= ~0x04; /* AWB off */
- reg_w_buf(gspca_dev, all_gain_reg, sizeof all_gain_reg);
+ reg_w_buf(gspca_dev, all_gain_reg, sizeof(all_gain_reg));
}
static void setsharpness(struct gspca_dev *gspca_dev, s32 val)
@@ -568,7 +568,7 @@ static void setfreq(struct gspca_dev *gspca_dev, s32 val)
}
freq[1] = reg66;
- reg_w_buf(gspca_dev, freq, sizeof freq);
+ reg_w_buf(gspca_dev, freq, sizeof(freq));
}
/* this function is called at probe and resume time */
@@ -617,10 +617,10 @@ static int sd_init(struct gspca_dev *gspca_dev)
}
if (sd->sensor == SENSOR_OM6802) {
- reg_w_buf(gspca_dev, n1, sizeof n1);
+ reg_w_buf(gspca_dev, n1, sizeof(n1));
i = 5;
while (--i >= 0) {
- reg_w_buf(gspca_dev, sensor_reset, sizeof sensor_reset);
+ reg_w_buf(gspca_dev, sensor_reset, sizeof(sensor_reset));
test_byte = reg_r(gspca_dev, 0x0063);
msleep(100);
if (test_byte == 0x17)
@@ -630,7 +630,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
pr_err("Bad sensor reset %02x\n", test_byte);
return -EIO;
}
- reg_w_buf(gspca_dev, n2, sizeof n2);
+ reg_w_buf(gspca_dev, n2, sizeof(n2));
}
i = 0;
@@ -642,7 +642,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
}
sensor = &sensor_data[sd->sensor];
- reg_w_buf(gspca_dev, sensor->n3, sizeof sensor->n3);
+ reg_w_buf(gspca_dev, sensor->n3, sizeof(sensor->n3));
reg_w_buf(gspca_dev, sensor->n4, sensor->n4sz);
if (sd->sensor == SENSOR_LT168G) {
@@ -652,9 +652,9 @@ static int sd_init(struct gspca_dev *gspca_dev)
reg_w(gspca_dev, 0x6c80);
}
- reg_w_ixbuf(gspca_dev, 0xd0, sensor->data1, sizeof sensor->data1);
- reg_w_ixbuf(gspca_dev, 0xc7, sensor->data2, sizeof sensor->data2);
- reg_w_ixbuf(gspca_dev, 0xe0, sensor->data3, sizeof sensor->data3);
+ reg_w_ixbuf(gspca_dev, 0xd0, sensor->data1, sizeof(sensor->data1));
+ reg_w_ixbuf(gspca_dev, 0xc7, sensor->data2, sizeof(sensor->data2));
+ reg_w_ixbuf(gspca_dev, 0xe0, sensor->data3, sizeof(sensor->data3));
reg_w(gspca_dev, (sensor->reg80 << 8) + 0x80);
reg_w(gspca_dev, (sensor->reg80 << 8) + 0x80);
@@ -663,9 +663,9 @@ static int sd_init(struct gspca_dev *gspca_dev)
reg_w(gspca_dev, (0x20 << 8) + 0x88);
reg_w(gspca_dev, (0x20 << 8) + 0x89);
- reg_w_buf(gspca_dev, sensor->data5, sizeof sensor->data5);
- reg_w_buf(gspca_dev, sensor->nset8, sizeof sensor->nset8);
- reg_w_buf(gspca_dev, sensor->stream, sizeof sensor->stream);
+ reg_w_buf(gspca_dev, sensor->data5, sizeof(sensor->data5));
+ reg_w_buf(gspca_dev, sensor->nset8, sizeof(sensor->nset8));
+ reg_w_buf(gspca_dev, sensor->stream, sizeof(sensor->stream));
if (sd->sensor == SENSOR_LT168G) {
test_byte = reg_r(gspca_dev, 0x80);
@@ -674,9 +674,9 @@ static int sd_init(struct gspca_dev *gspca_dev)
reg_w(gspca_dev, 0x6c80);
}
- reg_w_ixbuf(gspca_dev, 0xd0, sensor->data1, sizeof sensor->data1);
- reg_w_ixbuf(gspca_dev, 0xc7, sensor->data2, sizeof sensor->data2);
- reg_w_ixbuf(gspca_dev, 0xe0, sensor->data3, sizeof sensor->data3);
+ reg_w_ixbuf(gspca_dev, 0xd0, sensor->data1, sizeof(sensor->data1));
+ reg_w_ixbuf(gspca_dev, 0xc7, sensor->data2, sizeof(sensor->data2));
+ reg_w_ixbuf(gspca_dev, 0xe0, sensor->data3, sizeof(sensor->data3));
return 0;
}
@@ -689,7 +689,7 @@ static void setmirror(struct gspca_dev *gspca_dev, s32 val)
if (val)
hflipcmd[3] = 0x01;
- reg_w_buf(gspca_dev, hflipcmd, sizeof hflipcmd);
+ reg_w_buf(gspca_dev, hflipcmd, sizeof(hflipcmd));
}
static void seteffect(struct gspca_dev *gspca_dev, s32 val)
@@ -716,7 +716,7 @@ static void seteffect(struct gspca_dev *gspca_dev, s32 val)
}
reg_w_buf(gspca_dev, effects_table[idx],
- sizeof effects_table[0]);
+ sizeof(effects_table[0]));
if (val == V4L2_COLORFX_SKETCH)
reg_w(gspca_dev, 0x4aa6);
@@ -742,9 +742,9 @@ static void poll_sensor(struct gspca_dev *gspca_dev)
0xc2, 0x80, 0xc3, 0x10};
PDEBUG(D_STREAM, "[Sensor requires polling]");
- reg_w_buf(gspca_dev, poll1, sizeof poll1);
- reg_w_buf(gspca_dev, poll2, sizeof poll2);
- reg_w_buf(gspca_dev, noise03, sizeof noise03);
+ reg_w_buf(gspca_dev, poll1, sizeof(poll1));
+ reg_w_buf(gspca_dev, poll2, sizeof(poll2));
+ reg_w_buf(gspca_dev, noise03, sizeof(noise03));
}
static int sd_start(struct gspca_dev *gspca_dev)
@@ -783,7 +783,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
i = 0;
for (;;) {
reg_w_buf(gspca_dev, tas5130a_sensor_init[i],
- sizeof tas5130a_sensor_init[0]);
+ sizeof(tas5130a_sensor_init[0]));
if (i >= ARRAY_SIZE(tas5130a_sensor_init) - 1)
break;
i++;
@@ -791,19 +791,19 @@ static int sd_start(struct gspca_dev *gspca_dev)
reg_w(gspca_dev, 0x3c80);
/* just in case and to keep sync with logs (for mine) */
reg_w_buf(gspca_dev, tas5130a_sensor_init[i],
- sizeof tas5130a_sensor_init[0]);
+ sizeof(tas5130a_sensor_init[0]));
reg_w(gspca_dev, 0x3c80);
break;
}
sensor = &sensor_data[sd->sensor];
setfreq(gspca_dev, v4l2_ctrl_g_ctrl(sd->freq));
reg_r(gspca_dev, 0x0012);
- reg_w_buf(gspca_dev, t2, sizeof t2);
- reg_w_ixbuf(gspca_dev, 0xb3, t3, sizeof t3);
+ reg_w_buf(gspca_dev, t2, sizeof(t2));
+ reg_w_ixbuf(gspca_dev, 0xb3, t3, sizeof(t3));
reg_w(gspca_dev, 0x0013);
msleep(15);
- reg_w_buf(gspca_dev, sensor->stream, sizeof sensor->stream);
- reg_w_buf(gspca_dev, sensor->stream, sizeof sensor->stream);
+ reg_w_buf(gspca_dev, sensor->stream, sizeof(sensor->stream));
+ reg_w_buf(gspca_dev, sensor->stream, sizeof(sensor->stream));
if (sd->sensor == SENSOR_OM6802)
poll_sensor(gspca_dev);
@@ -816,9 +816,9 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
struct sd *sd = (struct sd *) gspca_dev;
reg_w_buf(gspca_dev, sensor_data[sd->sensor].stream,
- sizeof sensor_data[sd->sensor].stream);
+ sizeof(sensor_data[sd->sensor].stream));
reg_w_buf(gspca_dev, sensor_data[sd->sensor].stream,
- sizeof sensor_data[sd->sensor].stream);
+ sizeof(sensor_data[sd->sensor].stream));
if (sd->sensor == SENSOR_OM6802) {
msleep(20);
reg_w(gspca_dev, 0x0309);
diff --git a/drivers/media/usb/gspca/topro.c b/drivers/media/usb/gspca/topro.c
index c028a5c2438e..e647cf6cf675 100644
--- a/drivers/media/usb/gspca/topro.c
+++ b/drivers/media/usb/gspca/topro.c
@@ -956,7 +956,7 @@ static void jpeg_define(u8 *jpeg_hdr,
int height,
int width)
{
- memcpy(jpeg_hdr, jpeg_head, sizeof jpeg_head);
+ memcpy(jpeg_hdr, jpeg_head, sizeof(jpeg_head));
jpeg_hdr[JPEG_HEIGHT_OFFSET + 0] = height >> 8;
jpeg_hdr[JPEG_HEIGHT_OFFSET + 1] = height;
jpeg_hdr[JPEG_HEIGHT_OFFSET + 2] = width >> 8;
@@ -1460,7 +1460,7 @@ static void set_dqt(struct gspca_dev *gspca_dev, u8 q)
jpeg_set_qual(sd->jpeg_hdr, jpeg_q[q]);
else
memcpy(&sd->jpeg_hdr[JPEG_QT0_OFFSET - 1],
- DQT[q], sizeof DQT[0]);
+ DQT[q], sizeof(DQT[0]));
}
/* set the JPEG compression quality factor */
@@ -4141,7 +4141,7 @@ static int sd_isoc_init(struct gspca_dev *gspca_dev)
ARRAY_SIZE(cx_sensor_init));
reg_w_buf(gspca_dev, cx_bridge_init,
ARRAY_SIZE(cx_bridge_init));
- bulk_w(gspca_dev, 0x03, color_null, sizeof color_null);
+ bulk_w(gspca_dev, 0x03, color_null, sizeof(color_null));
reg_w(gspca_dev, 0x59, 0x40);
} else {
reg_w(gspca_dev, TP6800_R12_SIF_ADDR_S, 0x21);
@@ -4501,7 +4501,7 @@ static void soi763a_6810_start(struct gspca_dev *gspca_dev)
};
reg_w(gspca_dev, 0x22, gspca_dev->alt);
- bulk_w(gspca_dev, 0x03, color_null, sizeof color_null);
+ bulk_w(gspca_dev, 0x03, color_null, sizeof(color_null));
reg_w(gspca_dev, 0x59, 0x40);
if (sd->sensor == SENSOR_CX0342)
setexposure(gspca_dev, v4l2_ctrl_g_ctrl(gspca_dev->exposure),
@@ -4838,7 +4838,7 @@ static int sd_get_jcomp(struct gspca_dev *gspca_dev,
if (sd->sensor != SENSOR_SOI763A)
return -ENOTTY;
- memset(jcomp, 0, sizeof *jcomp);
+ memset(jcomp, 0, sizeof(*jcomp));
jcomp->quality = v4l2_ctrl_g_ctrl(sd->jpegqual);
jcomp->jpeg_markers = V4L2_JPEG_MARKER_DHT
| V4L2_JPEG_MARKER_DQT;
diff --git a/drivers/media/usb/gspca/zc3xx.c b/drivers/media/usb/gspca/zc3xx.c
index c5d8ee6fa3c7..b33754710e9b 100644
--- a/drivers/media/usb/gspca/zc3xx.c
+++ b/drivers/media/usb/gspca/zc3xx.c
@@ -6895,7 +6895,7 @@ static int sd_get_jcomp(struct gspca_dev *gspca_dev,
{
struct sd *sd = (struct sd *) gspca_dev;
- memset(jcomp, 0, sizeof *jcomp);
+ memset(jcomp, 0, sizeof(*jcomp));
jcomp->quality = v4l2_ctrl_g_ctrl(sd->jpegqual);
jcomp->jpeg_markers = V4L2_JPEG_MARKER_DHT
| V4L2_JPEG_MARKER_DQT;
diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
index c2ee6e39fd0c..91cc583a08c7 100644
--- a/drivers/media/usb/uvc/uvc_ctrl.c
+++ b/drivers/media/usb/uvc/uvc_ctrl.c
@@ -1019,10 +1019,10 @@ static int __uvc_query_v4l2_ctrl(struct uvc_video_chain *chain,
struct uvc_menu_info *menu;
unsigned int i;
- memset(v4l2_ctrl, 0, sizeof *v4l2_ctrl);
+ memset(v4l2_ctrl, 0, sizeof(*v4l2_ctrl));
v4l2_ctrl->id = mapping->id;
v4l2_ctrl->type = mapping->v4l2_type;
- strlcpy(v4l2_ctrl->name, mapping->name, sizeof v4l2_ctrl->name);
+ strlcpy(v4l2_ctrl->name, mapping->name, sizeof(v4l2_ctrl->name));
v4l2_ctrl->flags = 0;
if (!(ctrl->info.flags & UVC_CTRL_FLAG_GET_CUR))
@@ -1182,7 +1182,7 @@ int uvc_query_v4l2_menu(struct uvc_video_chain *chain,
}
}
- strlcpy(query_menu->name, menu_info->name, sizeof query_menu->name);
+ strlcpy(query_menu->name, menu_info->name, sizeof(query_menu->name));
done:
mutex_unlock(&chain->ctrl_mutex);
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
index 4e7148815a78..b7e88c3ad614 100644
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -213,7 +213,7 @@ void uvc_simplify_fraction(uint32_t *numerator, uint32_t *denominator,
uint32_t x, y, r;
unsigned int i, n;
- an = kmalloc(n_terms * sizeof *an, GFP_KERNEL);
+ an = kmalloc(n_terms * sizeof(*an), GFP_KERNEL);
if (an == NULL)
return;
@@ -362,7 +362,7 @@ static int uvc_parse_format(struct uvc_device *dev,
if (fmtdesc != NULL) {
strlcpy(format->name, fmtdesc->name,
- sizeof format->name);
+ sizeof(format->name));
format->fcc = fmtdesc->fcc;
} else {
uvc_printk(KERN_INFO, "Unknown video format %pUl\n",
@@ -405,7 +405,7 @@ static int uvc_parse_format(struct uvc_device *dev,
return -EINVAL;
}
- strlcpy(format->name, "MJPEG", sizeof format->name);
+ strlcpy(format->name, "MJPEG", sizeof(format->name));
format->fcc = V4L2_PIX_FMT_MJPEG;
format->flags = UVC_FMT_FLAG_COMPRESSED;
format->bpp = 0;
@@ -423,13 +423,13 @@ static int uvc_parse_format(struct uvc_device *dev,
switch (buffer[8] & 0x7f) {
case 0:
- strlcpy(format->name, "SD-DV", sizeof format->name);
+ strlcpy(format->name, "SD-DV", sizeof(format->name));
break;
case 1:
- strlcpy(format->name, "SDL-DV", sizeof format->name);
+ strlcpy(format->name, "SDL-DV", sizeof(format->name));
break;
case 2:
- strlcpy(format->name, "HD-DV", sizeof format->name);
+ strlcpy(format->name, "HD-DV", sizeof(format->name));
break;
default:
uvc_trace(UVC_TRACE_DESCR, "device %d videostreaming "
@@ -440,7 +440,7 @@ static int uvc_parse_format(struct uvc_device *dev,
}
strlcat(format->name, buffer[8] & (1 << 7) ? " 60Hz" : " 50Hz",
- sizeof format->name);
+ sizeof(format->name));
format->fcc = V4L2_PIX_FMT_DV;
format->flags = UVC_FMT_FLAG_COMPRESSED | UVC_FMT_FLAG_STREAM;
@@ -449,7 +449,7 @@ static int uvc_parse_format(struct uvc_device *dev,
/* Create a dummy frame descriptor. */
frame = &format->frame[0];
- memset(&format->frame[0], 0, sizeof format->frame[0]);
+ memset(&format->frame[0], 0, sizeof(format->frame[0]));
frame->bFrameIntervalType = 1;
frame->dwDefaultFrameInterval = 1;
frame->dwFrameInterval = *intervals;
@@ -616,7 +616,7 @@ static int uvc_parse_streaming(struct uvc_device *dev,
return -EINVAL;
}
- streaming = kzalloc(sizeof *streaming, GFP_KERNEL);
+ streaming = kzalloc(sizeof(*streaming), GFP_KERNEL);
if (streaming == NULL) {
usb_driver_release_interface(&uvc_driver.driver, intf);
return -EINVAL;
@@ -766,8 +766,8 @@ static int uvc_parse_streaming(struct uvc_device *dev,
goto error;
}
- size = nformats * sizeof *format + nframes * sizeof *frame
- + nintervals * sizeof *interval;
+ size = nformats * sizeof(*format) + nframes * sizeof(*frame)
+ + nintervals * sizeof(*interval);
format = kzalloc(size, GFP_KERNEL);
if (format == NULL) {
ret = -ENOMEM;
@@ -941,7 +941,7 @@ static int uvc_parse_vendor_control(struct uvc_device *dev,
if (buffer[24+p+2*n] != 0)
usb_string(udev, buffer[24+p+2*n], unit->name,
- sizeof unit->name);
+ sizeof(unit->name));
else
sprintf(unit->name, "Extension %u", buffer[3]);
@@ -1040,7 +1040,7 @@ static int uvc_parse_standard_control(struct uvc_device *dev,
if (UVC_ENTITY_TYPE(term) == UVC_ITT_CAMERA) {
term->camera.bControlSize = n;
- term->camera.bmControls = (__u8 *)term + sizeof *term;
+ term->camera.bmControls = (__u8 *)term + sizeof(*term);
term->camera.wObjectiveFocalLengthMin =
get_unaligned_le16(&buffer[8]);
term->camera.wObjectiveFocalLengthMax =
@@ -1051,17 +1051,17 @@ static int uvc_parse_standard_control(struct uvc_device *dev,
} else if (UVC_ENTITY_TYPE(term) ==
UVC_ITT_MEDIA_TRANSPORT_INPUT) {
term->media.bControlSize = n;
- term->media.bmControls = (__u8 *)term + sizeof *term;
+ term->media.bmControls = (__u8 *)term + sizeof(*term);
term->media.bTransportModeSize = p;
term->media.bmTransportModes = (__u8 *)term
- + sizeof *term + n;
+ + sizeof(*term) + n;
memcpy(term->media.bmControls, &buffer[9], n);
memcpy(term->media.bmTransportModes, &buffer[10+n], p);
}
if (buffer[7] != 0)
usb_string(udev, buffer[7], term->name,
- sizeof term->name);
+ sizeof(term->name));
else if (UVC_ENTITY_TYPE(term) == UVC_ITT_CAMERA)
sprintf(term->name, "Camera %u", buffer[3]);
else if (UVC_ENTITY_TYPE(term) == UVC_ITT_MEDIA_TRANSPORT_INPUT)
@@ -1101,7 +1101,7 @@ static int uvc_parse_standard_control(struct uvc_device *dev,
if (buffer[8] != 0)
usb_string(udev, buffer[8], term->name,
- sizeof term->name);
+ sizeof(term->name));
else
sprintf(term->name, "Output %u", buffer[3]);
@@ -1126,7 +1126,7 @@ static int uvc_parse_standard_control(struct uvc_device *dev,
if (buffer[5+p] != 0)
usb_string(udev, buffer[5+p], unit->name,
- sizeof unit->name);
+ sizeof(unit->name));
else
sprintf(unit->name, "Selector %u", buffer[3]);
@@ -1152,14 +1152,14 @@ static int uvc_parse_standard_control(struct uvc_device *dev,
unit->processing.wMaxMultiplier =
get_unaligned_le16(&buffer[5]);
unit->processing.bControlSize = buffer[7];
- unit->processing.bmControls = (__u8 *)unit + sizeof *unit;
+ unit->processing.bmControls = (__u8 *)unit + sizeof(*unit);
memcpy(unit->processing.bmControls, &buffer[8], n);
if (dev->uvc_version >= 0x0110)
unit->processing.bmVideoStandards = buffer[9+n];
if (buffer[8+n] != 0)
usb_string(udev, buffer[8+n], unit->name,
- sizeof unit->name);
+ sizeof(unit->name));
else
sprintf(unit->name, "Processing %u", buffer[3]);
@@ -1185,12 +1185,12 @@ static int uvc_parse_standard_control(struct uvc_device *dev,
unit->extension.bNumControls = buffer[20];
memcpy(unit->baSourceID, &buffer[22], p);
unit->extension.bControlSize = buffer[22+p];
- unit->extension.bmControls = (__u8 *)unit + sizeof *unit;
+ unit->extension.bmControls = (__u8 *)unit + sizeof(*unit);
memcpy(unit->extension.bmControls, &buffer[23+p], n);
if (buffer[23+p+n] != 0)
usb_string(udev, buffer[23+p+n], unit->name,
- sizeof unit->name);
+ sizeof(unit->name));
else
sprintf(unit->name, "Extension %u", buffer[3]);
@@ -1766,7 +1766,7 @@ static int uvc_register_video(struct uvc_device *dev,
vdev->prio = &stream->chain->prio;
if (stream->type == V4L2_BUF_TYPE_VIDEO_OUTPUT)
vdev->vfl_dir = VFL_DIR_TX;
- strlcpy(vdev->name, dev->name, sizeof vdev->name);
+ strlcpy(vdev->name, dev->name, sizeof(vdev->name));
/* Set the driver data before calling video_register_device, otherwise
* uvc_v4l2_open might race us.
@@ -1863,7 +1863,7 @@ static int uvc_probe(struct usb_interface *intf,
udev->devpath);
/* Allocate memory for the device and initialize it. */
- if ((dev = kzalloc(sizeof *dev, GFP_KERNEL)) == NULL)
+ if ((dev = kzalloc(sizeof(*dev), GFP_KERNEL)) == NULL)
return -ENOMEM;
INIT_LIST_HEAD(&dev->entities);
@@ -1880,9 +1880,9 @@ static int uvc_probe(struct usb_interface *intf,
? id->driver_info : uvc_quirks_param;
if (udev->product != NULL)
- strlcpy(dev->name, udev->product, sizeof dev->name);
+ strlcpy(dev->name, udev->product, sizeof(dev->name));
else
- snprintf(dev->name, sizeof dev->name,
+ snprintf(dev->name, sizeof(dev->name),
"UVC Camera (%04x:%04x)",
le16_to_cpu(udev->descriptor.idVendor),
le16_to_cpu(udev->descriptor.idProduct));
diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c
index d7723ce772b3..ee929a04ff44 100644
--- a/drivers/media/usb/uvc/uvc_v4l2.c
+++ b/drivers/media/usb/uvc/uvc_v4l2.c
@@ -40,13 +40,13 @@ static int uvc_ioctl_ctrl_map(struct uvc_video_chain *chain,
unsigned int size;
int ret;
- map = kzalloc(sizeof *map, GFP_KERNEL);
+ map = kzalloc(sizeof(*map), GFP_KERNEL);
if (map == NULL)
return -ENOMEM;
map->id = xmap->id;
- memcpy(map->name, xmap->name, sizeof map->name);
- memcpy(map->entity, xmap->entity, sizeof map->entity);
+ memcpy(map->name, xmap->name, sizeof(map->name));
+ memcpy(map->entity, xmap->entity, sizeof(map->entity));
map->selector = xmap->selector;
map->size = xmap->size;
map->offset = xmap->offset;
@@ -214,7 +214,7 @@ static int uvc_v4l2_try_format(struct uvc_streaming *stream,
(100000000/interval)%10);
/* Set the format index, frame index and frame interval. */
- memset(probe, 0, sizeof *probe);
+ memset(probe, 0, sizeof(*probe));
probe->bmHint = 1; /* dwFrameInterval */
probe->bFormatIndex = format->index;
probe->bFrameIndex = frame->bFrameIndex;
@@ -338,7 +338,7 @@ static int uvc_v4l2_get_streamparm(struct uvc_streaming *stream,
denominator = 10000000;
uvc_simplify_fraction(&numerator, &denominator, 8, 333);
- memset(parm, 0, sizeof *parm);
+ memset(parm, 0, sizeof(*parm));
parm->type = stream->type;
if (stream->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
@@ -488,7 +488,7 @@ static int uvc_v4l2_open(struct file *file)
return ret;
/* Create the device handle. */
- handle = kzalloc(sizeof *handle, GFP_KERNEL);
+ handle = kzalloc(sizeof(*handle), GFP_KERNEL);
if (handle == NULL) {
usb_autopm_put_interface(stream->dev->intf);
return -ENOMEM;
diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c
index 075a0fe77485..26fb5f130460 100644
--- a/drivers/media/usb/uvc/uvc_video.c
+++ b/drivers/media/usb/uvc/uvc_video.c
@@ -191,7 +191,7 @@ static int uvc_get_video_ctrl(struct uvc_streaming *stream,
uvc_warn_once(stream->dev, UVC_WARN_MINMAX, "UVC non "
"compliance - GET_MIN/MAX(PROBE) incorrectly "
"supported. Enabling workaround.\n");
- memset(ctrl, 0, sizeof *ctrl);
+ memset(ctrl, 0, sizeof(*ctrl));
ctrl->wCompQuality = le16_to_cpup((__le16 *)data);
ret = 0;
goto out;
diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c
index 61d56c940f80..909a5ffc56d3 100644
--- a/drivers/media/v4l2-core/v4l2-mem2mem.c
+++ b/drivers/media/v4l2-core/v4l2-mem2mem.c
@@ -666,7 +666,7 @@ struct v4l2_m2m_dev *v4l2_m2m_init(const struct v4l2_m2m_ops *m2m_ops)
WARN_ON(!m2m_ops->job_abort))
return ERR_PTR(-EINVAL);
- m2m_dev = kzalloc(sizeof *m2m_dev, GFP_KERNEL);
+ m2m_dev = kzalloc(sizeof(*m2m_dev), GFP_KERNEL);
if (!m2m_dev)
return ERR_PTR(-ENOMEM);
@@ -707,7 +707,7 @@ struct v4l2_m2m_ctx *v4l2_m2m_ctx_init(struct v4l2_m2m_dev *m2m_dev,
struct v4l2_m2m_queue_ctx *out_q_ctx, *cap_q_ctx;
int ret;
- m2m_ctx = kzalloc(sizeof *m2m_ctx, GFP_KERNEL);
+ m2m_ctx = kzalloc(sizeof(*m2m_ctx), GFP_KERNEL);
if (!m2m_ctx)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/media/v4l2-core/videobuf2-dma-contig.c b/drivers/media/v4l2-core/videobuf2-dma-contig.c
index c33127284cfe..a6164bdafa3f 100644
--- a/drivers/media/v4l2-core/videobuf2-dma-contig.c
+++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
@@ -143,7 +143,7 @@ static void *vb2_dc_alloc(void *alloc_ctx, unsigned long size,
struct device *dev = conf->dev;
struct vb2_dc_buf *buf;
- buf = kzalloc(sizeof *buf, GFP_KERNEL);
+ buf = kzalloc(sizeof(*buf), GFP_KERNEL);
if (!buf)
return ERR_PTR(-ENOMEM);
@@ -497,7 +497,7 @@ static void *vb2_dc_get_userptr(void *alloc_ctx, unsigned long vaddr,
return ERR_PTR(-EINVAL);
}
- buf = kzalloc(sizeof *buf, GFP_KERNEL);
+ buf = kzalloc(sizeof(*buf), GFP_KERNEL);
if (!buf)
return ERR_PTR(-ENOMEM);
@@ -725,7 +725,7 @@ void *vb2_dma_contig_init_ctx(struct device *dev)
{
struct vb2_dc_conf *conf;
- conf = kzalloc(sizeof *conf, GFP_KERNEL);
+ conf = kzalloc(sizeof(*conf), GFP_KERNEL);
if (!conf)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/media/v4l2-core/videobuf2-dma-sg.c b/drivers/media/v4l2-core/videobuf2-dma-sg.c
index 9985c89f0513..f6c431985cb5 100644
--- a/drivers/media/v4l2-core/videobuf2-dma-sg.c
+++ b/drivers/media/v4l2-core/videobuf2-dma-sg.c
@@ -113,7 +113,7 @@ static void *vb2_dma_sg_alloc(void *alloc_ctx, unsigned long size,
if (WARN_ON(alloc_ctx == NULL))
return NULL;
- buf = kzalloc(sizeof *buf, GFP_KERNEL);
+ buf = kzalloc(sizeof(*buf), GFP_KERNEL);
if (!buf)
return NULL;
@@ -237,7 +237,7 @@ static void *vb2_dma_sg_get_userptr(void *alloc_ctx, unsigned long vaddr,
struct frame_vector *vec;
dma_set_attr(DMA_ATTR_SKIP_CPU_SYNC, &attrs);
- buf = kzalloc(sizeof *buf, GFP_KERNEL);
+ buf = kzalloc(sizeof(*buf), GFP_KERNEL);
if (!buf)
return NULL;
diff --git a/drivers/mfd/t7l66xb.c b/drivers/mfd/t7l66xb.c
index 94bd89cb1f06..c53e79a7414b 100644
--- a/drivers/mfd/t7l66xb.c
+++ b/drivers/mfd/t7l66xb.c
@@ -317,7 +317,7 @@ static int t7l66xb_probe(struct platform_device *dev)
if (!iomem)
return -EINVAL;
- t7l66xb = kzalloc(sizeof *t7l66xb, GFP_KERNEL);
+ t7l66xb = kzalloc(sizeof(*t7l66xb), GFP_KERNEL);
if (!t7l66xb)
return -ENOMEM;
diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c
index 1ecbfa40d1b3..c095c1255a5b 100644
--- a/drivers/mfd/tc6393xb.c
+++ b/drivers/mfd/tc6393xb.c
@@ -622,7 +622,7 @@ static int tc6393xb_probe(struct platform_device *dev)
if (!iomem)
return -EINVAL;
- tc6393xb = kzalloc(sizeof *tc6393xb, GFP_KERNEL);
+ tc6393xb = kzalloc(sizeof(*tc6393xb), GFP_KERNEL);
if (!tc6393xb) {
ret = -ENOMEM;
goto err_kzalloc;
diff --git a/drivers/mfd/tps65010.c b/drivers/mfd/tps65010.c
index 83e615ed100a..ba9a19d90d8e 100644
--- a/drivers/mfd/tps65010.c
+++ b/drivers/mfd/tps65010.c
@@ -162,7 +162,7 @@ static void show_chgstatus(const char *label, u8 chgstatus)
{
char buf [100];
- dbg_chgstat(buf, sizeof buf, chgstatus);
+ dbg_chgstat(buf, sizeof(buf), chgstatus);
pr_debug("%s: %s %s", DRIVER_NAME, label, buf);
}
@@ -170,7 +170,7 @@ static void show_regstatus(const char *label, u8 regstatus)
{
char buf [100];
- dbg_regstat(buf, sizeof buf, regstatus);
+ dbg_regstat(buf, sizeof(buf), regstatus);
pr_debug("%s: %s %s", DRIVER_NAME, label, buf);
}
@@ -178,7 +178,7 @@ static void show_chgconfig(int por, const char *label, u8 chgconfig)
{
char buf [100];
- dbg_chgconf(por, buf, sizeof buf, chgconfig);
+ dbg_chgconf(por, buf, sizeof(buf), chgconfig);
pr_debug("%s: %s %s", DRIVER_NAME, label, buf);
}
@@ -223,22 +223,22 @@ static int dbg_show(struct seq_file *s, void *_)
* that reading chgstat and regstat may ack IRQs...
*/
value = i2c_smbus_read_byte_data(tps->client, TPS_CHGCONFIG);
- dbg_chgconf(tps->por, buf, sizeof buf, value);
+ dbg_chgconf(tps->por, buf, sizeof(buf), value);
seq_printf(s, "chgconfig %s", buf);
value = i2c_smbus_read_byte_data(tps->client, TPS_CHGSTATUS);
- dbg_chgstat(buf, sizeof buf, value);
+ dbg_chgstat(buf, sizeof(buf), value);
seq_printf(s, "chgstat %s", buf);
value = i2c_smbus_read_byte_data(tps->client, TPS_MASK1);
- dbg_chgstat(buf, sizeof buf, value);
+ dbg_chgstat(buf, sizeof(buf), value);
seq_printf(s, "mask1 %s", buf);
/* ignore ackint1 */
value = i2c_smbus_read_byte_data(tps->client, TPS_REGSTATUS);
- dbg_regstat(buf, sizeof buf, value);
+ dbg_regstat(buf, sizeof(buf), value);
seq_printf(s, "regstat %s", buf);
value = i2c_smbus_read_byte_data(tps->client, TPS_MASK2);
- dbg_regstat(buf, sizeof buf, value);
+ dbg_regstat(buf, sizeof(buf), value);
seq_printf(s, "mask2 %s\n", buf);
/* ignore ackint2 */
diff --git a/drivers/misc/apds990x.c b/drivers/misc/apds990x.c
index a3e789b85cc8..b8272a00f21e 100644
--- a/drivers/misc/apds990x.c
+++ b/drivers/misc/apds990x.c
@@ -1061,7 +1061,7 @@ static int apds990x_probe(struct i2c_client *client,
struct apds990x_chip *chip;
int err;
- chip = kzalloc(sizeof *chip, GFP_KERNEL);
+ chip = kzalloc(sizeof(*chip), GFP_KERNEL);
if (!chip)
return -ENOMEM;
diff --git a/drivers/misc/bh1770glc.c b/drivers/misc/bh1770glc.c
index 753d7ecdadaa..7813d13023a8 100644
--- a/drivers/misc/bh1770glc.c
+++ b/drivers/misc/bh1770glc.c
@@ -1185,7 +1185,7 @@ static int bh1770_probe(struct i2c_client *client,
struct bh1770_chip *chip;
int err;
- chip = devm_kzalloc(&client->dev, sizeof *chip, GFP_KERNEL);
+ chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
if (!chip)
return -ENOMEM;
diff --git a/drivers/misc/eeprom/at25.c b/drivers/misc/eeprom/at25.c
index f850ef556bcc..462271dc4d38 100644
--- a/drivers/misc/eeprom/at25.c
+++ b/drivers/misc/eeprom/at25.c
@@ -104,7 +104,7 @@ at25_ee_read(
}
spi_message_init(&m);
- memset(t, 0, sizeof t);
+ memset(t, 0, sizeof(t));
t[0].tx_buf = command;
t[0].len = at25->addrlen + 1;
diff --git a/drivers/misc/ibmasm/r_heartbeat.c b/drivers/misc/ibmasm/r_heartbeat.c
index 232034f5da48..e222ea7348cf 100644
--- a/drivers/misc/ibmasm/r_heartbeat.c
+++ b/drivers/misc/ibmasm/r_heartbeat.c
@@ -64,12 +64,12 @@ int ibmasm_start_reverse_heartbeat(struct service_processor *sp, struct reverse_
int times_failed = 0;
int result = 1;
- cmd = ibmasm_new_command(sp, sizeof rhb_dot_cmd);
+ cmd = ibmasm_new_command(sp, sizeof(rhb_dot_cmd));
if (!cmd)
return -ENOMEM;
while (times_failed < 3) {
- memcpy(cmd->buffer, (void *)&rhb_dot_cmd, sizeof rhb_dot_cmd);
+ memcpy(cmd->buffer, (void *)&rhb_dot_cmd, sizeof(rhb_dot_cmd));
cmd->status = IBMASM_CMD_PENDING;
ibmasm_exec_command(sp, cmd);
ibmasm_wait_for_response(cmd, IBMASM_CMD_TIMEOUT_NORMAL);
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index c9c3b7fa3051..22de50e167e6 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -132,7 +132,7 @@ static int m25p80_read(struct spi_nor *nor, loff_t from, size_t len,
dummy /= 8;
spi_message_init(&m);
- memset(t, 0, (sizeof t));
+ memset(t, 0, (sizeof(t)));
flash->command[0] = nor->read_opcode;
m25p_addr2cmd(nor, from, flash->command);
diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c
index f9e9bd1cfaa0..0b17faccf6bf 100644
--- a/drivers/mtd/devices/mtd_dataflash.c
+++ b/drivers/mtd/devices/mtd_dataflash.c
@@ -481,7 +481,7 @@ static ssize_t otp_read(struct spi_device *spi, unsigned base,
*/
scratch[0] = OP_READ_SECURITY;
- memset(&t, 0, sizeof t);
+ memset(&t, 0, sizeof(t));
t.tx_buf = scratch;
t.rx_buf = scratch;
t.len = l;
@@ -567,7 +567,7 @@ static int dataflash_write_user_otp(struct mtd_info *mtd,
spi_message_init(&m);
- memset(&t, 0, sizeof t);
+ memset(&t, 0, sizeof(t));
t.tx_buf = scratch;
t.len = l;
spi_message_add_tail(&t, &m);
@@ -628,7 +628,7 @@ static int add_dataflash_otp(struct spi_device *spi, char *name, int nr_pages,
char *otp_tag = "";
int err = 0;
- priv = kzalloc(sizeof *priv, GFP_KERNEL);
+ priv = kzalloc(sizeof(*priv), GFP_KERNEL);
if (!priv)
return -ENOMEM;
diff --git a/drivers/net/ethernet/marvell/skge.c b/drivers/net/ethernet/marvell/skge.c
index 7173836fe361..fe289ef00d79 100644
--- a/drivers/net/ethernet/marvell/skge.c
+++ b/drivers/net/ethernet/marvell/skge.c
@@ -3510,7 +3510,7 @@ static const char *skge_board_name(const struct skge_hw *hw)
if (skge_chips[i].id == hw->chip_id)
return skge_chips[i].name;
- snprintf(buf, sizeof buf, "chipid 0x%x", hw->chip_id);
+ snprintf(buf, sizeof(buf), "chipid 0x%x", hw->chip_id);
return buf;
}
diff --git a/drivers/net/ethernet/mellanox/mlx4/alloc.c b/drivers/net/ethernet/mellanox/mlx4/alloc.c
index 0c51c69f802f..055a83f5bec3 100644
--- a/drivers/net/ethernet/mellanox/mlx4/alloc.c
+++ b/drivers/net/ethernet/mellanox/mlx4/alloc.c
@@ -632,7 +632,7 @@ int mlx4_buf_alloc(struct mlx4_dev *dev, int size, int max_direct,
if (BITS_PER_LONG == 64) {
struct page **pages;
- pages = kmalloc(sizeof *pages * buf->nbufs, gfp);
+ pages = kmalloc(sizeof(*pages) * buf->nbufs, gfp);
if (!pages)
goto err_free;
for (i = 0; i < buf->nbufs; ++i)
@@ -681,7 +681,7 @@ static struct mlx4_db_pgdir *mlx4_alloc_db_pgdir(struct device *dma_device,
{
struct mlx4_db_pgdir *pgdir;
- pgdir = kzalloc(sizeof *pgdir, gfp);
+ pgdir = kzalloc(sizeof(*pgdir), gfp);
if (!pgdir)
return NULL;
diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c
index d48d5793407d..d8ecfb2f10a5 100644
--- a/drivers/net/ethernet/mellanox/mlx4/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c
@@ -2633,7 +2633,7 @@ struct mlx4_cmd_mailbox *mlx4_alloc_cmd_mailbox(struct mlx4_dev *dev)
{
struct mlx4_cmd_mailbox *mailbox;
- mailbox = kmalloc(sizeof *mailbox, GFP_KERNEL);
+ mailbox = kmalloc(sizeof(*mailbox), GFP_KERNEL);
if (!mailbox)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_resources.c b/drivers/net/ethernet/mellanox/mlx4/en_resources.c
index 12aab5a659d3..36209dd20bbd 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_resources.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_resources.c
@@ -44,7 +44,7 @@ void mlx4_en_fill_qp_context(struct mlx4_en_priv *priv, int size, int stride,
struct mlx4_en_dev *mdev = priv->mdev;
struct net_device *dev = priv->dev;
- memset(context, 0, sizeof *context);
+ memset(context, 0, sizeof(*context));
context->flags = cpu_to_be32(7 << 16 | rss << MLX4_RSS_QPC_FLAG_OFFSET);
context->pd = cpu_to_be32(mdev->priv_pdn);
context->mtu_msgmax = 0xff;
@@ -114,7 +114,7 @@ int mlx4_en_map_buffer(struct mlx4_buf *buf)
if (BITS_PER_LONG == 64 || buf->nbufs == 1)
return 0;
- pages = kmalloc(sizeof *pages * buf->nbufs, GFP_KERNEL);
+ pages = kmalloc(sizeof(*pages) * buf->nbufs, GFP_KERNEL);
if (!pages)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
index 41440b2b20a3..c3e2f137636d 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
@@ -1125,7 +1125,7 @@ static int mlx4_en_config_rss_qp(struct mlx4_en_priv *priv, int qpn,
}
qp->event = mlx4_en_sqp_event;
- memset(context, 0, sizeof *context);
+ memset(context, 0, sizeof(*context));
mlx4_en_fill_qp_context(priv, ring->actual_size, ring->stride, 0, 0,
qpn, ring->cqn, -1, context);
context->db_rec_addr = cpu_to_be64(ring->wqres.db.dma);
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
index 4421bf5463f6..b6049af395e8 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
@@ -637,7 +637,7 @@ static void build_inline_wqe(struct mlx4_en_tx_desc *tx_desc,
int tx_ind, void *fragptr)
{
struct mlx4_wqe_inline_seg *inl = &tx_desc->inl;
- int spc = MLX4_INLINE_ALIGN - CTRL_SIZE - sizeof *inl;
+ int spc = MLX4_INLINE_ALIGN - CTRL_SIZE - sizeof(*inl);
unsigned int hlen = skb_headlen(skb);
if (skb->len <= spc) {
diff --git a/drivers/net/ethernet/mellanox/mlx4/eq.c b/drivers/net/ethernet/mellanox/mlx4/eq.c
index 4696053165f8..ce57631d3eaf 100644
--- a/drivers/net/ethernet/mellanox/mlx4/eq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/eq.c
@@ -259,7 +259,7 @@ int mlx4_gen_pkey_eqe(struct mlx4_dev *dev, int slave, u8 port)
if (!s_slave->active)
return 0;
- memset(&eqe, 0, sizeof eqe);
+ memset(&eqe, 0, sizeof(eqe));
eqe.type = MLX4_EVENT_TYPE_PORT_MNG_CHG_EVENT;
eqe.subtype = MLX4_DEV_PMC_SUBTYPE_PKEY_TABLE;
@@ -276,7 +276,7 @@ int mlx4_gen_guid_change_eqe(struct mlx4_dev *dev, int slave, u8 port)
/*don't send if we don't have the that slave */
if (dev->persist->num_vfs < slave)
return 0;
- memset(&eqe, 0, sizeof eqe);
+ memset(&eqe, 0, sizeof(eqe));
eqe.type = MLX4_EVENT_TYPE_PORT_MNG_CHG_EVENT;
eqe.subtype = MLX4_DEV_PMC_SUBTYPE_GUID_INFO;
@@ -295,7 +295,7 @@ int mlx4_gen_port_state_change_eqe(struct mlx4_dev *dev, int slave, u8 port,
/*don't send if we don't have the that slave */
if (dev->persist->num_vfs < slave)
return 0;
- memset(&eqe, 0, sizeof eqe);
+ memset(&eqe, 0, sizeof(eqe));
eqe.type = MLX4_EVENT_TYPE_PORT_CHANGE;
eqe.subtype = port_subtype_change;
@@ -432,7 +432,7 @@ int mlx4_gen_slaves_port_mgt_ev(struct mlx4_dev *dev, u8 port, int attr)
{
struct mlx4_eqe eqe;
- memset(&eqe, 0, sizeof eqe);
+ memset(&eqe, 0, sizeof(eqe));
eqe.type = MLX4_EVENT_TYPE_PORT_MNG_CHG_EVENT;
eqe.subtype = MLX4_DEV_PMC_SUBTYPE_PORT_INFO;
@@ -721,7 +721,7 @@ static int mlx4_eq_int(struct mlx4_dev *dev, struct mlx4_eq *eq)
}
memcpy(&priv->mfunc.master.comm_arm_bit_vector,
eqe->event.comm_channel_arm.bit_vec,
- sizeof eqe->event.comm_channel_arm.bit_vec);
+ sizeof(eqe->event.comm_channel_arm.bit_vec));
queue_work(priv->mfunc.master.comm_wq,
&priv->mfunc.master.comm_work);
break;
@@ -985,7 +985,7 @@ static int mlx4_create_eq(struct mlx4_dev *dev, int nent,
*/
npages = PAGE_ALIGN(eq->nent * dev->caps.eqe_size) / PAGE_SIZE;
- eq->page_list = kmalloc(npages * sizeof *eq->page_list,
+ eq->page_list = kmalloc(npages * sizeof(*eq->page_list),
GFP_KERNEL);
if (!eq->page_list)
goto err_out;
@@ -993,7 +993,7 @@ static int mlx4_create_eq(struct mlx4_dev *dev, int nent,
for (i = 0; i < npages; ++i)
eq->page_list[i].buf = NULL;
- dma_list = kmalloc(npages * sizeof *dma_list, GFP_KERNEL);
+ dma_list = kmalloc(npages * sizeof(*dma_list), GFP_KERNEL);
if (!dma_list)
goto err_out_free;
@@ -1162,7 +1162,7 @@ int mlx4_alloc_eq_table(struct mlx4_dev *dev)
struct mlx4_priv *priv = mlx4_priv(dev);
priv->eq_table.eq = kcalloc(dev->caps.num_eqs - dev->caps.reserved_eqs,
- sizeof *priv->eq_table.eq, GFP_KERNEL);
+ sizeof(*priv->eq_table.eq), GFP_KERNEL);
if (!priv->eq_table.eq)
return -ENOMEM;
@@ -1181,7 +1181,7 @@ int mlx4_init_eq_table(struct mlx4_dev *dev)
int i;
priv->eq_table.uar_map = kcalloc(mlx4_num_eq_uar(dev),
- sizeof *priv->eq_table.uar_map,
+ sizeof(*priv->eq_table.uar_map),
GFP_KERNEL);
if (!priv->eq_table.uar_map) {
err = -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx4/icm.c b/drivers/net/ethernet/mellanox/mlx4/icm.c
index 2a9dd460a95f..84fe587d5dfe 100644
--- a/drivers/net/ethernet/mellanox/mlx4/icm.c
+++ b/drivers/net/ethernet/mellanox/mlx4/icm.c
@@ -396,7 +396,7 @@ int mlx4_init_icm_table(struct mlx4_dev *dev, struct mlx4_icm_table *table,
obj_per_chunk = MLX4_TABLE_CHUNK_SIZE / obj_size;
num_icm = (nobj + obj_per_chunk - 1) / obj_per_chunk;
- table->icm = kcalloc(num_icm, sizeof *table->icm, GFP_KERNEL);
+ table->icm = kcalloc(num_icm, sizeof(*table->icm), GFP_KERNEL);
if (!table->icm)
return -ENOMEM;
table->virt = virt;
diff --git a/drivers/net/ethernet/mellanox/mlx4/intf.c b/drivers/net/ethernet/mellanox/mlx4/intf.c
index 0472941af820..96c97b0d6541 100644
--- a/drivers/net/ethernet/mellanox/mlx4/intf.c
+++ b/drivers/net/ethernet/mellanox/mlx4/intf.c
@@ -52,7 +52,7 @@ static void mlx4_add_device(struct mlx4_interface *intf, struct mlx4_priv *priv)
{
struct mlx4_device_context *dev_ctx;
- dev_ctx = kmalloc(sizeof *dev_ctx, GFP_KERNEL);
+ dev_ctx = kmalloc(sizeof(*dev_ctx), GFP_KERNEL);
if (!dev_ctx)
return;
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index f1b6d219e445..f58f65ef2f94 100644
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -2294,7 +2294,7 @@ static int mlx4_init_hca(struct mlx4_dev *dev)
dev->caps.rx_checksum_flags_port[2] = params.rx_csum_flags_port_2;
}
priv->eq_table.inta_pin = adapter.inta_pin;
- memcpy(dev->board_id, adapter.board_id, sizeof dev->board_id);
+ memcpy(dev->board_id, adapter.board_id, sizeof(dev->board_id));
return 0;
@@ -2766,7 +2766,7 @@ static void mlx4_enable_msi_x(struct mlx4_dev *dev)
if (nreq > MAX_MSIX)
nreq = MAX_MSIX;
- entries = kcalloc(nreq, sizeof *entries, GFP_KERNEL);
+ entries = kcalloc(nreq, sizeof(*entries), GFP_KERNEL);
if (!entries)
goto no_msi;
diff --git a/drivers/net/ethernet/mellanox/mlx4/mcg.c b/drivers/net/ethernet/mellanox/mlx4/mcg.c
index 1d4e2e054647..bc2365da8922 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mcg.c
+++ b/drivers/net/ethernet/mellanox/mlx4/mcg.c
@@ -163,7 +163,7 @@ static int new_steering_entry(struct mlx4_dev *dev, u8 port,
return -EINVAL;
s_steer = &mlx4_priv(dev)->steer[port - 1];
- new_entry = kzalloc(sizeof *new_entry, GFP_KERNEL);
+ new_entry = kzalloc(sizeof(*new_entry), GFP_KERNEL);
if (!new_entry)
return -ENOMEM;
@@ -176,7 +176,7 @@ static int new_steering_entry(struct mlx4_dev *dev, u8 port,
*/
pqp = get_promisc_qp(dev, port, steer, qpn);
if (pqp) {
- dqp = kmalloc(sizeof *dqp, GFP_KERNEL);
+ dqp = kmalloc(sizeof(*dqp), GFP_KERNEL);
if (!dqp) {
err = -ENOMEM;
goto out_alloc;
@@ -275,7 +275,7 @@ static int existing_steering_entry(struct mlx4_dev *dev, u8 port,
}
/* add the qp as a duplicate on this index */
- dqp = kmalloc(sizeof *dqp, GFP_KERNEL);
+ dqp = kmalloc(sizeof(*dqp), GFP_KERNEL);
if (!dqp)
return -ENOMEM;
dqp->qpn = qpn;
@@ -444,7 +444,7 @@ static int add_promisc_qp(struct mlx4_dev *dev, u8 port,
goto out_mutex;
}
- pqp = kmalloc(sizeof *pqp, GFP_KERNEL);
+ pqp = kmalloc(sizeof(*pqp), GFP_KERNEL);
if (!pqp) {
err = -ENOMEM;
goto out_mutex;
@@ -515,7 +515,7 @@ static int add_promisc_qp(struct mlx4_dev *dev, u8 port,
/* add the new qpn to list of promisc qps */
list_add_tail(&pqp->list, &s_steer->promisc_qps[steer]);
/* now need to add all the promisc qps to default entry */
- memset(mgm, 0, sizeof *mgm);
+ memset(mgm, 0, sizeof(*mgm));
members_count = 0;
list_for_each_entry(dqp, &s_steer->promisc_qps[steer], list) {
if (members_count == dev->caps.num_qp_per_mgm) {
@@ -1137,7 +1137,7 @@ int mlx4_qp_attach_common(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
index += dev->caps.num_mgms;
new_entry = 1;
- memset(mgm, 0, sizeof *mgm);
+ memset(mgm, 0, sizeof(*mgm));
memcpy(mgm->gid, gid, 16);
}
diff --git a/drivers/net/ethernet/mellanox/mlx4/mr.c b/drivers/net/ethernet/mellanox/mlx4/mr.c
index 93195191f45b..0cb3d6a96c3a 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mr.c
+++ b/drivers/net/ethernet/mellanox/mlx4/mr.c
@@ -108,7 +108,7 @@ static int mlx4_buddy_init(struct mlx4_buddy *buddy, int max_order)
buddy->bits = kcalloc(buddy->max_order + 1, sizeof (long *),
GFP_KERNEL);
- buddy->num_free = kcalloc((buddy->max_order + 1), sizeof *buddy->num_free,
+ buddy->num_free = kcalloc((buddy->max_order + 1), sizeof(*buddy->num_free),
GFP_KERNEL);
if (!buddy->bits || !buddy->num_free)
goto err_out;
@@ -796,7 +796,7 @@ int mlx4_buf_write_mtt(struct mlx4_dev *dev, struct mlx4_mtt *mtt,
int err;
int i;
- page_list = kmalloc(buf->npages * sizeof *page_list,
+ page_list = kmalloc(buf->npages * sizeof(*page_list),
gfp);
if (!page_list)
return -ENOMEM;
@@ -1056,7 +1056,7 @@ int mlx4_fmr_alloc(struct mlx4_dev *dev, u32 pd, u32 access, int max_pages,
return -EINVAL;
/* All MTTs must fit in the same page */
- if (max_pages * sizeof *fmr->mtts > PAGE_SIZE)
+ if (max_pages * sizeof(*fmr->mtts) > PAGE_SIZE)
return -EINVAL;
fmr->page_shift = page_shift;
diff --git a/drivers/net/ethernet/mellanox/mlx4/qp.c b/drivers/net/ethernet/mellanox/mlx4/qp.c
index d1cd9c32a9ae..0b9777864df4 100644
--- a/drivers/net/ethernet/mellanox/mlx4/qp.c
+++ b/drivers/net/ethernet/mellanox/mlx4/qp.c
@@ -174,7 +174,7 @@ static int __mlx4_qp_modify(struct mlx4_dev *dev, struct mlx4_mtt *mtt,
cpu_to_be16(mlx4_qp_roce_entropy(dev, qp->qpn));
*(__be32 *) mailbox->buf = cpu_to_be32(optpar);
- memcpy(mailbox->buf + 8, context, sizeof *context);
+ memcpy(mailbox->buf + 8, context, sizeof(*context));
((struct mlx4_qp_context *) (mailbox->buf + 8))->local_qpn =
cpu_to_be32(qp->qpn);
@@ -888,7 +888,7 @@ int mlx4_qp_query(struct mlx4_dev *dev, struct mlx4_qp *qp,
MLX4_CMD_QUERY_QP, MLX4_CMD_TIME_CLASS_A,
MLX4_CMD_WRAPPED);
if (!err)
- memcpy(context, mailbox->buf + 8, sizeof *context);
+ memcpy(context, mailbox->buf + 8, sizeof(*context));
mlx4_free_cmd_mailbox(dev, mailbox);
return err;
diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
index b46dbe29ef6c..21d551191478 100644
--- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
+++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
@@ -981,7 +981,7 @@ static struct res_common *alloc_qp_tr(int id)
{
struct res_qp *ret;
- ret = kzalloc(sizeof *ret, GFP_KERNEL);
+ ret = kzalloc(sizeof(*ret), GFP_KERNEL);
if (!ret)
return NULL;
@@ -999,7 +999,7 @@ static struct res_common *alloc_mtt_tr(int id, int order)
{
struct res_mtt *ret;
- ret = kzalloc(sizeof *ret, GFP_KERNEL);
+ ret = kzalloc(sizeof(*ret), GFP_KERNEL);
if (!ret)
return NULL;
@@ -1015,7 +1015,7 @@ static struct res_common *alloc_mpt_tr(int id, int key)
{
struct res_mpt *ret;
- ret = kzalloc(sizeof *ret, GFP_KERNEL);
+ ret = kzalloc(sizeof(*ret), GFP_KERNEL);
if (!ret)
return NULL;
@@ -1030,7 +1030,7 @@ static struct res_common *alloc_eq_tr(int id)
{
struct res_eq *ret;
- ret = kzalloc(sizeof *ret, GFP_KERNEL);
+ ret = kzalloc(sizeof(*ret), GFP_KERNEL);
if (!ret)
return NULL;
@@ -1044,7 +1044,7 @@ static struct res_common *alloc_cq_tr(int id)
{
struct res_cq *ret;
- ret = kzalloc(sizeof *ret, GFP_KERNEL);
+ ret = kzalloc(sizeof(*ret), GFP_KERNEL);
if (!ret)
return NULL;
@@ -1059,7 +1059,7 @@ static struct res_common *alloc_srq_tr(int id)
{
struct res_srq *ret;
- ret = kzalloc(sizeof *ret, GFP_KERNEL);
+ ret = kzalloc(sizeof(*ret), GFP_KERNEL);
if (!ret)
return NULL;
@@ -1074,7 +1074,7 @@ static struct res_common *alloc_counter_tr(int id, int port)
{
struct res_counter *ret;
- ret = kzalloc(sizeof *ret, GFP_KERNEL);
+ ret = kzalloc(sizeof(*ret), GFP_KERNEL);
if (!ret)
return NULL;
@@ -1089,7 +1089,7 @@ static struct res_common *alloc_xrcdn_tr(int id)
{
struct res_xrcdn *ret;
- ret = kzalloc(sizeof *ret, GFP_KERNEL);
+ ret = kzalloc(sizeof(*ret), GFP_KERNEL);
if (!ret)
return NULL;
@@ -1103,7 +1103,7 @@ static struct res_common *alloc_fs_rule_tr(u64 id, int qpn)
{
struct res_fs_rule *ret;
- ret = kzalloc(sizeof *ret, GFP_KERNEL);
+ ret = kzalloc(sizeof(*ret), GFP_KERNEL);
if (!ret)
return NULL;
@@ -1215,7 +1215,7 @@ static int add_res_range(struct mlx4_dev *dev, int slave, u64 base, int count,
struct mlx4_resource_tracker *tracker = &priv->mfunc.master.res_tracker;
struct rb_root *root = &tracker->res_tree[type];
- res_arr = kzalloc(count * sizeof *res_arr, GFP_KERNEL);
+ res_arr = kzalloc(count * sizeof(*res_arr), GFP_KERNEL);
if (!res_arr)
return -ENOMEM;
@@ -1967,7 +1967,7 @@ static int mac_add_to_slave(struct mlx4_dev *dev, int slave, u64 mac, int port,
if (mlx4_grant_resource(dev, slave, RES_MAC, 1, port))
return -EINVAL;
- res = kzalloc(sizeof *res, GFP_KERNEL);
+ res = kzalloc(sizeof(*res), GFP_KERNEL);
if (!res) {
mlx4_release_resource(dev, slave, RES_MAC, 1, port);
return -ENOMEM;
@@ -3959,7 +3959,7 @@ static int add_mcg_res(struct mlx4_dev *dev, int slave, struct res_qp *rqp,
struct res_gid *res;
int err;
- res = kzalloc(sizeof *res, GFP_KERNEL);
+ res = kzalloc(sizeof(*res), GFP_KERNEL);
if (!res)
return -ENOMEM;
diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c
index 4f345bd4e6e2..e44f50322a3a 100644
--- a/drivers/net/usb/mcs7830.c
+++ b/drivers/net/usb/mcs7830.c
@@ -344,7 +344,7 @@ static void mcs7830_hif_update_multicast_hash(struct usbnet *dev)
{
struct mcs7830_data *data = mcs7830_get_data(dev);
mcs7830_set_reg_async(dev, HIF_REG_MULTICAST_HASH,
- sizeof data->multi_filter,
+ sizeof(data->multi_filter),
data->multi_filter);
}
@@ -361,7 +361,7 @@ static void mcs7830_data_set_multicast(struct net_device *net)
struct usbnet *dev = netdev_priv(net);
struct mcs7830_data *data = mcs7830_get_data(dev);
- memset(data->multi_filter, 0, sizeof data->multi_filter);
+ memset(data->multi_filter, 0, sizeof(data->multi_filter));
data->config = HIF_REG_CONFIG_TXENABLE;
diff --git a/drivers/net/usb/net1080.c b/drivers/net/usb/net1080.c
index 4cbdb1307f3e..3f718c0123c3 100644
--- a/drivers/net/usb/net1080.c
+++ b/drivers/net/usb/net1080.c
@@ -111,7 +111,7 @@ nc_vendor_read(struct usbnet *dev, u8 req, u8 regnum, u16 *retval_ptr)
USB_DIR_IN | USB_TYPE_VENDOR |
USB_RECIP_DEVICE,
0, regnum, retval_ptr,
- sizeof *retval_ptr);
+ sizeof(*retval_ptr));
if (status > 0)
status = 0;
if (!status)
@@ -399,8 +399,8 @@ static int net1080_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
skb_pull(skb, hdr_len);
trailer = (struct nc_trailer *)
- (skb->data + skb->len - sizeof *trailer);
- skb_trim(skb, skb->len - sizeof *trailer);
+ (skb->data + skb->len - sizeof(*trailer));
+ skb_trim(skb, skb->len - sizeof(*trailer));
if ((packet_len & 0x01) == 0) {
if (skb->data [packet_len] != PAD_BYTE) {
@@ -475,15 +475,15 @@ net1080_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
encapsulate:
/* header first */
- header = (struct nc_header *) skb_push(skb, sizeof *header);
- header->hdr_len = cpu_to_le16(sizeof (*header));
+ header = (struct nc_header *) skb_push(skb, sizeof(*header));
+ header->hdr_len = cpu_to_le16(sizeof(*header));
header->packet_len = cpu_to_le16(len);
header->packet_id = cpu_to_le16((u16)dev->xid++);
/* maybe pad; then trailer */
- if (!((skb->len + sizeof *trailer) & 0x01))
+ if (!((skb->len + sizeof(*trailer)) & 0x01))
*skb_put(skb, 1) = PAD_BYTE;
- trailer = (struct nc_trailer *) skb_put(skb, sizeof *trailer);
+ trailer = (struct nc_trailer *) skb_put(skb, sizeof(*trailer));
put_unaligned(header->packet_id, &trailer->packet_id);
#if 0
netdev_dbg(dev->net, "frame >tx h %d p %d id %d\n",
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
index f84080215915..b12728aa5ab7 100644
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
@@ -927,7 +927,7 @@ static inline void pegasus_reset_wol(struct net_device *dev)
{
struct ethtool_wolinfo wol;
- memset(&wol, 0, sizeof wol);
+ memset(&wol, 0, sizeof(wol));
(void) pegasus_set_wol(dev, &wol);
}
diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c
index 524a47a28120..a4c6cc08d221 100644
--- a/drivers/net/usb/rndis_host.c
+++ b/drivers/net/usb/rndis_host.c
@@ -188,14 +188,14 @@ int rndis_command(struct usbnet *dev, struct rndis_msg_hdr *buf, int buflen)
struct rndis_keepalive_c *msg = (void *)buf;
msg->msg_type = cpu_to_le32(RNDIS_MSG_KEEPALIVE_C);
- msg->msg_len = cpu_to_le32(sizeof *msg);
+ msg->msg_len = cpu_to_le32(sizeof(*msg));
msg->status = cpu_to_le32(RNDIS_STATUS_SUCCESS);
retval = usb_control_msg(dev->udev,
usb_sndctrlpipe(dev->udev, 0),
USB_CDC_SEND_ENCAPSULATED_COMMAND,
USB_TYPE_CLASS | USB_RECIP_INTERFACE,
0, master_ifnum,
- msg, sizeof *msg,
+ msg, sizeof(*msg),
RNDIS_CONTROL_TIMEOUT_MS);
if (unlikely(retval < 0))
dev_dbg(&info->control->dev,
@@ -251,9 +251,9 @@ static int rndis_query(struct usbnet *dev, struct usb_interface *intf,
u.buf = buf;
- memset(u.get, 0, sizeof *u.get + in_len);
+ memset(u.get, 0, sizeof(*u.get) + in_len);
u.get->msg_type = cpu_to_le32(RNDIS_MSG_QUERY);
- u.get->msg_len = cpu_to_le32(sizeof *u.get + in_len);
+ u.get->msg_len = cpu_to_le32(sizeof(*u.get) + in_len);
u.get->oid = cpu_to_le32(oid);
u.get->len = cpu_to_le32(in_len);
u.get->offset = cpu_to_le32(20);
@@ -326,7 +326,7 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags)
goto fail;
u.init->msg_type = cpu_to_le32(RNDIS_MSG_INIT);
- u.init->msg_len = cpu_to_le32(sizeof *u.init);
+ u.init->msg_len = cpu_to_le32(sizeof(*u.init));
u.init->major_version = cpu_to_le32(1);
u.init->minor_version = cpu_to_le32(0);
@@ -395,7 +395,7 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags)
/* Check physical medium */
phym = NULL;
- reply_len = sizeof *phym;
+ reply_len = sizeof(*phym);
retval = rndis_query(dev, intf, u.buf,
RNDIS_OID_GEN_PHYSICAL_MEDIUM,
0, (void **) &phym, &reply_len);
@@ -431,13 +431,13 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags)
memcpy(net->dev_addr, bp, ETH_ALEN);
/* set a nonzero filter to enable data transfers */
- memset(u.set, 0, sizeof *u.set);
+ memset(u.set, 0, sizeof(*u.set));
u.set->msg_type = cpu_to_le32(RNDIS_MSG_SET);
- u.set->msg_len = cpu_to_le32(4 + sizeof *u.set);
+ u.set->msg_len = cpu_to_le32(4 + sizeof(*u.set));
u.set->oid = cpu_to_le32(RNDIS_OID_GEN_CURRENT_PACKET_FILTER);
u.set->len = cpu_to_le32(4);
- u.set->offset = cpu_to_le32((sizeof *u.set) - 8);
- *(__le32 *)(u.buf + sizeof *u.set) = cpu_to_le32(RNDIS_DEFAULT_FILTER);
+ u.set->offset = cpu_to_le32((sizeof(*u.set)) - 8);
+ *(__le32 *)(u.buf + sizeof(*u.set)) = cpu_to_le32(RNDIS_DEFAULT_FILTER);
retval = rndis_command(dev, u.header, CONTROL_BUFFER_SIZE);
if (unlikely(retval < 0)) {
@@ -451,9 +451,9 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags)
return retval;
halt_fail_and_release:
- memset(u.halt, 0, sizeof *u.halt);
+ memset(u.halt, 0, sizeof(*u.halt));
u.halt->msg_type = cpu_to_le32(RNDIS_MSG_HALT);
- u.halt->msg_len = cpu_to_le32(sizeof *u.halt);
+ u.halt->msg_len = cpu_to_le32(sizeof(*u.halt));
(void) rndis_command(dev, (void *)u.halt, CONTROL_BUFFER_SIZE);
fail_and_release:
usb_set_intfdata(info->data, NULL);
@@ -478,7 +478,7 @@ void rndis_unbind(struct usbnet *dev, struct usb_interface *intf)
halt = kzalloc(CONTROL_BUFFER_SIZE, GFP_KERNEL);
if (halt) {
halt->msg_type = cpu_to_le32(RNDIS_MSG_HALT);
- halt->msg_len = cpu_to_le32(sizeof *halt);
+ halt->msg_len = cpu_to_le32(sizeof(*halt));
(void) rndis_command(dev, (void *)halt, CONTROL_BUFFER_SIZE);
kfree(halt);
}
@@ -519,7 +519,7 @@ int rndis_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
skb_pull(skb, 8 + data_offset);
/* at most one packet left? */
- if (likely((data_len - skb->len) <= sizeof *hdr)) {
+ if (likely((data_len - skb->len) <= sizeof(*hdr))) {
skb_trim(skb, data_len);
break;
}
@@ -528,7 +528,7 @@ int rndis_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
skb2 = skb_clone(skb, GFP_ATOMIC);
if (unlikely(!skb2))
break;
- skb_pull(skb, msg_len - sizeof *hdr);
+ skb_pull(skb, msg_len - sizeof(*hdr));
skb_trim(skb2, data_len);
usbnet_skb_return(dev, skb2);
}
@@ -549,13 +549,13 @@ rndis_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
int room = skb_headroom(skb);
/* enough head room as-is? */
- if (unlikely((sizeof *hdr) <= room))
+ if (unlikely((sizeof(*hdr)) <= room))
goto fill;
/* enough room, but needs to be readjusted? */
room += skb_tailroom(skb);
- if (likely((sizeof *hdr) <= room)) {
- skb->data = memmove(skb->head + sizeof *hdr,
+ if (likely((sizeof(*hdr)) <= room)) {
+ skb->data = memmove(skb->head + sizeof(*hdr),
skb->data, len);
skb_set_tail_pointer(skb, len);
goto fill;
@@ -563,7 +563,7 @@ rndis_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
}
/* create a new skb, with the correct size (and tailpad) */
- skb2 = skb_copy_expand(skb, sizeof *hdr, 1, flags);
+ skb2 = skb_copy_expand(skb, sizeof(*hdr), 1, flags);
dev_kfree_skb_any(skb);
if (unlikely(!skb2))
return skb2;
@@ -573,8 +573,8 @@ rndis_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
* packets; Linux minimizes wasted bandwidth through tx queues.
*/
fill:
- hdr = (void *) __skb_push(skb, sizeof *hdr);
- memset(hdr, 0, sizeof *hdr);
+ hdr = (void *) __skb_push(skb, sizeof(*hdr));
+ memset(hdr, 0, sizeof(*hdr));
hdr->msg_type = cpu_to_le32(RNDIS_MSG_PACKET);
hdr->msg_len = cpu_to_le32(skb->len);
hdr->data_offset = cpu_to_le32(sizeof(*hdr) - 8);
diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
index a251588762ec..4b3e0c8ecf1c 100644
--- a/drivers/net/usb/sierra_net.c
+++ b/drivers/net/usb/sierra_net.c
@@ -576,7 +576,7 @@ static void sierra_net_status(struct usbnet *dev, struct urb *urb)
dev_dbg(&dev->udev->dev, "%s", __func__);
- if (urb->actual_length < sizeof *event)
+ if (urb->actual_length < sizeof(*event))
return;
/* Add cases to handle other standard notifications. */
@@ -688,7 +688,7 @@ static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf)
return -ENODEV;
}
/* Initialize sierra private data */
- priv = kzalloc(sizeof *priv, GFP_KERNEL);
+ priv = kzalloc(sizeof(*priv), GFP_KERNEL);
if (!priv)
return -ENOMEM;
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 0b0ba7ef14e4..71e509a646a1 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -164,7 +164,7 @@ int usbnet_get_ethernet_addr(struct usbnet *dev, int iMACAddress)
int tmp = -1, ret;
unsigned char buf [13];
- ret = usb_string(dev->udev, iMACAddress, buf, sizeof buf);
+ ret = usb_string(dev->udev, iMACAddress, buf, sizeof(buf));
if (ret == 12)
tmp = hex2bin(dev->net->dev_addr, buf, 6);
if (tmp < 0) {
@@ -1011,11 +1011,11 @@ void usbnet_get_drvinfo (struct net_device *net, struct ethtool_drvinfo *info)
{
struct usbnet *dev = netdev_priv(net);
- strlcpy (info->driver, dev->driver_name, sizeof info->driver);
- strlcpy (info->version, DRIVER_VERSION, sizeof info->version);
+ strlcpy (info->driver, dev->driver_name, sizeof(info->driver));
+ strlcpy (info->version, DRIVER_VERSION, sizeof(info->version));
strlcpy (info->fw_version, dev->driver_info->description,
- sizeof info->fw_version);
- usb_make_path (dev->udev, info->bus_info, sizeof info->bus_info);
+ sizeof(info->fw_version));
+ usb_make_path (dev->udev, info->bus_info, sizeof(info->bus_info));
}
EXPORT_SYMBOL_GPL(usbnet_get_drvinfo);
@@ -1659,7 +1659,7 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
dev->net = net;
strcpy (net->name, "usb%d");
- memcpy (net->dev_addr, node_id, sizeof node_id);
+ memcpy (net->dev_addr, node_id, sizeof(node_id));
/* rx and tx sides can use different message sizes;
* bind() should set rx_urb_size in that case.
diff --git a/drivers/net/usb/zaurus.c b/drivers/net/usb/zaurus.c
index 6aaa6eb9df72..5578dbafa17b 100644
--- a/drivers/net/usb/zaurus.c
+++ b/drivers/net/usb/zaurus.c
@@ -166,7 +166,7 @@ static int blan_mdlm_bind(struct usbnet *dev, struct usb_interface *intf)
goto bad_desc;
}
desc = (void *) buf;
- if (desc->bLength != sizeof *desc) {
+ if (desc->bLength != sizeof(*desc)) {
dev_dbg(&intf->dev, "MDLM len %u\n",
desc->bLength);
goto bad_desc;
@@ -187,11 +187,11 @@ static int blan_mdlm_bind(struct usbnet *dev, struct usb_interface *intf)
detail = (void *) buf;
switch (detail->bGuidDescriptorType) {
case 0: /* "SAFE" */
- if (detail->bLength != (sizeof *detail + 2))
+ if (detail->bLength != (sizeof(*detail) + 2))
goto bad_detail;
break;
case 1: /* "BLAN" */
- if (detail->bLength != (sizeof *detail + 3))
+ if (detail->bLength != (sizeof(*detail) + 3))
goto bad_detail;
break;
default:
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 767ab11a6e9f..3753a7964200 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -264,7 +264,7 @@ static struct sk_buff *page_to_skb(struct virtnet_info *vi,
hdr_len = vi->hdr_len;
if (vi->mergeable_rx_bufs)
- hdr_padded_len = sizeof *hdr;
+ hdr_padded_len = sizeof(*hdr);
else
hdr_padded_len = sizeof(struct padded_vnet_hdr);
diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c
index 8fef8d83436d..d2cb262f5e78 100644
--- a/drivers/net/wan/sbni.c
+++ b/drivers/net/wan/sbni.c
@@ -660,7 +660,7 @@ send_frame( struct net_device *dev )
nl->state |= FL_WAIT_ACK;
}
- outsb( dev->base_addr + DAT, (u8 *)&crc, sizeof crc );
+ outsb( dev->base_addr + DAT, (u8 *)&crc, sizeof(crc));
do_send:
outb( inb( dev->base_addr + CSR0 ) & ~TR_REQ, dev->base_addr + CSR0 );
@@ -1323,7 +1323,7 @@ sbni_ioctl( struct net_device *dev, struct ifreq *ifr, int cmd )
flags.rxl = nl->cur_rxl_index;
flags.fixed_rxl = nl->delta_rxl == 0;
- if (copy_to_user( ifr->ifr_data, &flags, sizeof flags ))
+ if (copy_to_user( ifr->ifr_data, &flags, sizeof(flags)))
error = -EFAULT;
break;
@@ -1352,7 +1352,7 @@ sbni_ioctl( struct net_device *dev, struct ifreq *ifr, int cmd )
if (!capable(CAP_NET_ADMIN))
return -EPERM;
- if (copy_from_user( slave_name, ifr->ifr_data, sizeof slave_name ))
+ if (copy_from_user( slave_name, ifr->ifr_data, sizeof(slave_name)))
return -EFAULT;
slave_dev = dev_get_by_name(&init_net, slave_name );
if( !slave_dev || !(slave_dev->flags & IFF_UP) ) {
diff --git a/drivers/net/wireless/marvell/mwifiex/scan.c b/drivers/net/wireless/marvell/mwifiex/scan.c
index c20017ced566..811b35c76a9a 100644
--- a/drivers/net/wireless/marvell/mwifiex/scan.c
+++ b/drivers/net/wireless/marvell/mwifiex/scan.c
@@ -895,8 +895,7 @@ mwifiex_config_scan(struct mwifiex_private *priv,
wildcard_ssid_tlv->header.type =
cpu_to_le16(TLV_TYPE_WILDCARDSSID);
wildcard_ssid_tlv->header.len = cpu_to_le16(
- (u16) (ssid_len + sizeof(wildcard_ssid_tlv->
- max_ssid_length)));
+ (u16) (ssid_len + sizeof(wildcard_ssid_tlv->max_ssid_length)));
/*
* max_ssid_length = 0 tells firmware to perform
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
index a13d1f2b5912..c55fc0553155 100644
--- a/drivers/net/wireless/rndis_wlan.c
+++ b/drivers/net/wireless/rndis_wlan.c
@@ -729,9 +729,9 @@ static int rndis_query_oid(struct usbnet *dev, u32 oid, void *data, int *len)
mutex_lock(&priv->command_lock);
- memset(u.get, 0, sizeof *u.get);
+ memset(u.get, 0, sizeof(*u.get));
u.get->msg_type = cpu_to_le32(RNDIS_MSG_QUERY);
- u.get->msg_len = cpu_to_le32(sizeof *u.get);
+ u.get->msg_len = cpu_to_le32(sizeof(*u.get));
u.get->oid = cpu_to_le32(oid);
priv->current_command_oid = oid;
@@ -813,7 +813,7 @@ static int rndis_set_oid(struct usbnet *dev, u32 oid, const void *data,
mutex_lock(&priv->command_lock);
- memset(u.set, 0, sizeof *u.set);
+ memset(u.set, 0, sizeof(*u.set));
u.set->msg_type = cpu_to_le32(RNDIS_MSG_SET);
u.set->msg_len = cpu_to_le32(sizeof(*u.set) + len);
u.set->oid = cpu_to_le32(oid);
diff --git a/drivers/oprofile/oprofile_perf.c b/drivers/oprofile/oprofile_perf.c
index d5b2732b1b81..495b145f55d0 100644
--- a/drivers/oprofile/oprofile_perf.c
+++ b/drivers/oprofile/oprofile_perf.c
@@ -146,7 +146,7 @@ static int oprofile_perf_create_files(struct dentry *root)
struct dentry *dir;
char buf[4];
- snprintf(buf, sizeof buf, "%d", i);
+ snprintf(buf, sizeof(buf), "%d", i);
dir = oprofilefs_mkdir(root, buf);
oprofilefs_create_ulong(dir, "enabled", &counter_config[i].enabled);
oprofilefs_create_ulong(dir, "event", &counter_config[i].event);
diff --git a/drivers/parport/parport_serial.c b/drivers/parport/parport_serial.c
index e15b4845f7c6..df9ebe23fe4d 100644
--- a/drivers/parport/parport_serial.c
+++ b/drivers/parport/parport_serial.c
@@ -608,7 +608,7 @@ static int parport_serial_pci_probe(struct pci_dev *dev,
struct parport_serial_private *priv;
int err;
- priv = kzalloc (sizeof *priv, GFP_KERNEL);
+ priv = kzalloc (sizeof(*priv), GFP_KERNEL);
if (!priv)
return -ENOMEM;
pci_set_drvdata (dev, priv);
diff --git a/drivers/parport/probe.c b/drivers/parport/probe.c
index d763bc9e44c1..eacfbf201dfb 100644
--- a/drivers/parport/probe.c
+++ b/drivers/parport/probe.c
@@ -238,7 +238,7 @@ static ssize_t parport_read_device_id (struct parport *port, char *buffer,
while(len2 < idlen && retval > 0) {
char tmp[4];
retval = parport_read (port, tmp,
- min(sizeof tmp, idlen-len2));
+ min(sizeof(tmp), idlen-len2));
if (retval < 0)
return retval;
len2 += retval;
diff --git a/drivers/pcmcia/bfin_cf_pcmcia.c b/drivers/pcmcia/bfin_cf_pcmcia.c
index bba1dcbb8075..1a1532e01296 100644
--- a/drivers/pcmcia/bfin_cf_pcmcia.c
+++ b/drivers/pcmcia/bfin_cf_pcmcia.c
@@ -219,7 +219,7 @@ static int bfin_cf_probe(struct platform_device *pdev)
}
gpio_direction_input(cd_pfx);
- cf = kzalloc(sizeof *cf, GFP_KERNEL);
+ cf = kzalloc(sizeof(*cf), GFP_KERNEL);
if (!cf) {
gpio_free(cd_pfx);
return -ENOMEM;
diff --git a/drivers/pcmcia/omap_cf.c b/drivers/pcmcia/omap_cf.c
index 4e2f501e5548..41ee25f8e9e9 100644
--- a/drivers/pcmcia/omap_cf.c
+++ b/drivers/pcmcia/omap_cf.c
@@ -217,7 +217,7 @@ static int __init omap_cf_probe(struct platform_device *pdev)
if (irq < 0)
return -EINVAL;
- cf = kzalloc(sizeof *cf, GFP_KERNEL);
+ cf = kzalloc(sizeof(*cf), GFP_KERNEL);
if (!cf)
return -ENOMEM;
setup_timer(&cf->timer, omap_cf_timer, (unsigned long)cf);
diff --git a/drivers/rapidio/rio.c b/drivers/rapidio/rio.c
index d7b87c64b7cd..2305e95e067d 100644
--- a/drivers/rapidio/rio.c
+++ b/drivers/rapidio/rio.c
@@ -1871,7 +1871,7 @@ int rio_init_mports(void)
goto no_disc;
}
- work = kcalloc(n, sizeof *work, GFP_KERNEL);
+ work = kcalloc(n, sizeof(*work), GFP_KERNEL);
if (!work) {
pr_err("RIO: no memory for work struct\n");
destroy_workqueue(rio_wq);
diff --git a/drivers/s390/crypto/zcrypt_api.c b/drivers/s390/crypto/zcrypt_api.c
index 5d3d04c040c2..413e9ade9dc6 100644
--- a/drivers/s390/crypto/zcrypt_api.c
+++ b/drivers/s390/crypto/zcrypt_api.c
@@ -1357,10 +1357,10 @@ static int zcrypt_rng_data_read(struct hwrng *rng, u32 *data)
rc = zcrypt_rng((char *) zcrypt_rng_buffer);
if (rc < 0)
return -EIO;
- zcrypt_rng_buffer_index = rc / sizeof *data;
+ zcrypt_rng_buffer_index = rc / sizeof(*data);
}
*data = zcrypt_rng_buffer[--zcrypt_rng_buffer_index];
- return sizeof *data;
+ return sizeof(*data);
}
static struct hwrng zcrypt_rng_dev = {
diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c
index f44d0487236e..eb7d68724fba 100644
--- a/drivers/scsi/aha152x.c
+++ b/drivers/scsi/aha152x.c
@@ -730,7 +730,7 @@ struct Scsi_Host *aha152x_probe_one(struct aha152x_setup *setup)
return NULL;
}
- memset(HOSTDATA(shpnt), 0, sizeof *HOSTDATA(shpnt));
+ memset(HOSTDATA(shpnt), 0, sizeof(*HOSTDATA(shpnt)));
INIT_LIST_HEAD(&HOSTDATA(shpnt)->host_list);
/* need to have host registered before triggering any interrupt */
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index a544366a367e..d04e7bd69d13 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -133,9 +133,9 @@ lpfc_config_port_prep(struct lpfc_hba *phba)
lpfc_read_nv(phba, pmb);
memset((char*)mb->un.varRDnvp.rsvd3, 0,
- sizeof (mb->un.varRDnvp.rsvd3));
+ sizeof(mb->un.varRDnvp.rsvd3));
memcpy((char*)mb->un.varRDnvp.rsvd3, licensed,
- sizeof (licensed));
+ sizeof(licensed));
rc = lpfc_sli_issue_mbox(phba, pmb, MBX_POLL);
@@ -214,7 +214,7 @@ lpfc_config_port_prep(struct lpfc_hba *phba)
if (lpfc_is_LC_HBA(phba->pcidev->device))
memcpy(phba->RandomData, (char *)&mb->un.varWords[24],
- sizeof (phba->RandomData));
+ sizeof(phba->RandomData));
/* Get adapter VPD information */
lpfc_vpd_data = kmalloc(DMP_VPD_SIZE, GFP_KERNEL);
@@ -3496,7 +3496,7 @@ void lpfc_host_attrib_init(struct Scsi_Host *shost)
fc_host_supported_fc4s(shost)[7] = 1;
lpfc_vport_symbolic_node_name(vport, fc_host_symbolic_name(shost),
- sizeof fc_host_symbolic_name(shost));
+ sizeof(fc_host_symbolic_name(shost)));
fc_host_supported_speeds(shost) = 0;
if (phba->lmt & LMT_32Gb)
diff --git a/drivers/scsi/ultrastor.c b/drivers/scsi/ultrastor.c
index 14e0c40a68c9..ad8b6f408d6e 100644
--- a/drivers/scsi/ultrastor.c
+++ b/drivers/scsi/ultrastor.c
@@ -1019,7 +1019,7 @@ static int ultrastor_host_reset(struct scsi_cmnd * SCpnt)
Even bigger deal with new_eh!
*/
- memset((unsigned char *)config.aborted, 0, sizeof config.aborted);
+ memset((unsigned char *)config.aborted, 0, sizeof(config.aborted));
#if ULTRASTOR_MAX_CMDS == 1
config.mscp_busy = 0;
#else
diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c
index 7dbbb29d24c6..3c2149ab6820 100644
--- a/drivers/scsi/virtio_scsi.c
+++ b/drivers/scsi/virtio_scsi.c
@@ -646,7 +646,7 @@ static int virtscsi_tmf(struct virtio_scsi *vscsi, struct virtio_scsi_cmd *cmd)
cmd->comp = ∁
if (virtscsi_kick_cmd(&vscsi->ctrl_vq, cmd,
- sizeof cmd->req.tmf, sizeof cmd->resp.tmf) < 0)
+ sizeof(cmd->req.tmf), sizeof(cmd->resp.tmf)) < 0)
goto out;
wait_for_completion(&comp);
diff --git a/drivers/scsi/vmw_pvscsi.c b/drivers/scsi/vmw_pvscsi.c
index 6164634aff18..a6be9d847427 100644
--- a/drivers/scsi/vmw_pvscsi.c
+++ b/drivers/scsi/vmw_pvscsi.c
@@ -1336,11 +1336,11 @@ static u32 pvscsi_get_max_targets(struct pvscsi_adapter *adapter)
* indicate success.
*/
header = config_page;
- memset(header, 0, sizeof *header);
+ memset(header, 0, sizeof(*header));
header->hostStatus = BTSTAT_INVPARAM;
header->scsiStatus = SDSTAT_CHECK;
- pvscsi_write_cmd_desc(adapter, PVSCSI_CMD_CONFIG, &cmd, sizeof cmd);
+ pvscsi_write_cmd_desc(adapter, PVSCSI_CMD_CONFIG, &cmd, sizeof(cmd));
if (header->hostStatus == BTSTAT_SUCCESS &&
header->scsiStatus == SDSTAT_GOOD) {
diff --git a/drivers/spi/spi-lm70llp.c b/drivers/spi/spi-lm70llp.c
index 61ee0f4269ae..7ac6a4ac41e0 100644
--- a/drivers/spi/spi-lm70llp.c
+++ b/drivers/spi/spi-lm70llp.c
@@ -210,7 +210,7 @@ static void spi_lm70llp_attach(struct parport *p)
* the lm70 driver could verify it, reading the manf ID.
*/
- master = spi_alloc_master(p->physport->dev, sizeof *pp);
+ master = spi_alloc_master(p->physport->dev, sizeof(*pp));
if (!master) {
status = -ENOMEM;
goto out_fail;
diff --git a/drivers/spi/spi-mpc512x-psc.c b/drivers/spi/spi-mpc512x-psc.c
index c3ec46cd9f91..66fb04cb1687 100644
--- a/drivers/spi/spi-mpc512x-psc.c
+++ b/drivers/spi/spi-mpc512x-psc.c
@@ -374,7 +374,7 @@ static int mpc512x_psc_spi_setup(struct spi_device *spi)
return -EINVAL;
if (!cs) {
- cs = kzalloc(sizeof *cs, GFP_KERNEL);
+ cs = kzalloc(sizeof(*cs), GFP_KERNEL);
if (!cs)
return -ENOMEM;
@@ -496,7 +496,7 @@ static int mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr,
void *tempp;
struct clk *clk;
- master = spi_alloc_master(dev, sizeof *mps);
+ master = spi_alloc_master(dev, sizeof(*mps));
if (master == NULL)
return -ENOMEM;
diff --git a/drivers/spi/spi-mpc52xx-psc.c b/drivers/spi/spi-mpc52xx-psc.c
index 72d11ebefb28..5287e1e822df 100644
--- a/drivers/spi/spi-mpc52xx-psc.c
+++ b/drivers/spi/spi-mpc52xx-psc.c
@@ -271,7 +271,7 @@ static int mpc52xx_psc_spi_setup(struct spi_device *spi)
return -EINVAL;
if (!cs) {
- cs = kzalloc(sizeof *cs, GFP_KERNEL);
+ cs = kzalloc(sizeof(*cs), GFP_KERNEL);
if (!cs)
return -ENOMEM;
spi->controller_state = cs;
@@ -371,7 +371,7 @@ static int mpc52xx_psc_spi_do_probe(struct device *dev, u32 regaddr,
struct spi_master *master;
int ret;
- master = spi_alloc_master(dev, sizeof *mps);
+ master = spi_alloc_master(dev, sizeof(*mps));
if (master == NULL)
return -ENOMEM;
diff --git a/drivers/spi/spi-mpc52xx.c b/drivers/spi/spi-mpc52xx.c
index c36002110c30..fb044c8ad098 100644
--- a/drivers/spi/spi-mpc52xx.c
+++ b/drivers/spi/spi-mpc52xx.c
@@ -414,7 +414,7 @@ static int mpc52xx_spi_probe(struct platform_device *op)
}
dev_dbg(&op->dev, "allocating spi_master struct\n");
- master = spi_alloc_master(&op->dev, sizeof *ms);
+ master = spi_alloc_master(&op->dev, sizeof(*ms));
if (!master) {
rc = -ENOMEM;
goto err_alloc;
diff --git a/drivers/spi/spi-omap-uwire.c b/drivers/spi/spi-omap-uwire.c
index ce8dbdbce312..d46a67099212 100644
--- a/drivers/spi/spi-omap-uwire.c
+++ b/drivers/spi/spi-omap-uwire.c
@@ -453,7 +453,7 @@ static int uwire_probe(struct platform_device *pdev)
struct uwire_spi *uwire;
int status;
- master = spi_alloc_master(&pdev->dev, sizeof *uwire);
+ master = spi_alloc_master(&pdev->dev, sizeof(*uwire));
if (!master)
return -ENODEV;
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index 7273820275e9..cf1fb5f7fed9 100644
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -1014,7 +1014,7 @@ static int omap2_mcspi_setup(struct spi_device *spi)
mcspi_dma = &mcspi->dma_channels[spi->chip_select];
if (!cs) {
- cs = kzalloc(sizeof *cs, GFP_KERNEL);
+ cs = kzalloc(sizeof(*cs), GFP_KERNEL);
if (!cs)
return -ENOMEM;
cs->base = mcspi->base + spi->chip_select * 0x14;
@@ -1362,7 +1362,7 @@ static int omap2_mcspi_probe(struct platform_device *pdev)
struct device_node *node = pdev->dev.of_node;
const struct of_device_id *match;
- master = spi_alloc_master(&pdev->dev, sizeof *mcspi);
+ master = spi_alloc_master(&pdev->dev, sizeof(*mcspi));
if (master == NULL) {
dev_dbg(&pdev->dev, "master allocation failed\n");
return -ENOMEM;
diff --git a/drivers/spi/spi-ppc4xx.c b/drivers/spi/spi-ppc4xx.c
index dd3d0a218d8b..2b45048e15ef 100644
--- a/drivers/spi/spi-ppc4xx.c
+++ b/drivers/spi/spi-ppc4xx.c
@@ -230,7 +230,7 @@ static int spi_ppc4xx_setup(struct spi_device *spi)
}
if (cs == NULL) {
- cs = kzalloc(sizeof *cs, GFP_KERNEL);
+ cs = kzalloc(sizeof(*cs), GFP_KERNEL);
if (!cs)
return -ENOMEM;
spi->controller_state = cs;
@@ -391,7 +391,7 @@ static int spi_ppc4xx_of_probe(struct platform_device *op)
int num_gpios;
const unsigned int *clk;
- master = spi_alloc_master(dev, sizeof *hw);
+ master = spi_alloc_master(dev, sizeof(*hw));
if (master == NULL)
return -ENOMEM;
master->dev.of_node = np;
diff --git a/drivers/staging/most/hdm-dim2/dim2_hdm.c b/drivers/staging/most/hdm-dim2/dim2_hdm.c
index 327d738c7194..33984bcfb411 100644
--- a/drivers/staging/most/hdm-dim2/dim2_hdm.c
+++ b/drivers/staging/most/hdm-dim2/dim2_hdm.c
@@ -70,7 +70,7 @@ static DECLARE_TASKLET(dim2_tasklet, dim2_tasklet_fn, 0);
* @data_type: channel data type
*/
struct hdm_channel {
- char name[sizeof "caNNN"];
+ char name[sizeof("caNNN")];
bool is_initialized;
struct dim_channel ch;
struct list_head pending_list; /* before dim_enqueue_buffer() */
@@ -98,7 +98,7 @@ struct dim2_hdm {
struct hdm_channel hch[DMA_CHANNELS];
struct most_channel_capability capabilities[DMA_CHANNELS];
struct most_interface most_iface;
- char name[16 + sizeof "dim2-"];
+ char name[16 + sizeof("dim2-")];
void *io_base;
unsigned int irq_ahb0;
int clk_speed;
diff --git a/drivers/staging/rdma/ehca/ehca_qp.c b/drivers/staging/rdma/ehca/ehca_qp.c
index 896c01f810f6..b7e0b51b91ee 100644
--- a/drivers/staging/rdma/ehca/ehca_qp.c
+++ b/drivers/staging/rdma/ehca/ehca_qp.c
@@ -903,7 +903,7 @@ static struct ehca_qp *internal_create_qp(
resp.fw_handle_ofs = (u32)
(my_qp->galpas.user.fw_handle & (PAGE_SIZE - 1));
- if (ib_copy_to_udata(udata, &resp, sizeof resp)) {
+ if (ib_copy_to_udata(udata, &resp, sizeof(resp))) {
ehca_err(pd->device, "Copy to udata failed");
ret = -EINVAL;
goto create_qp_exit8;
diff --git a/drivers/staging/rdma/ehca/ehca_uverbs.c b/drivers/staging/rdma/ehca/ehca_uverbs.c
index 1a1d5d99fcf9..7017302c49ec 100644
--- a/drivers/staging/rdma/ehca/ehca_uverbs.c
+++ b/drivers/staging/rdma/ehca/ehca_uverbs.c
@@ -53,7 +53,7 @@ struct ib_ucontext *ehca_alloc_ucontext(struct ib_device *device,
{
struct ehca_ucontext *my_context;
- my_context = kzalloc(sizeof *my_context, GFP_KERNEL);
+ my_context = kzalloc(sizeof(*my_context), GFP_KERNEL);
if (!my_context) {
ehca_err(device, "Out of memory device=%p", device);
return ERR_PTR(-ENOMEM);
diff --git a/drivers/staging/rdma/ipath/ipath_driver.c b/drivers/staging/rdma/ipath/ipath_driver.c
index 2ab22f98e3ba..59c4f397b8e1 100644
--- a/drivers/staging/rdma/ipath/ipath_driver.c
+++ b/drivers/staging/rdma/ipath/ipath_driver.c
@@ -55,7 +55,7 @@ static void ipath_update_pio_bufs(struct ipath_devdata *);
const char *ipath_get_unit_name(int unit)
{
static char iname[16];
- snprintf(iname, sizeof iname, "infinipath%u", unit);
+ snprintf(iname, sizeof(iname), "infinipath%u", unit);
return iname;
}
@@ -1121,7 +1121,7 @@ static void ipath_rcv_hdrerr(struct ipath_devdata *dd,
{
char emsg[128];
- get_rhf_errstring(eflags, emsg, sizeof emsg);
+ get_rhf_errstring(eflags, emsg, sizeof(emsg));
ipath_cdbg(PKT, "RHFerrs %x hdrqtail=%x typ=%u "
"tlen=%x opcode=%x egridx=%x: %s\n",
eflags, l,
diff --git a/drivers/staging/rdma/ipath/ipath_eeprom.c b/drivers/staging/rdma/ipath/ipath_eeprom.c
index ef84107c7ce0..0bbf2071f0da 100644
--- a/drivers/staging/rdma/ipath/ipath_eeprom.c
+++ b/drivers/staging/rdma/ipath/ipath_eeprom.c
@@ -814,18 +814,18 @@ void ipath_get_eeprom_info(struct ipath_devdata *dd)
* elsewhere for backward-compatibility.
*/
char *snp = dd->ipath_serial;
- memcpy(snp, ifp->if_sprefix, sizeof ifp->if_sprefix);
- snp[sizeof ifp->if_sprefix] = '\0';
+ memcpy(snp, ifp->if_sprefix, sizeof(ifp->if_sprefix));
+ snp[sizeof(ifp->if_sprefix)] = '\0';
len = strlen(snp);
snp += len;
- len = (sizeof dd->ipath_serial) - len;
- if (len > sizeof ifp->if_serial) {
- len = sizeof ifp->if_serial;
+ len = (sizeof(dd->ipath_serial)) - len;
+ if (len > sizeof(ifp->if_serial)) {
+ len = sizeof(ifp->if_serial);
}
memcpy(snp, ifp->if_serial, len);
} else
memcpy(dd->ipath_serial, ifp->if_serial,
- sizeof ifp->if_serial);
+ sizeof(ifp->if_serial));
if (!strstr(ifp->if_comment, "Tested successfully"))
ipath_dev_err(dd, "Board SN %s did not pass functional "
"test: %s\n", dd->ipath_serial,
diff --git a/drivers/staging/rdma/ipath/ipath_file_ops.c b/drivers/staging/rdma/ipath/ipath_file_ops.c
index 6187b848b3ca..e51a66d71085 100644
--- a/drivers/staging/rdma/ipath/ipath_file_ops.c
+++ b/drivers/staging/rdma/ipath/ipath_file_ops.c
@@ -474,7 +474,7 @@ static int ipath_tid_update(struct ipath_portdata *pd, struct file *fp,
goto cleanup;
}
if (copy_to_user((void __user *) (unsigned long) ti->tidmap,
- tidmap, sizeof tidmap)) {
+ tidmap, sizeof(tidmap))) {
ret = -EFAULT;
goto cleanup;
}
@@ -525,7 +525,7 @@ static int ipath_tid_free(struct ipath_portdata *pd, unsigned subport,
}
if (copy_from_user(tidmap, (void __user *)(unsigned long)ti->tidmap,
- sizeof tidmap)) {
+ sizeof(tidmap))) {
ret = -EFAULT;
goto done;
}
diff --git a/drivers/staging/rdma/ipath/ipath_fs.c b/drivers/staging/rdma/ipath/ipath_fs.c
index 476fcdf05acb..1349c7e5d8b5 100644
--- a/drivers/staging/rdma/ipath/ipath_fs.c
+++ b/drivers/staging/rdma/ipath/ipath_fs.c
@@ -98,7 +98,7 @@ static ssize_t atomic_stats_read(struct file *file, char __user *buf,
size_t count, loff_t *ppos)
{
return simple_read_from_buffer(buf, count, ppos, &ipath_stats,
- sizeof ipath_stats);
+ sizeof(ipath_stats));
}
static const struct file_operations atomic_stats_ops = {
@@ -116,7 +116,7 @@ static ssize_t atomic_counters_read(struct file *file, char __user *buf,
dd->ipath_f_read_counters(dd, &counters);
return simple_read_from_buffer(buf, count, ppos, &counters,
- sizeof counters);
+ sizeof(counters));
}
static const struct file_operations atomic_counters_ops = {
@@ -229,7 +229,7 @@ static int create_device_files(struct super_block *sb,
char unit[10];
int ret;
- snprintf(unit, sizeof unit, "%02d", dd->ipath_unit);
+ snprintf(unit, sizeof(unit), "%02d", dd->ipath_unit);
ret = create_file(unit, S_IFDIR|S_IRUGO|S_IXUGO, sb->s_root, &dir,
&simple_dir_operations, dd);
if (ret) {
@@ -296,7 +296,7 @@ static int remove_device_files(struct super_block *sb,
root = dget(sb->s_root);
inode_lock(d_inode(root));
- snprintf(unit, sizeof unit, "%02d", dd->ipath_unit);
+ snprintf(unit, sizeof(unit), "%02d", dd->ipath_unit);
dir = lookup_one_len(unit, root, strlen(unit));
if (IS_ERR(dir)) {
diff --git a/drivers/staging/rdma/ipath/ipath_iba6110.c b/drivers/staging/rdma/ipath/ipath_iba6110.c
index 5f13572a5e24..62af0f497c71 100644
--- a/drivers/staging/rdma/ipath/ipath_iba6110.c
+++ b/drivers/staging/rdma/ipath/ipath_iba6110.c
@@ -409,7 +409,7 @@ static void hwerr_crcbits(struct ipath_devdata *dd, ipath_err_t hwerrs,
*/
if (crcbits) {
u16 ctrl0, ctrl1;
- snprintf(bitsmsg, sizeof bitsmsg,
+ snprintf(bitsmsg, sizeof(bitsmsg),
"[HT%s lane %s CRC (%llx); powercycle to completely clear]",
!(crcbits & _IPATH_HTLINK1_CRCBITS) ?
"0 (A)" : (!(crcbits & _IPATH_HTLINK0_CRCBITS)
@@ -589,7 +589,7 @@ static void ipath_ht_handle_hwerrors(struct ipath_devdata *dd, char *msg,
bits = (u32) ((hwerrs >>
INFINIPATH_HWE_HTCMEMPARITYERR_SHIFT) &
INFINIPATH_HWE_HTCMEMPARITYERR_MASK);
- snprintf(bitsmsg, sizeof bitsmsg, "[HTC Parity Errs %x] ",
+ snprintf(bitsmsg, sizeof(bitsmsg), "[HTC Parity Errs %x] ",
bits);
strlcat(msg, bitsmsg, msgl);
}
@@ -618,7 +618,7 @@ static void ipath_ht_handle_hwerrors(struct ipath_devdata *dd, char *msg,
INFINIPATH_HWE_HTAPLL_RFSLIP)
if (hwerrs & _IPATH_PLL_FAIL) {
- snprintf(bitsmsg, sizeof bitsmsg,
+ snprintf(bitsmsg, sizeof(bitsmsg),
"[PLL failed (%llx), InfiniPath hardware unusable]",
(unsigned long long) (hwerrs & _IPATH_PLL_FAIL));
strlcat(msg, bitsmsg, msgl);
diff --git a/drivers/staging/rdma/ipath/ipath_init_chip.c b/drivers/staging/rdma/ipath/ipath_init_chip.c
index a5eea199f733..05f353217e25 100644
--- a/drivers/staging/rdma/ipath/ipath_init_chip.c
+++ b/drivers/staging/rdma/ipath/ipath_init_chip.c
@@ -641,7 +641,7 @@ static int init_housekeeping(struct ipath_devdata *dd, int reinit)
INFINIPATH_R_BOARDID_SHIFT) &
INFINIPATH_R_BOARDID_MASK);
- ret = dd->ipath_f_get_boardname(dd, boardn, sizeof boardn);
+ ret = dd->ipath_f_get_boardname(dd, boardn, sizeof(boardn));
snprintf(dd->ipath_boardversion, sizeof(dd->ipath_boardversion),
"ChipABI %u.%u, %s, InfiniPath%u %u.%u, PCI %u, "
diff --git a/drivers/staging/rdma/ipath/ipath_intr.c b/drivers/staging/rdma/ipath/ipath_intr.c
index 0403fa28ed8d..17a8ef85994f 100644
--- a/drivers/staging/rdma/ipath/ipath_intr.c
+++ b/drivers/staging/rdma/ipath/ipath_intr.c
@@ -532,7 +532,7 @@ static void handle_sdma_errors(struct ipath_devdata *dd, ipath_err_t errs)
if (ipath_debug & __IPATH_DBG) {
char msg[128];
- ipath_decode_err(dd, msg, sizeof msg, errs &
+ ipath_decode_err(dd, msg, sizeof(msg), errs &
INFINIPATH_E_SDMAERRS);
ipath_dbg("errors %lx (%s)\n", (unsigned long)errs, msg);
}
@@ -642,13 +642,13 @@ static int handle_errors(struct ipath_devdata *dd, ipath_err_t errs)
*/
errs &= dd->ipath_errormask & ~dd->ipath_maskederrs;
- supp_msgs = handle_frequent_errors(dd, errs, msg, (u32)sizeof msg,
+ supp_msgs = handle_frequent_errors(dd, errs, msg, (u32)sizeof(msg),
&noprint);
/* do these first, they are most important */
if (errs & INFINIPATH_E_HARDWARE) {
/* reuse same msg buf */
- dd->ipath_f_handle_hwerrors(dd, msg, sizeof msg);
+ dd->ipath_f_handle_hwerrors(dd, msg, sizeof(msg));
} else {
u64 mask;
for (log_idx = 0; log_idx < IPATH_EEP_LOG_CNT; ++log_idx) {
@@ -695,7 +695,7 @@ static int handle_errors(struct ipath_devdata *dd, ipath_err_t errs)
dd->ipath_errormask &= ~dd->ipath_maskederrs;
ipath_write_kreg(dd, dd->ipath_kregs->kr_errormask,
dd->ipath_errormask);
- s_iserr = ipath_decode_err(dd, msg, sizeof msg,
+ s_iserr = ipath_decode_err(dd, msg, sizeof(msg),
dd->ipath_maskederrs);
if (dd->ipath_maskederrs &
@@ -780,7 +780,7 @@ static int handle_errors(struct ipath_devdata *dd, ipath_err_t errs)
if (ipath_debug & __IPATH_DBG)
mask &= ~INFINIPATH_E_SDMADISABLED;
- ipath_decode_err(dd, msg, sizeof msg, errs & ~mask);
+ ipath_decode_err(dd, msg, sizeof(msg), errs & ~mask);
} else
/* so we don't need if (!noprint) at strlcat's below */
*msg = 0;
diff --git a/drivers/staging/rdma/ipath/ipath_mmap.c b/drivers/staging/rdma/ipath/ipath_mmap.c
index e73274229404..7dc1dc9b99fb 100644
--- a/drivers/staging/rdma/ipath/ipath_mmap.c
+++ b/drivers/staging/rdma/ipath/ipath_mmap.c
@@ -134,7 +134,7 @@ struct ipath_mmap_info *ipath_create_mmap_info(struct ipath_ibdev *dev,
void *obj) {
struct ipath_mmap_info *ip;
- ip = kmalloc(sizeof *ip, GFP_KERNEL);
+ ip = kmalloc(sizeof(*ip), GFP_KERNEL);
if (!ip)
goto bail;
diff --git a/drivers/staging/rdma/ipath/ipath_mr.c b/drivers/staging/rdma/ipath/ipath_mr.c
index b76b0ce66709..b80bb6c08aca 100644
--- a/drivers/staging/rdma/ipath/ipath_mr.c
+++ b/drivers/staging/rdma/ipath/ipath_mr.c
@@ -65,7 +65,7 @@ struct ib_mr *ipath_get_dma_mr(struct ib_pd *pd, int acc)
struct ipath_mr *mr;
struct ib_mr *ret;
- mr = kzalloc(sizeof *mr, GFP_KERNEL);
+ mr = kzalloc(sizeof(*mr), GFP_KERNEL);
if (!mr) {
ret = ERR_PTR(-ENOMEM);
goto bail;
@@ -86,13 +86,13 @@ static struct ipath_mr *alloc_mr(int count,
/* Allocate struct plus pointers to first level page tables. */
m = (count + IPATH_SEGSZ - 1) / IPATH_SEGSZ;
- mr = kmalloc(sizeof *mr + m * sizeof mr->mr.map[0], GFP_KERNEL);
+ mr = kmalloc(sizeof(*mr) + m * sizeof(mr->mr.map[0]), GFP_KERNEL);
if (!mr)
goto done;
/* Allocate first level page tables. */
for (; i < m; i++) {
- mr->mr.map[i] = kmalloc(sizeof *mr->mr.map[0], GFP_KERNEL);
+ mr->mr.map[i] = kmalloc(sizeof(*mr->mr.map[0]), GFP_KERNEL);
if (!mr->mr.map[i])
goto bail;
}
@@ -233,13 +233,13 @@ struct ib_fmr *ipath_alloc_fmr(struct ib_pd *pd, int mr_access_flags,
/* Allocate struct plus pointers to first level page tables. */
m = (fmr_attr->max_pages + IPATH_SEGSZ - 1) / IPATH_SEGSZ;
- fmr = kmalloc(sizeof *fmr + m * sizeof fmr->mr.map[0], GFP_KERNEL);
+ fmr = kmalloc(sizeof(*fmr) + m * sizeof(fmr->mr.map[0]), GFP_KERNEL);
if (!fmr)
goto bail;
/* Allocate first level page tables. */
for (; i < m; i++) {
- fmr->mr.map[i] = kmalloc(sizeof *fmr->mr.map[0],
+ fmr->mr.map[i] = kmalloc(sizeof(*fmr->mr.map[0]),
GFP_KERNEL);
if (!fmr->mr.map[i])
goto bail;
diff --git a/drivers/staging/rdma/ipath/ipath_rc.c b/drivers/staging/rdma/ipath/ipath_rc.c
index d4aa53574e57..dfbbaf074f05 100644
--- a/drivers/staging/rdma/ipath/ipath_rc.c
+++ b/drivers/staging/rdma/ipath/ipath_rc.c
@@ -948,7 +948,7 @@ static int do_rc_ack(struct ipath_qp *qp, u32 aeth, u32 psn, int opcode,
/* Post a send completion queue entry if requested. */
if (!(qp->s_flags & IPATH_S_SIGNAL_REQ_WR) ||
(wqe->wr.send_flags & IB_SEND_SIGNALED)) {
- memset(&wc, 0, sizeof wc);
+ memset(&wc, 0, sizeof(wc));
wc.wr_id = wqe->wr.wr_id;
wc.status = IB_WC_SUCCESS;
wc.opcode = ib_ipath_wc_opcode[wqe->wr.opcode];
@@ -1665,7 +1665,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
break;
}
- memset(&wc, 0, sizeof wc);
+ memset(&wc, 0, sizeof(wc));
/* OK, process the packet. */
switch (opcode) {
diff --git a/drivers/staging/rdma/ipath/ipath_ruc.c b/drivers/staging/rdma/ipath/ipath_ruc.c
index e541a01f1f61..95aee4184c00 100644
--- a/drivers/staging/rdma/ipath/ipath_ruc.c
+++ b/drivers/staging/rdma/ipath/ipath_ruc.c
@@ -321,7 +321,7 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
goto serr;
}
- memset(&wc, 0, sizeof wc);
+ memset(&wc, 0, sizeof(wc));
send_status = IB_WC_SUCCESS;
sqp->s_sge.sge = wqe->sg_list[0];
@@ -709,7 +709,7 @@ void ipath_send_complete(struct ipath_qp *qp, struct ipath_swqe *wqe,
status != IB_WC_SUCCESS) {
struct ib_wc wc;
- memset(&wc, 0, sizeof wc);
+ memset(&wc, 0, sizeof(wc));
wc.wr_id = wqe->wr.wr_id;
wc.status = status;
wc.opcode = ib_ipath_wc_opcode[wqe->wr.opcode];
diff --git a/drivers/staging/rdma/ipath/ipath_stats.c b/drivers/staging/rdma/ipath/ipath_stats.c
index f63e143e3292..d3ceaa6d6583 100644
--- a/drivers/staging/rdma/ipath/ipath_stats.c
+++ b/drivers/staging/rdma/ipath/ipath_stats.c
@@ -148,13 +148,13 @@ static void ipath_qcheck(struct ipath_devdata *dd)
*buf = 0;
if (pd->port_hdrqfull != dd->ipath_p0_hdrqfull) {
- blen = snprintf(buf, sizeof buf, "port 0 hdrqfull %u",
+ blen = snprintf(buf, sizeof(buf), "port 0 hdrqfull %u",
pd->port_hdrqfull -
dd->ipath_p0_hdrqfull);
dd->ipath_p0_hdrqfull = pd->port_hdrqfull;
}
if (ipath_stats.sps_etidfull != dd->ipath_last_tidfull) {
- blen += snprintf(buf + blen, sizeof buf - blen,
+ blen += snprintf(buf + blen, sizeof(buf) - blen,
"%srcvegrfull %llu",
blen ? ", " : "",
(unsigned long long)
@@ -172,7 +172,7 @@ static void ipath_qcheck(struct ipath_devdata *dd)
if ((ipath_debug & (__IPATH_PKTDBG | __IPATH_DBG)) &&
ipath_stats.sps_hdrqfull != last_tot_hdrqfull) {
- blen += snprintf(buf + blen, sizeof buf - blen,
+ blen += snprintf(buf + blen, sizeof(buf) - blen,
"%shdrqfull %llu (all ports)",
blen ? ", " : "",
(unsigned long long)
@@ -300,7 +300,7 @@ void ipath_get_faststats(unsigned long opaque)
&& time_after(jiffies, dd->ipath_unmasktime)) {
char ebuf[256];
int iserr;
- iserr = ipath_decode_err(dd, ebuf, sizeof ebuf,
+ iserr = ipath_decode_err(dd, ebuf, sizeof(ebuf),
dd->ipath_maskederrs);
if (dd->ipath_maskederrs &
~(INFINIPATH_E_RRCVEGRFULL | INFINIPATH_E_RRCVHDRFULL |
diff --git a/drivers/staging/rdma/ipath/ipath_sysfs.c b/drivers/staging/rdma/ipath/ipath_sysfs.c
index b12b1f6caf59..2e4444a425e6 100644
--- a/drivers/staging/rdma/ipath/ipath_sysfs.c
+++ b/drivers/staging/rdma/ipath/ipath_sysfs.c
@@ -361,8 +361,8 @@ static ssize_t show_serial(struct device *dev,
{
struct ipath_devdata *dd = dev_get_drvdata(dev);
- buf[sizeof dd->ipath_serial] = '\0';
- memcpy(buf, dd->ipath_serial, sizeof dd->ipath_serial);
+ buf[sizeof(dd->ipath_serial)] = '\0';
+ memcpy(buf, dd->ipath_serial, sizeof(dd->ipath_serial));
strcat(buf, "\n");
return strlen(buf);
}
diff --git a/drivers/staging/rdma/ipath/ipath_uc.c b/drivers/staging/rdma/ipath/ipath_uc.c
index 0246b30280b9..a91ed22713b2 100644
--- a/drivers/staging/rdma/ipath/ipath_uc.c
+++ b/drivers/staging/rdma/ipath/ipath_uc.c
@@ -282,7 +282,7 @@ void ipath_uc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
*/
opcode = be32_to_cpu(ohdr->bth[0]) >> 24;
- memset(&wc, 0, sizeof wc);
+ memset(&wc, 0, sizeof(wc));
/* Compare the PSN verses the expected PSN. */
if (unlikely(ipath_cmp24(psn, qp->r_psn) != 0)) {
diff --git a/drivers/staging/rdma/ipath/ipath_ud.c b/drivers/staging/rdma/ipath/ipath_ud.c
index 385d9410a51e..088d2b7cdd90 100644
--- a/drivers/staging/rdma/ipath/ipath_ud.c
+++ b/drivers/staging/rdma/ipath/ipath_ud.c
@@ -89,7 +89,7 @@ static void ipath_ud_loopback(struct ipath_qp *sqp, struct ipath_swqe *swqe)
* present on the wire.
*/
length = swqe->length;
- memset(&wc, 0, sizeof wc);
+ memset(&wc, 0, sizeof(wc));
wc.byte_len = length + sizeof(struct ib_grh);
if (swqe->wr.opcode == IB_WR_SEND_WITH_IMM) {
diff --git a/drivers/staging/rdma/ipath/ipath_verbs.c b/drivers/staging/rdma/ipath/ipath_verbs.c
index 53f9dcab180d..8c2dc23941f5 100644
--- a/drivers/staging/rdma/ipath/ipath_verbs.c
+++ b/drivers/staging/rdma/ipath/ipath_verbs.c
@@ -1729,7 +1729,7 @@ static struct ib_pd *ipath_alloc_pd(struct ib_device *ibdev,
* we allow allocations of more than we report for this value.
*/
- pd = kmalloc(sizeof *pd, GFP_KERNEL);
+ pd = kmalloc(sizeof(*pd), GFP_KERNEL);
if (!pd) {
ret = ERR_PTR(-ENOMEM);
goto bail;
@@ -1803,7 +1803,7 @@ static struct ib_ah *ipath_create_ah(struct ib_pd *pd,
goto bail;
}
- ah = kmalloc(sizeof *ah, GFP_ATOMIC);
+ ah = kmalloc(sizeof(*ah), GFP_ATOMIC);
if (!ah) {
ret = ERR_PTR(-ENOMEM);
goto bail;
@@ -1918,7 +1918,7 @@ static struct ib_ucontext *ipath_alloc_ucontext(struct ib_device *ibdev,
struct ipath_ucontext *context;
struct ib_ucontext *ret;
- context = kmalloc(sizeof *context, GFP_KERNEL);
+ context = kmalloc(sizeof(*context), GFP_KERNEL);
if (!context) {
ret = ERR_PTR(-ENOMEM);
goto bail;
@@ -2028,7 +2028,7 @@ int ipath_register_ib_device(struct ipath_devdata *dd)
unsigned i;
int ret;
- idev = (struct ipath_ibdev *)ib_alloc_device(sizeof *idev);
+ idev = (struct ipath_ibdev *)ib_alloc_device(sizeof(*idev));
if (idev == NULL) {
ret = -ENOMEM;
goto bail;
@@ -2037,7 +2037,7 @@ int ipath_register_ib_device(struct ipath_devdata *dd)
dev = &idev->ibdev;
if (dd->ipath_sdma_descq_cnt) {
- tx = kmalloc_array(dd->ipath_sdma_descq_cnt, sizeof *tx,
+ tx = kmalloc_array(dd->ipath_sdma_descq_cnt, sizeof(*tx),
GFP_KERNEL);
if (tx == NULL) {
ret = -ENOMEM;
diff --git a/drivers/staging/rdma/ipath/ipath_verbs_mcast.c b/drivers/staging/rdma/ipath/ipath_verbs_mcast.c
index 72d476fa5b8f..dfba8010a276 100644
--- a/drivers/staging/rdma/ipath/ipath_verbs_mcast.c
+++ b/drivers/staging/rdma/ipath/ipath_verbs_mcast.c
@@ -53,7 +53,7 @@ static struct ipath_mcast_qp *ipath_mcast_qp_alloc(struct ipath_qp *qp)
{
struct ipath_mcast_qp *mqp;
- mqp = kmalloc(sizeof *mqp, GFP_KERNEL);
+ mqp = kmalloc(sizeof(*mqp), GFP_KERNEL);
if (!mqp)
goto bail;
@@ -85,7 +85,7 @@ static struct ipath_mcast *ipath_mcast_alloc(union ib_gid *mgid)
{
struct ipath_mcast *mcast;
- mcast = kmalloc(sizeof *mcast, GFP_KERNEL);
+ mcast = kmalloc(sizeof(*mcast), GFP_KERNEL);
if (!mcast)
goto bail;
diff --git a/drivers/target/target_core_spc.c b/drivers/target/target_core_spc.c
index 0aa47babd16c..59e79597b1e4 100644
--- a/drivers/target/target_core_spc.c
+++ b/drivers/target/target_core_spc.c
@@ -1261,7 +1261,7 @@ sense_reason_t spc_emulate_report_luns(struct se_cmd *cmd)
if (buf) {
len = cpu_to_be32(lun_count * 8);
- memcpy(buf, &len, min_t(int, sizeof len, cmd->data_length));
+ memcpy(buf, &len, min_t(int, sizeof(len), cmd->data_length));
transport_kunmap_data_sg(cmd);
}
diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
index b3110040164a..783ef215ade4 100644
--- a/drivers/tty/pty.c
+++ b/drivers/tty/pty.c
@@ -388,8 +388,8 @@ static int pty_common_install(struct tty_driver *driver, struct tty_struct *tty,
if (driver->subtype != PTY_TYPE_MASTER)
return -EIO;
- ports[0] = kmalloc(sizeof **ports, GFP_KERNEL);
- ports[1] = kmalloc(sizeof **ports, GFP_KERNEL);
+ ports[0] = kmalloc(sizeof(**ports), GFP_KERNEL);
+ ports[1] = kmalloc(sizeof(**ports), GFP_KERNEL);
if (!ports[0] || !ports[1])
goto err;
if (!try_module_get(driver->other->owner)) {
diff --git a/drivers/tty/serial/8250/8250_of.c b/drivers/tty/serial/8250/8250_of.c
index 33021c1f7d55..9418e6641d5a 100644
--- a/drivers/tty/serial/8250/8250_of.c
+++ b/drivers/tty/serial/8250/8250_of.c
@@ -62,7 +62,7 @@ static int of_platform_serial_setup(struct platform_device *ofdev,
u32 clk, spd, prop;
int ret;
- memset(port, 0, sizeof *port);
+ memset(port, 0, sizeof(*port));
if (of_property_read_u32(np, "clock-frequency", &clk)) {
/* Get clk rate through clk driver if present */
diff --git a/drivers/tty/serial/crisv10.c b/drivers/tty/serial/crisv10.c
index f13f2ebd215b..99c459d9169b 100644
--- a/drivers/tty/serial/crisv10.c
+++ b/drivers/tty/serial/crisv10.c
@@ -1635,7 +1635,7 @@ alloc_recv_buffer(unsigned int size)
{
struct etrax_recv_buffer *buffer;
- buffer = kmalloc(sizeof *buffer + size, GFP_ATOMIC);
+ buffer = kmalloc(sizeof(*buffer) + size, GFP_ATOMIC);
if (!buffer)
return NULL;
@@ -1695,7 +1695,7 @@ static unsigned int handle_descr_data(struct e100_serial *info,
struct etrax_dma_descr *descr,
unsigned int recvl)
{
- struct etrax_recv_buffer *buffer = phys_to_virt(descr->buf) - sizeof *buffer;
+ struct etrax_recv_buffer *buffer = phys_to_virt(descr->buf) - sizeof(*buffer);
if (info->recv_cnt + recvl > 65536) {
printk(KERN_WARNING
@@ -2764,7 +2764,7 @@ shutdown(struct e100_serial * info)
for (i = 0; i < SERIAL_RECV_DESCRIPTORS; i++)
if (descr[i].buf) {
- buffer = phys_to_virt(descr[i].buf) - sizeof *buffer;
+ buffer = phys_to_virt(descr[i].buf) - sizeof(*buffer);
kfree(buffer);
descr[i].buf = 0;
}
diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c
index 97d5a74558a3..9d8105740351 100644
--- a/drivers/tty/vt/vt_ioctl.c
+++ b/drivers/tty/vt/vt_ioctl.c
@@ -264,7 +264,7 @@ do_unimap_ioctl(int cmd, struct unimapdesc __user *user_ud, int perm, struct vc_
{
struct unimapdesc tmp;
- if (copy_from_user(&tmp, user_ud, sizeof tmp))
+ if (copy_from_user(&tmp, user_ud, sizeof(tmp)))
return -EFAULT;
if (tmp.entries)
if (!access_ok(VERIFY_WRITE, tmp.entries,
@@ -1173,7 +1173,7 @@ compat_unimap_ioctl(unsigned int cmd, struct compat_unimapdesc __user *user_ud,
struct compat_unimapdesc tmp;
struct unipair __user *tmp_entries;
- if (copy_from_user(&tmp, user_ud, sizeof tmp))
+ if (copy_from_user(&tmp, user_ud, sizeof(tmp)))
return -EFAULT;
tmp_entries = compat_ptr(tmp.entries);
if (tmp_entries)
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index fa4e23930614..db4541d7b706 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -154,7 +154,7 @@ static inline int acm_set_control(struct acm *acm, int control)
}
#define acm_set_line(acm, line) \
- acm_ctrl_msg(acm, USB_CDC_REQ_SET_LINE_CODING, 0, line, sizeof *(line))
+ acm_ctrl_msg(acm, USB_CDC_REQ_SET_LINE_CODING, 0, line, sizeof(*(line)))
#define acm_send_break(acm, ms) \
acm_ctrl_msg(acm, USB_CDC_REQ_SEND_BREAK, ms, NULL, 0)
@@ -1008,8 +1008,8 @@ static void acm_tty_set_termios(struct tty_struct *tty,
if (newctrl != acm->ctrlout)
acm_set_control(acm, acm->ctrlout = newctrl);
- if (memcmp(&acm->line, &newline, sizeof newline)) {
- memcpy(&acm->line, &newline, sizeof newline);
+ if (memcmp(&acm->line, &newline, sizeof(newline))) {
+ memcpy(&acm->line, &newline, sizeof(newline));
dev_dbg(&acm->control->dev, "%s - set line: %d %d %d %d\n",
__func__,
le32_to_cpu(newline.dwDTERate),
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index df0e3b92533a..cd71c5ffbd67 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -448,7 +448,7 @@ rh_string(int id, struct usb_hcd const *hcd, u8 *data, unsigned len)
break;
case 3:
/* Manufacturer */
- snprintf (buf, sizeof buf, "%s %s %s", init_utsname()->sysname,
+ snprintf (buf, sizeof(buf), "%s %s %s", init_utsname()->sysname,
init_utsname()->release, hcd->driver->description);
s = buf;
break;
@@ -581,16 +581,16 @@ static int rh_call_control (struct usb_hcd *hcd, struct urb *urb)
case HCD_USB31:
case HCD_USB3:
bufp = ss_rh_config_descriptor;
- len = sizeof ss_rh_config_descriptor;
+ len = sizeof(ss_rh_config_descriptor);
break;
case HCD_USB25:
case HCD_USB2:
bufp = hs_rh_config_descriptor;
- len = sizeof hs_rh_config_descriptor;
+ len = sizeof(hs_rh_config_descriptor);
break;
case HCD_USB11:
bufp = fs_rh_config_descriptor;
- len = sizeof fs_rh_config_descriptor;
+ len = sizeof(fs_rh_config_descriptor);
break;
default:
goto error;
@@ -1059,7 +1059,7 @@ static int register_root_hub(struct usb_hcd *hcd)
usb_dev->devnum = devnum;
usb_dev->bus->devnum_next = devnum + 1;
memset (&usb_dev->bus->devmap.devicemap, 0,
- sizeof usb_dev->bus->devmap.devicemap);
+ sizeof(usb_dev->bus->devmap.devicemap));
set_bit (devnum, usb_dev->bus->devmap.devicemap);
usb_set_device_state(usb_dev, USB_STATE_ADDRESS);
@@ -1067,7 +1067,7 @@ static int register_root_hub(struct usb_hcd *hcd)
usb_dev->ep0.desc.wMaxPacketSize = cpu_to_le16(64);
retval = usb_get_device_descriptor(usb_dev, USB_DT_DEVICE_SIZE);
- if (retval != sizeof usb_dev->descriptor) {
+ if (retval != sizeof(usb_dev->descriptor)) {
mutex_unlock(&usb_bus_list_lock);
dev_dbg (parent_dev, "can't read %s device descriptor %d\n",
dev_name(&usb_dev->dev), retval);
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 350dcd9af5d8..3c44b620e2d2 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -799,7 +799,7 @@ int usb_hub_clear_tt_buffer(struct urb *urb)
* since each TT has "at least two" buffers that can need it (and
* there can be many TTs per hub). even if they're uncommon.
*/
- clear = kmalloc(sizeof *clear, GFP_ATOMIC);
+ clear = kmalloc(sizeof(*clear), GFP_ATOMIC);
if (clear == NULL) {
dev_err(&udev->dev, "can't save CLEAR_TT_BUFFER state\n");
/* FIXME recover somehow ... RESET_TT? */
@@ -3723,7 +3723,7 @@ static int usb_req_set_sel(struct usb_device *udev, enum usb3_link_state state)
* which may be initiated by an error path of a mass storage driver.
* Therefore, use GFP_NOIO.
*/
- sel_values = kmalloc(sizeof *(sel_values), GFP_NOIO);
+ sel_values = kmalloc(sizeof(*(sel_values)), GFP_NOIO);
if (!sel_values)
return -ENOMEM;
@@ -3736,7 +3736,7 @@ static int usb_req_set_sel(struct usb_device *udev, enum usb3_link_state state)
USB_REQ_SET_SEL,
USB_RECIP_DEVICE,
0, 0,
- sel_values, sizeof *(sel_values),
+ sel_values, sizeof(*(sel_values)),
USB_CTRL_SET_TIMEOUT);
kfree(sel_values);
return ret;
@@ -4601,13 +4601,13 @@ check_highspeed(struct usb_hub *hub, struct usb_device *udev, int port1)
if (udev->quirks & USB_QUIRK_DEVICE_QUALIFIER)
return;
- qual = kmalloc(sizeof *qual, GFP_KERNEL);
+ qual = kmalloc(sizeof(*qual), GFP_KERNEL);
if (qual == NULL)
return;
status = usb_get_descriptor(udev, USB_DT_DEVICE_QUALIFIER, 0,
- qual, sizeof *qual);
- if (status == sizeof *qual) {
+ qual, sizeof(*qual));
+ if (status == sizeof(*qual)) {
dev_info(&udev->dev, "not running at top speed; "
"connect to a high speed hub\n");
/* hub LEDs are probably harder to miss than syslog */
diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
index 65b6e6b84043..881c934cdd58 100644
--- a/drivers/usb/core/sysfs.c
+++ b/drivers/usb/core/sysfs.c
@@ -428,11 +428,11 @@ static ssize_t level_store(struct device *dev, struct device_attribute *attr,
usb_lock_device(udev);
- if (len == sizeof on_string - 1 &&
+ if (len == sizeof(on_string) - 1 &&
strncmp(buf, on_string, len) == 0)
usb_disable_autosuspend(udev);
- else if (len == sizeof auto_string - 1 &&
+ else if (len == sizeof(auto_string) - 1 &&
strncmp(buf, auto_string, len) == 0)
usb_enable_autosuspend(udev);
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index ebb29caa3fe4..73d57a4c7d87 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -475,12 +475,12 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
} else {
/* match any labeling on the hubs; it's one-based */
if (parent->devpath[0] == '0') {
- snprintf(dev->devpath, sizeof dev->devpath,
+ snprintf(dev->devpath, sizeof(dev->devpath),
"%d", port1);
/* Root ports are not counted in route string */
dev->route = 0;
} else {
- snprintf(dev->devpath, sizeof dev->devpath,
+ snprintf(dev->devpath, sizeof(dev->devpath),
"%s.%d", parent->devpath, port1);
/* Route string assumes hubs have less than 16 ports */
if (port1 < 15)
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 8b14c2a13ac5..563848bdd6e8 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -1002,8 +1002,7 @@ static int get_string(struct usb_composite_dev *cdev,
struct usb_os_string *b = buf;
b->bLength = sizeof(*b);
b->bDescriptorType = USB_DT_STRING;
- compiletime_assert(
- sizeof(b->qwSignature) == sizeof(cdev->qw_sign),
+ compiletime_assert(sizeof(b->qwSignature) == sizeof(cdev->qw_sign),
"qwSignature size must be equal to qw_sign");
memcpy(&b->qwSignature, cdev->qw_sign, sizeof(b->qwSignature));
b->bMS_VendorCode = cdev->b_vendor_code;
@@ -1508,7 +1507,7 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
cdev->desc.bcdUSB = cpu_to_le16(0x0200);
}
- value = min(w_length, (u16) sizeof cdev->desc);
+ value = min(w_length, (u16) sizeof(cdev->desc));
memcpy(req->buf, &cdev->desc, value);
break;
case USB_DT_DEVICE_QUALIFIER:
@@ -2067,7 +2066,7 @@ static int composite_bind(struct usb_gadget *gadget,
struct usb_composite_driver *composite = to_cdriver(gdriver);
int status = -ENOMEM;
- cdev = kzalloc(sizeof *cdev, GFP_KERNEL);
+ cdev = kzalloc(sizeof(*cdev), GFP_KERNEL);
if (!cdev)
return status;
diff --git a/drivers/usb/gadget/function/f_acm.c b/drivers/usb/gadget/function/f_acm.c
index 2fa1e80a3ce7..9d428b992114 100644
--- a/drivers/usb/gadget/function/f_acm.c
+++ b/drivers/usb/gadget/function/f_acm.c
@@ -95,7 +95,7 @@ static inline struct f_acm *port_to_acm(struct gserial *p)
static struct usb_interface_assoc_descriptor
acm_iad_descriptor = {
- .bLength = sizeof acm_iad_descriptor,
+ .bLength = sizeof(acm_iad_descriptor),
.bDescriptorType = USB_DT_INTERFACE_ASSOCIATION,
/* .bFirstInterface = DYNAMIC, */
@@ -252,7 +252,7 @@ static struct usb_endpoint_descriptor acm_ss_out_desc = {
};
static struct usb_ss_ep_comp_descriptor acm_ss_bulk_comp_desc = {
- .bLength = sizeof acm_ss_bulk_comp_desc,
+ .bLength = sizeof(acm_ss_bulk_comp_desc),
.bDescriptorType = USB_DT_SS_ENDPOINT_COMP,
};
diff --git a/drivers/usb/gadget/function/f_ecm.c b/drivers/usb/gadget/function/f_ecm.c
index 7ad60ee41914..f46f9b7f71df 100644
--- a/drivers/usb/gadget/function/f_ecm.c
+++ b/drivers/usb/gadget/function/f_ecm.c
@@ -102,7 +102,7 @@ static inline unsigned ecm_bitrate(struct usb_gadget *g)
static struct usb_interface_assoc_descriptor
ecm_iad_descriptor = {
- .bLength = sizeof ecm_iad_descriptor,
+ .bLength = sizeof(ecm_iad_descriptor),
.bDescriptorType = USB_DT_INTERFACE_ASSOCIATION,
/* .bFirstInterface = DYNAMIC, */
@@ -115,7 +115,7 @@ ecm_iad_descriptor = {
static struct usb_interface_descriptor ecm_control_intf = {
- .bLength = sizeof ecm_control_intf,
+ .bLength = sizeof(ecm_control_intf),
.bDescriptorType = USB_DT_INTERFACE,
/* .bInterfaceNumber = DYNAMIC */
@@ -128,7 +128,7 @@ static struct usb_interface_descriptor ecm_control_intf = {
};
static struct usb_cdc_header_desc ecm_header_desc = {
- .bLength = sizeof ecm_header_desc,
+ .bLength = sizeof(ecm_header_desc),
.bDescriptorType = USB_DT_CS_INTERFACE,
.bDescriptorSubType = USB_CDC_HEADER_TYPE,
@@ -144,7 +144,7 @@ static struct usb_cdc_union_desc ecm_union_desc = {
};
static struct usb_cdc_ether_desc ecm_desc = {
- .bLength = sizeof ecm_desc,
+ .bLength = sizeof(ecm_desc),
.bDescriptorType = USB_DT_CS_INTERFACE,
.bDescriptorSubType = USB_CDC_ETHERNET_TYPE,
@@ -159,7 +159,7 @@ static struct usb_cdc_ether_desc ecm_desc = {
/* the default data interface has no endpoints ... */
static struct usb_interface_descriptor ecm_data_nop_intf = {
- .bLength = sizeof ecm_data_nop_intf,
+ .bLength = sizeof(ecm_data_nop_intf),
.bDescriptorType = USB_DT_INTERFACE,
.bInterfaceNumber = 1,
@@ -174,7 +174,7 @@ static struct usb_interface_descriptor ecm_data_nop_intf = {
/* ... but the "real" data interface has two bulk endpoints */
static struct usb_interface_descriptor ecm_data_intf = {
- .bLength = sizeof ecm_data_intf,
+ .bLength = sizeof(ecm_data_intf),
.bDescriptorType = USB_DT_INTERFACE,
.bInterfaceNumber = 1,
@@ -295,7 +295,7 @@ static struct usb_endpoint_descriptor ss_ecm_notify_desc = {
};
static struct usb_ss_ep_comp_descriptor ss_ecm_intr_comp_desc = {
- .bLength = sizeof ss_ecm_intr_comp_desc,
+ .bLength = sizeof(ss_ecm_intr_comp_desc),
.bDescriptorType = USB_DT_SS_ENDPOINT_COMP,
/* the following 3 values can be tweaked if necessary */
@@ -323,7 +323,7 @@ static struct usb_endpoint_descriptor ss_ecm_out_desc = {
};
static struct usb_ss_ep_comp_descriptor ss_ecm_bulk_comp_desc = {
- .bLength = sizeof ss_ecm_bulk_comp_desc,
+ .bLength = sizeof(ss_ecm_bulk_comp_desc),
.bDescriptorType = USB_DT_SS_ENDPOINT_COMP,
/* the following 2 values can be tweaked if necessary */
@@ -399,7 +399,7 @@ static void ecm_do_notify(struct f_ecm *ecm)
else
event->wValue = cpu_to_le16(0);
event->wLength = 0;
- req->length = sizeof *event;
+ req->length = sizeof(*event);
DBG(cdev, "notify connect %s\n",
ecm->is_open ? "true" : "false");
@@ -413,7 +413,7 @@ static void ecm_do_notify(struct f_ecm *ecm)
req->length = ECM_STATUS_BYTECOUNT;
/* SPEED_CHANGE data is up/down speeds in bits/sec */
- data = req->buf + sizeof *event;
+ data = req->buf + sizeof(*event);
data[0] = cpu_to_le32(ecm_bitrate(cdev->gadget));
data[1] = data[0];
diff --git a/drivers/usb/gadget/function/f_eem.c b/drivers/usb/gadget/function/f_eem.c
index cad35a502d3f..35c78be4cb1a 100644
--- a/drivers/usb/gadget/function/f_eem.c
+++ b/drivers/usb/gadget/function/f_eem.c
@@ -44,7 +44,7 @@ static inline struct f_eem *func_to_eem(struct usb_function *f)
/* interface descriptor: */
static struct usb_interface_descriptor eem_intf = {
- .bLength = sizeof eem_intf,
+ .bLength = sizeof(eem_intf),
.bDescriptorType = USB_DT_INTERFACE,
/* .bInterfaceNumber = DYNAMIC */
@@ -130,7 +130,7 @@ static struct usb_endpoint_descriptor eem_ss_out_desc = {
};
static struct usb_ss_ep_comp_descriptor eem_ss_bulk_comp_desc = {
- .bLength = sizeof eem_ss_bulk_comp_desc,
+ .bLength = sizeof(eem_ss_bulk_comp_desc),
.bDescriptorType = USB_DT_SS_ENDPOINT_COMP,
/* the following 2 values can be tweaked if necessary */
diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
index cf43e9e18368..f27cb5216b17 100644
--- a/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
@@ -402,7 +402,7 @@ static ssize_t __ffs_ep0_read_events(struct ffs_data *ffs, char __user *buf,
* we reserve.
*/
struct usb_functionfs_event events[ARRAY_SIZE(ffs->ev.types)];
- const size_t size = n * sizeof *events;
+ const size_t size = n * sizeof(*events);
unsigned i = 0;
memset(events, 0, size);
@@ -418,7 +418,7 @@ static ssize_t __ffs_ep0_read_events(struct ffs_data *ffs, char __user *buf,
ffs->ev.count -= n;
if (ffs->ev.count)
memmove(ffs->ev.types, ffs->ev.types + n,
- ffs->ev.count * sizeof *ffs->ev.types);
+ ffs->ev.count * sizeof(*ffs->ev.types));
spin_unlock_irq(&ffs->ev.waitq.lock);
mutex_unlock(&ffs->mutex);
@@ -1440,7 +1440,7 @@ static void ffs_data_closed(struct ffs_data *ffs)
static struct ffs_data *ffs_data_new(void)
{
- struct ffs_data *ffs = kzalloc(sizeof *ffs, GFP_KERNEL);
+ struct ffs_data *ffs = kzalloc(sizeof(*ffs), GFP_KERNEL);
if (unlikely(!ffs))
return NULL;
@@ -1765,7 +1765,7 @@ static int __must_check ffs_do_single_desc(char *data, unsigned len,
case USB_DT_INTERFACE: {
struct usb_interface_descriptor *ds = (void *)_ds;
pr_vdebug("interface descriptor\n");
- if (length != sizeof *ds)
+ if (length != sizeof(*ds))
goto inv_length;
__entity(INTERFACE, ds->bInterfaceNumber);
@@ -1798,7 +1798,7 @@ static int __must_check ffs_do_single_desc(char *data, unsigned len,
case USB_DT_INTERFACE_ASSOCIATION: {
struct usb_interface_assoc_descriptor *ds = (void *)_ds;
pr_vdebug("interface association descriptor\n");
- if (length != sizeof *ds)
+ if (length != sizeof(*ds))
goto inv_length;
if (ds->iFunction)
__entity(STRING, ds->iFunction);
diff --git a/drivers/usb/gadget/function/f_hid.c b/drivers/usb/gadget/function/f_hid.c
index 99285b416308..72e11ecf59e3 100644
--- a/drivers/usb/gadget/function/f_hid.c
+++ b/drivers/usb/gadget/function/f_hid.c
@@ -77,7 +77,7 @@ static inline struct f_hidg *func_to_hidg(struct usb_function *f)
/* Static descriptors */
static struct usb_interface_descriptor hidg_interface_desc = {
- .bLength = sizeof hidg_interface_desc,
+ .bLength = sizeof(hidg_interface_desc),
.bDescriptorType = USB_DT_INTERFACE,
/* .bInterfaceNumber = DYNAMIC */
.bAlternateSetting = 0,
@@ -89,7 +89,7 @@ static struct usb_interface_descriptor hidg_interface_desc = {
};
static struct hid_descriptor hidg_desc = {
- .bLength = sizeof hidg_desc,
+ .bLength = sizeof(hidg_desc),
.bDescriptorType = HID_DT_HID,
.bcdHID = 0x0101,
.bCountryCode = 0x00,
diff --git a/drivers/usb/gadget/function/f_loopback.c b/drivers/usb/gadget/function/f_loopback.c
index ddc3aad886b7..552cf8edfa44 100644
--- a/drivers/usb/gadget/function/f_loopback.c
+++ b/drivers/usb/gadget/function/f_loopback.c
@@ -433,7 +433,7 @@ static struct usb_function *loopback_alloc(struct usb_function_instance *fi)
struct f_loopback *loop;
struct f_lb_opts *lb_opts;
- loop = kzalloc(sizeof *loop, GFP_KERNEL);
+ loop = kzalloc(sizeof(*loop), GFP_KERNEL);
if (!loop)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/usb/gadget/function/f_mass_storage.c b/drivers/usb/gadget/function/f_mass_storage.c
index 223ccf89d226..c2e38e2b4df9 100644
--- a/drivers/usb/gadget/function/f_mass_storage.c
+++ b/drivers/usb/gadget/function/f_mass_storage.c
@@ -1107,7 +1107,7 @@ static int do_inquiry(struct fsg_common *common, struct fsg_buffhd *bh)
buf[5] = 0; /* No special options */
buf[6] = 0;
buf[7] = 0;
- memcpy(buf + 8, common->inquiry_string, sizeof common->inquiry_string);
+ memcpy(buf + 8, common->inquiry_string, sizeof(common->inquiry_string));
return 36;
}
diff --git a/drivers/usb/gadget/function/f_ncm.c b/drivers/usb/gadget/function/f_ncm.c
index 7ad798ace1e5..432dc9aab308 100644
--- a/drivers/usb/gadget/function/f_ncm.c
+++ b/drivers/usb/gadget/function/f_ncm.c
@@ -146,7 +146,7 @@ static struct usb_cdc_ncm_ntb_parameters ntb_parameters = {
#define NCM_STATUS_BYTECOUNT 16 /* 8 byte header + data */
static struct usb_interface_assoc_descriptor ncm_iad_desc = {
- .bLength = sizeof ncm_iad_desc,
+ .bLength = sizeof(ncm_iad_desc),
.bDescriptorType = USB_DT_INTERFACE_ASSOCIATION,
/* .bFirstInterface = DYNAMIC, */
@@ -160,7 +160,7 @@ static struct usb_interface_assoc_descriptor ncm_iad_desc = {
/* interface descriptor: */
static struct usb_interface_descriptor ncm_control_intf = {
- .bLength = sizeof ncm_control_intf,
+ .bLength = sizeof(ncm_control_intf),
.bDescriptorType = USB_DT_INTERFACE,
/* .bInterfaceNumber = DYNAMIC */
@@ -172,7 +172,7 @@ static struct usb_interface_descriptor ncm_control_intf = {
};
static struct usb_cdc_header_desc ncm_header_desc = {
- .bLength = sizeof ncm_header_desc,
+ .bLength = sizeof(ncm_header_desc),
.bDescriptorType = USB_DT_CS_INTERFACE,
.bDescriptorSubType = USB_CDC_HEADER_TYPE,
@@ -188,7 +188,7 @@ static struct usb_cdc_union_desc ncm_union_desc = {
};
static struct usb_cdc_ether_desc ecm_desc = {
- .bLength = sizeof ecm_desc,
+ .bLength = sizeof(ecm_desc),
.bDescriptorType = USB_DT_CS_INTERFACE,
.bDescriptorSubType = USB_CDC_ETHERNET_TYPE,
@@ -203,7 +203,7 @@ static struct usb_cdc_ether_desc ecm_desc = {
#define NCAPS (USB_CDC_NCM_NCAP_ETH_FILTER | USB_CDC_NCM_NCAP_CRC_MODE)
static struct usb_cdc_ncm_desc ncm_desc = {
- .bLength = sizeof ncm_desc,
+ .bLength = sizeof(ncm_desc),
.bDescriptorType = USB_DT_CS_INTERFACE,
.bDescriptorSubType = USB_CDC_NCM_TYPE,
@@ -215,7 +215,7 @@ static struct usb_cdc_ncm_desc ncm_desc = {
/* the default data interface has no endpoints ... */
static struct usb_interface_descriptor ncm_data_nop_intf = {
- .bLength = sizeof ncm_data_nop_intf,
+ .bLength = sizeof(ncm_data_nop_intf),
.bDescriptorType = USB_DT_INTERFACE,
.bInterfaceNumber = 1,
@@ -230,7 +230,7 @@ static struct usb_interface_descriptor ncm_data_nop_intf = {
/* ... but the "real" data interface has two bulk endpoints */
static struct usb_interface_descriptor ncm_data_intf = {
- .bLength = sizeof ncm_data_intf,
+ .bLength = sizeof(ncm_data_intf),
.bDescriptorType = USB_DT_INTERFACE,
.bInterfaceNumber = 1,
@@ -495,7 +495,7 @@ static void ncm_do_notify(struct f_ncm *ncm)
else
event->wValue = cpu_to_le16(0);
event->wLength = 0;
- req->length = sizeof *event;
+ req->length = sizeof(*event);
DBG(cdev, "notify connect %s\n",
ncm->is_open ? "true" : "false");
@@ -509,7 +509,7 @@ static void ncm_do_notify(struct f_ncm *ncm)
req->length = NCM_STATUS_BYTECOUNT;
/* SPEED_CHANGE data is up/down speeds in bits/sec */
- data = req->buf + sizeof *event;
+ data = req->buf + sizeof(*event);
data[0] = cpu_to_le32(ncm_bitrate(cdev->gadget));
data[1] = data[0];
@@ -657,8 +657,8 @@ static int ncm_setup(struct usb_function *f, const struct usb_ctrlrequest *ctrl)
if (w_length == 0 || w_value != 0 || w_index != ncm->ctrl_id)
goto invalid;
- value = w_length > sizeof ntb_parameters ?
- sizeof ntb_parameters : w_length;
+ value = w_length > sizeof(ntb_parameters) ?
+ sizeof(ntb_parameters) : w_length;
memcpy(req->buf, &ntb_parameters, value);
VDBG(cdev, "Host asked NTB parameters\n");
break;
diff --git a/drivers/usb/gadget/function/f_phonet.c b/drivers/usb/gadget/function/f_phonet.c
index 157441dbfeba..ce43237367eb 100644
--- a/drivers/usb/gadget/function/f_phonet.c
+++ b/drivers/usb/gadget/function/f_phonet.c
@@ -68,7 +68,7 @@ static inline struct f_phonet *func_to_pn(struct usb_function *f)
static struct usb_interface_descriptor
pn_control_intf_desc = {
- .bLength = sizeof pn_control_intf_desc,
+ .bLength = sizeof(pn_control_intf_desc),
.bDescriptorType = USB_DT_INTERFACE,
/* .bInterfaceNumber = DYNAMIC, */
@@ -78,7 +78,7 @@ pn_control_intf_desc = {
static const struct usb_cdc_header_desc
pn_header_desc = {
- .bLength = sizeof pn_header_desc,
+ .bLength = sizeof(pn_header_desc),
.bDescriptorType = USB_DT_CS_INTERFACE,
.bDescriptorSubType = USB_CDC_HEADER_TYPE,
.bcdCDC = cpu_to_le16(0x0110),
@@ -86,7 +86,7 @@ pn_header_desc = {
static const struct usb_cdc_header_desc
pn_phonet_desc = {
- .bLength = sizeof pn_phonet_desc,
+ .bLength = sizeof(pn_phonet_desc),
.bDescriptorType = USB_DT_CS_INTERFACE,
.bDescriptorSubType = USB_CDC_PHONET_TYPE,
.bcdCDC = cpu_to_le16(0x1505), /* ??? */
@@ -94,7 +94,7 @@ pn_phonet_desc = {
static struct usb_cdc_union_desc
pn_union_desc = {
- .bLength = sizeof pn_union_desc,
+ .bLength = sizeof(pn_union_desc),
.bDescriptorType = USB_DT_CS_INTERFACE,
.bDescriptorSubType = USB_CDC_UNION_TYPE,
@@ -104,7 +104,7 @@ pn_union_desc = {
static struct usb_interface_descriptor
pn_data_nop_intf_desc = {
- .bLength = sizeof pn_data_nop_intf_desc,
+ .bLength = sizeof(pn_data_nop_intf_desc),
.bDescriptorType = USB_DT_INTERFACE,
/* .bInterfaceNumber = DYNAMIC, */
@@ -115,7 +115,7 @@ pn_data_nop_intf_desc = {
static struct usb_interface_descriptor
pn_data_intf_desc = {
- .bLength = sizeof pn_data_intf_desc,
+ .bLength = sizeof(pn_data_intf_desc),
.bDescriptorType = USB_DT_INTERFACE,
/* .bInterfaceNumber = DYNAMIC, */
diff --git a/drivers/usb/gadget/function/f_rndis.c b/drivers/usb/gadget/function/f_rndis.c
index e587767e374c..9720c7e229da 100644
--- a/drivers/usb/gadget/function/f_rndis.c
+++ b/drivers/usb/gadget/function/f_rndis.c
@@ -111,7 +111,7 @@ static unsigned int bitrate(struct usb_gadget *g)
/* interface descriptor: */
static struct usb_interface_descriptor rndis_control_intf = {
- .bLength = sizeof rndis_control_intf,
+ .bLength = sizeof(rndis_control_intf),
.bDescriptorType = USB_DT_INTERFACE,
/* .bInterfaceNumber = DYNAMIC */
@@ -124,7 +124,7 @@ static struct usb_interface_descriptor rndis_control_intf = {
};
static struct usb_cdc_header_desc header_desc = {
- .bLength = sizeof header_desc,
+ .bLength = sizeof(header_desc),
.bDescriptorType = USB_DT_CS_INTERFACE,
.bDescriptorSubType = USB_CDC_HEADER_TYPE,
@@ -132,7 +132,7 @@ static struct usb_cdc_header_desc header_desc = {
};
static struct usb_cdc_call_mgmt_descriptor call_mgmt_descriptor = {
- .bLength = sizeof call_mgmt_descriptor,
+ .bLength = sizeof(call_mgmt_descriptor),
.bDescriptorType = USB_DT_CS_INTERFACE,
.bDescriptorSubType = USB_CDC_CALL_MANAGEMENT_TYPE,
@@ -141,7 +141,7 @@ static struct usb_cdc_call_mgmt_descriptor call_mgmt_descriptor = {
};
static struct usb_cdc_acm_descriptor rndis_acm_descriptor = {
- .bLength = sizeof rndis_acm_descriptor,
+ .bLength = sizeof(rndis_acm_descriptor),
.bDescriptorType = USB_DT_CS_INTERFACE,
.bDescriptorSubType = USB_CDC_ACM_TYPE,
@@ -159,7 +159,7 @@ static struct usb_cdc_union_desc rndis_union_desc = {
/* the data interface has two bulk endpoints */
static struct usb_interface_descriptor rndis_data_intf = {
- .bLength = sizeof rndis_data_intf,
+ .bLength = sizeof(rndis_data_intf),
.bDescriptorType = USB_DT_INTERFACE,
/* .bInterfaceNumber = DYNAMIC */
@@ -173,7 +173,7 @@ static struct usb_interface_descriptor rndis_data_intf = {
static struct usb_interface_assoc_descriptor
rndis_iad_descriptor = {
- .bLength = sizeof rndis_iad_descriptor,
+ .bLength = sizeof(rndis_iad_descriptor),
.bDescriptorType = USB_DT_INTERFACE_ASSOCIATION,
.bFirstInterface = 0, /* XXX, hardcoded */
@@ -291,7 +291,7 @@ static struct usb_endpoint_descriptor ss_notify_desc = {
};
static struct usb_ss_ep_comp_descriptor ss_intr_comp_desc = {
- .bLength = sizeof ss_intr_comp_desc,
+ .bLength = sizeof(ss_intr_comp_desc),
.bDescriptorType = USB_DT_SS_ENDPOINT_COMP,
/* the following 3 values can be tweaked if necessary */
@@ -319,7 +319,7 @@ static struct usb_endpoint_descriptor ss_out_desc = {
};
static struct usb_ss_ep_comp_descriptor ss_bulk_comp_desc = {
- .bLength = sizeof ss_bulk_comp_desc,
+ .bLength = sizeof(ss_bulk_comp_desc),
.bDescriptorType = USB_DT_SS_ENDPOINT_COMP,
/* the following 2 values can be tweaked if necessary */
diff --git a/drivers/usb/gadget/function/f_serial.c b/drivers/usb/gadget/function/f_serial.c
index 6bb44d613bab..33f8125f34fa 100644
--- a/drivers/usb/gadget/function/f_serial.c
+++ b/drivers/usb/gadget/function/f_serial.c
@@ -114,7 +114,7 @@ static struct usb_endpoint_descriptor gser_ss_out_desc = {
};
static struct usb_ss_ep_comp_descriptor gser_ss_bulk_comp_desc = {
- .bLength = sizeof gser_ss_bulk_comp_desc,
+ .bLength = sizeof(gser_ss_bulk_comp_desc),
.bDescriptorType = USB_DT_SS_ENDPOINT_COMP,
};
diff --git a/drivers/usb/gadget/function/f_subset.c b/drivers/usb/gadget/function/f_subset.c
index 829c78de9eba..a7a617c5a569 100644
--- a/drivers/usb/gadget/function/f_subset.c
+++ b/drivers/usb/gadget/function/f_subset.c
@@ -77,7 +77,7 @@ static inline struct f_gether *func_to_geth(struct usb_function *f)
/* interface descriptor: */
static struct usb_interface_descriptor subset_data_intf = {
- .bLength = sizeof subset_data_intf,
+ .bLength = sizeof(subset_data_intf),
.bDescriptorType = USB_DT_INTERFACE,
/* .bInterfaceNumber = DYNAMIC */
@@ -90,7 +90,7 @@ static struct usb_interface_descriptor subset_data_intf = {
};
static struct usb_cdc_header_desc mdlm_header_desc = {
- .bLength = sizeof mdlm_header_desc,
+ .bLength = sizeof(mdlm_header_desc),
.bDescriptorType = USB_DT_CS_INTERFACE,
.bDescriptorSubType = USB_CDC_HEADER_TYPE,
@@ -98,7 +98,7 @@ static struct usb_cdc_header_desc mdlm_header_desc = {
};
static struct usb_cdc_mdlm_desc mdlm_desc = {
- .bLength = sizeof mdlm_desc,
+ .bLength = sizeof(mdlm_desc),
.bDescriptorType = USB_DT_CS_INTERFACE,
.bDescriptorSubType = USB_CDC_MDLM_TYPE,
@@ -124,7 +124,7 @@ static u8 mdlm_detail_desc[] = {
};
static struct usb_cdc_ether_desc ether_desc = {
- .bLength = sizeof ether_desc,
+ .bLength = sizeof(ether_desc),
.bDescriptorType = USB_DT_CS_INTERFACE,
.bDescriptorSubType = USB_CDC_ETHERNET_TYPE,
@@ -213,7 +213,7 @@ static struct usb_endpoint_descriptor ss_subset_out_desc = {
};
static struct usb_ss_ep_comp_descriptor ss_subset_bulk_comp_desc = {
- .bLength = sizeof ss_subset_bulk_comp_desc,
+ .bLength = sizeof(ss_subset_bulk_comp_desc),
.bDescriptorType = USB_DT_SS_ENDPOINT_COMP,
/* the following 2 values can be tweaked if necessary */
diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c
index 6a2346b99f55..ed07adb58b8c 100644
--- a/drivers/usb/gadget/function/f_uac1.c
+++ b/drivers/usb/gadget/function/f_uac1.c
@@ -254,7 +254,7 @@ static struct f_audio_buf *f_audio_buffer_alloc(int buf_size)
{
struct f_audio_buf *copy_buf;
- copy_buf = kzalloc(sizeof *copy_buf, GFP_ATOMIC);
+ copy_buf = kzalloc(sizeof(*copy_buf), GFP_ATOMIC);
if (!copy_buf)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/usb/gadget/function/f_uac2.c b/drivers/usb/gadget/function/f_uac2.c
index 044ca79d3cb5..75706e02778d 100644
--- a/drivers/usb/gadget/function/f_uac2.c
+++ b/drivers/usb/gadget/function/f_uac2.c
@@ -599,7 +599,7 @@ static struct usb_gadget_strings *fn_strings[] = {
};
static struct usb_qualifier_descriptor devqual_desc = {
- .bLength = sizeof devqual_desc,
+ .bLength = sizeof(devqual_desc),
.bDescriptorType = USB_DT_DEVICE_QUALIFIER,
.bcdUSB = cpu_to_le16(0x200),
@@ -611,7 +611,7 @@ static struct usb_qualifier_descriptor devqual_desc = {
};
static struct usb_interface_assoc_descriptor iad_desc = {
- .bLength = sizeof iad_desc,
+ .bLength = sizeof(iad_desc),
.bDescriptorType = USB_DT_INTERFACE_ASSOCIATION,
.bFirstInterface = 0,
@@ -623,7 +623,7 @@ static struct usb_interface_assoc_descriptor iad_desc = {
/* Audio Control Interface */
static struct usb_interface_descriptor std_ac_if_desc = {
- .bLength = sizeof std_ac_if_desc,
+ .bLength = sizeof(std_ac_if_desc),
.bDescriptorType = USB_DT_INTERFACE,
.bAlternateSetting = 0,
@@ -635,7 +635,7 @@ static struct usb_interface_descriptor std_ac_if_desc = {
/* Clock source for IN traffic */
static struct uac_clock_source_descriptor in_clk_src_desc = {
- .bLength = sizeof in_clk_src_desc,
+ .bLength = sizeof(in_clk_src_desc),
.bDescriptorType = USB_DT_CS_INTERFACE,
.bDescriptorSubtype = UAC2_CLOCK_SOURCE,
@@ -647,7 +647,7 @@ static struct uac_clock_source_descriptor in_clk_src_desc = {
/* Clock source for OUT traffic */
static struct uac_clock_source_descriptor out_clk_src_desc = {
- .bLength = sizeof out_clk_src_desc,
+ .bLength = sizeof(out_clk_src_desc),
.bDescriptorType = USB_DT_CS_INTERFACE,
.bDescriptorSubtype = UAC2_CLOCK_SOURCE,
@@ -659,7 +659,7 @@ static struct uac_clock_source_descriptor out_clk_src_desc = {
/* Input Terminal for USB_OUT */
static struct uac2_input_terminal_descriptor usb_out_it_desc = {
- .bLength = sizeof usb_out_it_desc,
+ .bLength = sizeof(usb_out_it_desc),
.bDescriptorType = USB_DT_CS_INTERFACE,
.bDescriptorSubtype = UAC_INPUT_TERMINAL,
@@ -673,7 +673,7 @@ static struct uac2_input_terminal_descriptor usb_out_it_desc = {
/* Input Terminal for I/O-In */
static struct uac2_input_terminal_descriptor io_in_it_desc = {
- .bLength = sizeof io_in_it_desc,
+ .bLength = sizeof(io_in_it_desc),
.bDescriptorType = USB_DT_CS_INTERFACE,
.bDescriptorSubtype = UAC_INPUT_TERMINAL,
@@ -687,7 +687,7 @@ static struct uac2_input_terminal_descriptor io_in_it_desc = {
/* Ouput Terminal for USB_IN */
static struct uac2_output_terminal_descriptor usb_in_ot_desc = {
- .bLength = sizeof usb_in_ot_desc,
+ .bLength = sizeof(usb_in_ot_desc),
.bDescriptorType = USB_DT_CS_INTERFACE,
.bDescriptorSubtype = UAC_OUTPUT_TERMINAL,
@@ -701,7 +701,7 @@ static struct uac2_output_terminal_descriptor usb_in_ot_desc = {
/* Ouput Terminal for I/O-Out */
static struct uac2_output_terminal_descriptor io_out_ot_desc = {
- .bLength = sizeof io_out_ot_desc,
+ .bLength = sizeof(io_out_ot_desc),
.bDescriptorType = USB_DT_CS_INTERFACE,
.bDescriptorSubtype = UAC_OUTPUT_TERMINAL,
@@ -714,21 +714,21 @@ static struct uac2_output_terminal_descriptor io_out_ot_desc = {
};
static struct uac2_ac_header_descriptor ac_hdr_desc = {
- .bLength = sizeof ac_hdr_desc,
+ .bLength = sizeof(ac_hdr_desc),
.bDescriptorType = USB_DT_CS_INTERFACE,
.bDescriptorSubtype = UAC_MS_HEADER,
.bcdADC = cpu_to_le16(0x200),
.bCategory = UAC2_FUNCTION_IO_BOX,
- .wTotalLength = sizeof in_clk_src_desc + sizeof out_clk_src_desc
- + sizeof usb_out_it_desc + sizeof io_in_it_desc
- + sizeof usb_in_ot_desc + sizeof io_out_ot_desc,
+ .wTotalLength = sizeof(in_clk_src_desc) + sizeof(out_clk_src_desc)
+ + sizeof(usb_out_it_desc) + sizeof(io_in_it_desc)
+ + sizeof(usb_in_ot_desc) + sizeof(io_out_ot_desc),
.bmControls = 0,
};
/* Audio Streaming OUT Interface - Alt0 */
static struct usb_interface_descriptor std_as_out_if0_desc = {
- .bLength = sizeof std_as_out_if0_desc,
+ .bLength = sizeof(std_as_out_if0_desc),
.bDescriptorType = USB_DT_INTERFACE,
.bAlternateSetting = 0,
@@ -740,7 +740,7 @@ static struct usb_interface_descriptor std_as_out_if0_desc = {
/* Audio Streaming OUT Interface - Alt1 */
static struct usb_interface_descriptor std_as_out_if1_desc = {
- .bLength = sizeof std_as_out_if1_desc,
+ .bLength = sizeof(std_as_out_if1_desc),
.bDescriptorType = USB_DT_INTERFACE,
.bAlternateSetting = 1,
@@ -752,7 +752,7 @@ static struct usb_interface_descriptor std_as_out_if1_desc = {
/* Audio Stream OUT Intface Desc */
static struct uac2_as_header_descriptor as_out_hdr_desc = {
- .bLength = sizeof as_out_hdr_desc,
+ .bLength = sizeof(as_out_hdr_desc),
.bDescriptorType = USB_DT_CS_INTERFACE,
.bDescriptorSubtype = UAC_AS_GENERAL,
@@ -765,7 +765,7 @@ static struct uac2_as_header_descriptor as_out_hdr_desc = {
/* Audio USB_OUT Format */
static struct uac2_format_type_i_descriptor as_out_fmt1_desc = {
- .bLength = sizeof as_out_fmt1_desc,
+ .bLength = sizeof(as_out_fmt1_desc),
.bDescriptorType = USB_DT_CS_INTERFACE,
.bDescriptorSubtype = UAC_FORMAT_TYPE,
.bFormatType = UAC_FORMAT_TYPE_I,
@@ -793,7 +793,7 @@ static struct usb_endpoint_descriptor hs_epout_desc = {
/* CS AS ISO OUT Endpoint */
static struct uac2_iso_endpoint_descriptor as_iso_out_desc = {
- .bLength = sizeof as_iso_out_desc,
+ .bLength = sizeof(as_iso_out_desc),
.bDescriptorType = USB_DT_CS_ENDPOINT,
.bDescriptorSubtype = UAC_EP_GENERAL,
@@ -805,7 +805,7 @@ static struct uac2_iso_endpoint_descriptor as_iso_out_desc = {
/* Audio Streaming IN Interface - Alt0 */
static struct usb_interface_descriptor std_as_in_if0_desc = {
- .bLength = sizeof std_as_in_if0_desc,
+ .bLength = sizeof(std_as_in_if0_desc),
.bDescriptorType = USB_DT_INTERFACE,
.bAlternateSetting = 0,
@@ -817,7 +817,7 @@ static struct usb_interface_descriptor std_as_in_if0_desc = {
/* Audio Streaming IN Interface - Alt1 */
static struct usb_interface_descriptor std_as_in_if1_desc = {
- .bLength = sizeof std_as_in_if1_desc,
+ .bLength = sizeof(std_as_in_if1_desc),
.bDescriptorType = USB_DT_INTERFACE,
.bAlternateSetting = 1,
@@ -829,7 +829,7 @@ static struct usb_interface_descriptor std_as_in_if1_desc = {
/* Audio Stream IN Intface Desc */
static struct uac2_as_header_descriptor as_in_hdr_desc = {
- .bLength = sizeof as_in_hdr_desc,
+ .bLength = sizeof(as_in_hdr_desc),
.bDescriptorType = USB_DT_CS_INTERFACE,
.bDescriptorSubtype = UAC_AS_GENERAL,
@@ -842,7 +842,7 @@ static struct uac2_as_header_descriptor as_in_hdr_desc = {
/* Audio USB_IN Format */
static struct uac2_format_type_i_descriptor as_in_fmt1_desc = {
- .bLength = sizeof as_in_fmt1_desc,
+ .bLength = sizeof(as_in_fmt1_desc),
.bDescriptorType = USB_DT_CS_INTERFACE,
.bDescriptorSubtype = UAC_FORMAT_TYPE,
.bFormatType = UAC_FORMAT_TYPE_I,
@@ -870,7 +870,7 @@ static struct usb_endpoint_descriptor hs_epin_desc = {
/* CS AS ISO IN Endpoint */
static struct uac2_iso_endpoint_descriptor as_iso_in_desc = {
- .bLength = sizeof as_iso_in_desc,
+ .bLength = sizeof(as_iso_in_desc),
.bDescriptorType = USB_DT_CS_ENDPOINT,
.bDescriptorSubtype = UAC_EP_GENERAL,
@@ -1297,7 +1297,7 @@ in_rq_cur(struct usb_function *fn, const struct usb_ctrlrequest *cr)
else if (entity_id == USB_OUT_CLK_ID)
c.dCUR = c_srate;
- value = min_t(unsigned, w_length, sizeof c);
+ value = min_t(unsigned, w_length, sizeof(c));
memcpy(req->buf, &c, value);
} else if (control_selector == UAC2_CS_CONTROL_CLOCK_VALID) {
*(u8 *)req->buf = 1;
@@ -1343,7 +1343,7 @@ in_rq_range(struct usb_function *fn, const struct usb_ctrlrequest *cr)
r.dRES = 0;
r.wNumSubRanges = 1;
- value = min_t(unsigned, w_length, sizeof r);
+ value = min_t(unsigned, w_length, sizeof(r));
memcpy(req->buf, &r, value);
} else {
dev_err(&uac2->pdev.dev,
diff --git a/drivers/usb/gadget/function/rndis.c b/drivers/usb/gadget/function/rndis.c
index 70d3917cc003..7cb49fd1fefc 100644
--- a/drivers/usb/gadget/function/rndis.c
+++ b/drivers/usb/gadget/function/rndis.c
@@ -625,7 +625,7 @@ static int rndis_query_response(struct rndis_params *params,
r)) {
/* OID not supported */
resp->Status = cpu_to_le32(RNDIS_STATUS_NOT_SUPPORTED);
- resp->MessageLength = cpu_to_le32(sizeof *resp);
+ resp->MessageLength = cpu_to_le32(sizeof(*resp));
resp->InformationBufferLength = cpu_to_le32(0);
resp->InformationBufferOffset = cpu_to_le32(0);
} else
@@ -996,7 +996,7 @@ void rndis_add_hdr(struct sk_buff *skb)
if (!skb)
return;
header = (void *)skb_push(skb, sizeof(*header));
- memset(header, 0, sizeof *header);
+ memset(header, 0, sizeof(*header));
header->MessageType = cpu_to_le32(RNDIS_MSG_PACKET);
header->MessageLength = cpu_to_le32(skb->len);
header->DataOffset = cpu_to_le32(36);
diff --git a/drivers/usb/gadget/function/storage_common.c b/drivers/usb/gadget/function/storage_common.c
index d62683017cf3..2ab5f8011c0e 100644
--- a/drivers/usb/gadget/function/storage_common.c
+++ b/drivers/usb/gadget/function/storage_common.c
@@ -34,7 +34,7 @@
/* There is only one interface. */
struct usb_interface_descriptor fsg_intf_desc = {
- .bLength = sizeof fsg_intf_desc,
+ .bLength = sizeof(fsg_intf_desc),
.bDescriptorType = USB_DT_INTERFACE,
.bNumEndpoints = 2, /* Adjusted during fsg_bind() */
diff --git a/drivers/usb/gadget/function/u_ether.c b/drivers/usb/gadget/function/u_ether.c
index 637809e3bd0d..403f4048e589 100644
--- a/drivers/usb/gadget/function/u_ether.c
+++ b/drivers/usb/gadget/function/u_ether.c
@@ -763,7 +763,7 @@ struct eth_dev *gether_setup_name(struct usb_gadget *g,
struct net_device *net;
int status;
- net = alloc_etherdev(sizeof *dev);
+ net = alloc_etherdev(sizeof(*dev));
if (!net)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/usb/gadget/legacy/acm_ms.c b/drivers/usb/gadget/legacy/acm_ms.c
index c16089efc322..b6c409c6d14d 100644
--- a/drivers/usb/gadget/legacy/acm_ms.c
+++ b/drivers/usb/gadget/legacy/acm_ms.c
@@ -37,7 +37,7 @@
USB_GADGET_COMPOSITE_OPTIONS();
static struct usb_device_descriptor device_desc = {
- .bLength = sizeof device_desc,
+ .bLength = sizeof(device_desc),
.bDescriptorType = USB_DT_DEVICE,
/* .bcdUSB = DYNAMIC */
diff --git a/drivers/usb/gadget/legacy/audio.c b/drivers/usb/gadget/legacy/audio.c
index 5d7b3c6a422b..dbb3d115b4e1 100644
--- a/drivers/usb/gadget/legacy/audio.c
+++ b/drivers/usb/gadget/legacy/audio.c
@@ -120,7 +120,7 @@ static struct usb_function *f_uac1;
/*-------------------------------------------------------------------------*/
static struct usb_device_descriptor device_desc = {
- .bLength = sizeof device_desc,
+ .bLength = sizeof(device_desc),
.bDescriptorType = USB_DT_DEVICE,
/* .bcdUSB = DYNAMIC */
diff --git a/drivers/usb/gadget/legacy/cdc2.c b/drivers/usb/gadget/legacy/cdc2.c
index 51c08682de84..1f6b374582e6 100644
--- a/drivers/usb/gadget/legacy/cdc2.c
+++ b/drivers/usb/gadget/legacy/cdc2.c
@@ -40,7 +40,7 @@ USB_ETHERNET_MODULE_PARAMETERS();
/*-------------------------------------------------------------------------*/
static struct usb_device_descriptor device_desc = {
- .bLength = sizeof device_desc,
+ .bLength = sizeof(device_desc),
.bDescriptorType = USB_DT_DEVICE,
/* .bcdUSB = DYNAMIC */
diff --git a/drivers/usb/gadget/legacy/dbgp.c b/drivers/usb/gadget/legacy/dbgp.c
index 99ca3dabc4f3..607ca8e69cba 100644
--- a/drivers/usb/gadget/legacy/dbgp.c
+++ b/drivers/usb/gadget/legacy/dbgp.c
@@ -33,7 +33,7 @@ static struct dbgp {
} dbgp;
static struct usb_device_descriptor device_desc = {
- .bLength = sizeof device_desc,
+ .bLength = sizeof(device_desc),
.bDescriptorType = USB_DT_DEVICE,
.bcdUSB = cpu_to_le16(0x0200),
.bDeviceClass = USB_CLASS_VENDOR_SPEC,
@@ -43,7 +43,7 @@ static struct usb_device_descriptor device_desc = {
};
static struct usb_debug_descriptor dbg_desc = {
- .bLength = sizeof dbg_desc,
+ .bLength = sizeof(dbg_desc),
.bDescriptorType = USB_DT_DEBUG,
};
@@ -348,13 +348,13 @@ static int dbgp_setup(struct usb_gadget *gadget,
switch (value>>8) {
case USB_DT_DEVICE:
dev_dbg(&dbgp.gadget->dev, "setup: desc device\n");
- len = sizeof device_desc;
+ len = sizeof(device_desc);
data = &device_desc;
device_desc.bMaxPacketSize0 = gadget->ep0->maxpacket;
break;
case USB_DT_DEBUG:
dev_dbg(&dbgp.gadget->dev, "setup: desc debug\n");
- len = sizeof dbg_desc;
+ len = sizeof(dbg_desc);
data = &dbg_desc;
break;
default:
diff --git a/drivers/usb/gadget/legacy/ether.c b/drivers/usb/gadget/legacy/ether.c
index 25a2c2e48592..6a105216668a 100644
--- a/drivers/usb/gadget/legacy/ether.c
+++ b/drivers/usb/gadget/legacy/ether.c
@@ -148,7 +148,7 @@ USB_ETHERNET_MODULE_PARAMETERS();
/*-------------------------------------------------------------------------*/
static struct usb_device_descriptor device_desc = {
- .bLength = sizeof device_desc,
+ .bLength = sizeof(device_desc),
.bDescriptorType = USB_DT_DEVICE,
/* .bcdUSB = DYNAMIC */
diff --git a/drivers/usb/gadget/legacy/g_ffs.c b/drivers/usb/gadget/legacy/g_ffs.c
index f85639ef8a8f..ab809e7b627d 100644
--- a/drivers/usb/gadget/legacy/g_ffs.c
+++ b/drivers/usb/gadget/legacy/g_ffs.c
@@ -66,7 +66,7 @@ MODULE_LICENSE("GPL");
USB_GADGET_COMPOSITE_OPTIONS();
static struct usb_device_descriptor gfs_dev_desc = {
- .bLength = sizeof gfs_dev_desc,
+ .bLength = sizeof(gfs_dev_desc),
.bDescriptorType = USB_DT_DEVICE,
/* .bcdUSB = DYNAMIC */
diff --git a/drivers/usb/gadget/legacy/hid.c b/drivers/usb/gadget/legacy/hid.c
index a71a884f79fc..822f0a5e47cd 100644
--- a/drivers/usb/gadget/legacy/hid.c
+++ b/drivers/usb/gadget/legacy/hid.c
@@ -44,7 +44,7 @@ static LIST_HEAD(hidg_func_list);
USB_GADGET_COMPOSITE_OPTIONS();
static struct usb_device_descriptor device_desc = {
- .bLength = sizeof device_desc,
+ .bLength = sizeof(device_desc),
.bDescriptorType = USB_DT_DEVICE,
/* .bcdUSB = DYNAMIC */
diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c
index 7e179f81d05c..a91d2c7dc2b0 100644
--- a/drivers/usb/gadget/legacy/inode.c
+++ b/drivers/usb/gadget/legacy/inode.c
@@ -608,7 +608,7 @@ ep_read_iter(struct kiocb *iocb, struct iov_iter *to)
if (value >= 0 && copy_to_iter(buf, value, to))
value = -EFAULT;
} else {
- struct kiocb_priv *priv = kzalloc(sizeof *priv, GFP_KERNEL);
+ struct kiocb_priv *priv = kzalloc(sizeof(*priv), GFP_KERNEL);
value = -ENOMEM;
if (!priv)
goto fail;
@@ -676,7 +676,7 @@ ep_write_iter(struct kiocb *iocb, struct iov_iter *from)
} else if (is_sync_kiocb(iocb)) {
value = ep_io(epdata, buf, len);
} else {
- struct kiocb_priv *priv = kzalloc(sizeof *priv, GFP_KERNEL);
+ struct kiocb_priv *priv = kzalloc(sizeof(*priv), GFP_KERNEL);
value = -ENOMEM;
if (priv) {
value = ep_aio(iocb, priv, epdata, buf, len);
@@ -892,7 +892,7 @@ static int setup_req (struct usb_ep *ep, struct usb_request *req, u16 len)
DBG (dev, "ep0 request busy!\n");
return -EBUSY;
}
- if (len > sizeof (dev->rbuf))
+ if (len > sizeof(dev->rbuf))
req->buf = kmalloc(len, GFP_ATOMIC);
if (req->buf == NULL) {
req->buf = dev->rbuf;
@@ -992,7 +992,7 @@ ep0_read (struct file *fd, char __user *buf, size_t len, loff_t *ptr)
}
/* else normal: return event data */
- if (len < sizeof dev->event [0]) {
+ if (len < sizeof(dev->event[0])) {
retval = -EINVAL;
goto done;
}
@@ -1103,7 +1103,7 @@ next_event (struct dev_data *dev, enum usb_gadgetfs_event_type type)
VDEBUG(dev, "event[%d] = %d\n", dev->ev_next, type);
event = &dev->event [dev->ev_next++];
BUG_ON (dev->ev_next > N_EVENT);
- memset (event, 0, sizeof *event);
+ memset (event, 0, sizeof(*event));
event->type = type;
return event;
}
@@ -1255,7 +1255,7 @@ static void make_qualifier (struct dev_data *dev)
struct usb_qualifier_descriptor qual;
struct usb_device_descriptor *desc;
- qual.bLength = sizeof qual;
+ qual.bLength = sizeof(qual);
qual.bDescriptorType = USB_DT_DEVICE_QUALIFIER;
qual.bcdUSB = cpu_to_le16 (0x0200);
@@ -1270,7 +1270,7 @@ static void make_qualifier (struct dev_data *dev)
qual.bNumConfigurations = 1;
qual.bRESERVED = 0;
- memcpy (dev->rbuf, &qual, sizeof qual);
+ memcpy (dev->rbuf, &qual, sizeof(qual));
}
static int
@@ -1346,7 +1346,7 @@ gadgetfs_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
switch (w_value >> 8) {
case USB_DT_DEVICE:
- value = min (w_length, (u16) sizeof *dev->dev);
+ value = min (w_length, (u16) sizeof(*dev->dev));
dev->dev->bMaxPacketSize0 = dev->gadget->ep0->maxpacket;
req->buf = dev->dev;
break;
@@ -1550,7 +1550,7 @@ static int activate_ep_files (struct dev_data *dev)
mutex_init(&data->lock);
init_waitqueue_head (&data->wait);
- strncpy (data->name, ep->name, sizeof (data->name) - 1);
+ strncpy (data->name, ep->name, sizeof(data->name) - 1);
atomic_set (&data->count, 1);
data->dev = dev;
get_dev (dev);
diff --git a/drivers/usb/gadget/legacy/mass_storage.c b/drivers/usb/gadget/legacy/mass_storage.c
index e61af53c7d2b..21f3f29185be 100644
--- a/drivers/usb/gadget/legacy/mass_storage.c
+++ b/drivers/usb/gadget/legacy/mass_storage.c
@@ -52,7 +52,7 @@
USB_GADGET_COMPOSITE_OPTIONS();
static struct usb_device_descriptor msg_device_desc = {
- .bLength = sizeof msg_device_desc,
+ .bLength = sizeof(msg_device_desc),
.bDescriptorType = USB_DT_DEVICE,
/* .bcdUSB = DYNAMIC */
diff --git a/drivers/usb/gadget/legacy/multi.c b/drivers/usb/gadget/legacy/multi.c
index 229d704a620b..9f3e7950f927 100644
--- a/drivers/usb/gadget/legacy/multi.c
+++ b/drivers/usb/gadget/legacy/multi.c
@@ -64,7 +64,7 @@ enum {
static struct usb_device_descriptor device_desc = {
- .bLength = sizeof device_desc,
+ .bLength = sizeof(device_desc),
.bDescriptorType = USB_DT_DEVICE,
/* .bcdUSB = DYNAMIC */
diff --git a/drivers/usb/gadget/legacy/ncm.c b/drivers/usb/gadget/legacy/ncm.c
index 0aba68253e3d..fd3c40ce48ac 100644
--- a/drivers/usb/gadget/legacy/ncm.c
+++ b/drivers/usb/gadget/legacy/ncm.c
@@ -46,7 +46,7 @@ USB_GADGET_COMPOSITE_OPTIONS();
USB_ETHERNET_MODULE_PARAMETERS();
static struct usb_device_descriptor device_desc = {
- .bLength = sizeof device_desc,
+ .bLength = sizeof(device_desc),
.bDescriptorType = USB_DT_DEVICE,
/* .bcdUSB = DYNAMIC */
diff --git a/drivers/usb/gadget/legacy/printer.c b/drivers/usb/gadget/legacy/printer.c
index 6f969a86175c..125420dc7000 100644
--- a/drivers/usb/gadget/legacy/printer.c
+++ b/drivers/usb/gadget/legacy/printer.c
@@ -69,7 +69,7 @@ static struct usb_function *f_printer;
*/
static struct usb_device_descriptor device_desc = {
- .bLength = sizeof device_desc,
+ .bLength = sizeof(device_desc),
.bDescriptorType = USB_DT_DEVICE,
/* .bcdUSB = DYNAMIC */
.bDeviceClass = USB_CLASS_PER_INTERFACE,
diff --git a/drivers/usb/gadget/legacy/zero.c b/drivers/usb/gadget/legacy/zero.c
index d02e2ce73ea5..b5e7f1e54688 100644
--- a/drivers/usb/gadget/legacy/zero.c
+++ b/drivers/usb/gadget/legacy/zero.c
@@ -112,7 +112,7 @@ static unsigned autoresume_step_ms;
/*-------------------------------------------------------------------------*/
static struct usb_device_descriptor device_desc = {
- .bLength = sizeof device_desc,
+ .bLength = sizeof(device_desc),
.bDescriptorType = USB_DT_DEVICE,
/* .bcdUSB = DYNAMIC */
diff --git a/drivers/usb/gadget/udc/dummy_hcd.c b/drivers/usb/gadget/udc/dummy_hcd.c
index dde44450dfa9..eda66f3b9468 100644
--- a/drivers/usb/gadget/udc/dummy_hcd.c
+++ b/drivers/usb/gadget/udc/dummy_hcd.c
@@ -1215,7 +1215,7 @@ static int dummy_urb_enqueue(
unsigned long flags;
int rc;
- urbp = kmalloc(sizeof *urbp, mem_flags);
+ urbp = kmalloc(sizeof(*urbp), mem_flags);
if (!urbp)
return -ENOMEM;
urbp->urb = urb;
@@ -2001,7 +2001,7 @@ static struct {
static inline void
ss_hub_descriptor(struct usb_hub_descriptor *desc)
{
- memset(desc, 0, sizeof *desc);
+ memset(desc, 0, sizeof(*desc));
desc->bDescriptorType = USB_DT_SS_HUB;
desc->bDescLength = 12;
desc->wHubCharacteristics = cpu_to_le16(
@@ -2014,7 +2014,7 @@ ss_hub_descriptor(struct usb_hub_descriptor *desc)
static inline void hub_descriptor(struct usb_hub_descriptor *desc)
{
- memset(desc, 0, sizeof *desc);
+ memset(desc, 0, sizeof(*desc));
desc->bDescriptorType = USB_DT_HUB;
desc->bDescLength = 9;
desc->wHubCharacteristics = cpu_to_le16(
diff --git a/drivers/usb/gadget/udc/fsl_udc_core.c b/drivers/usb/gadget/udc/fsl_udc_core.c
index aab5221d6c2e..3a3bc7a0e70c 100644
--- a/drivers/usb/gadget/udc/fsl_udc_core.c
+++ b/drivers/usb/gadget/udc/fsl_udc_core.c
@@ -682,7 +682,7 @@ fsl_alloc_request(struct usb_ep *_ep, gfp_t gfp_flags)
{
struct fsl_req *req = NULL;
- req = kzalloc(sizeof *req, gfp_flags);
+ req = kzalloc(sizeof(*req), gfp_flags);
if (!req)
return NULL;
diff --git a/drivers/usb/gadget/udc/goku_udc.c b/drivers/usb/gadget/udc/goku_udc.c
index 1fdfec14a3ba..56cd6e31bd03 100644
--- a/drivers/usb/gadget/udc/goku_udc.c
+++ b/drivers/usb/gadget/udc/goku_udc.c
@@ -269,7 +269,7 @@ goku_alloc_request(struct usb_ep *_ep, gfp_t gfp_flags)
if (!_ep)
return NULL;
- req = kzalloc(sizeof *req, gfp_flags);
+ req = kzalloc(sizeof(*req), gfp_flags);
if (!req)
return NULL;
@@ -1766,7 +1766,7 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id)
}
/* alloc, and start init */
- dev = kzalloc (sizeof *dev, GFP_KERNEL);
+ dev = kzalloc (sizeof(*dev), GFP_KERNEL);
if (dev == NULL){
pr_debug("enomem %s\n", pci_name(pdev));
retval = -ENOMEM;
diff --git a/drivers/usb/gadget/udc/mv_u3d_core.c b/drivers/usb/gadget/udc/mv_u3d_core.c
index dafe74eb9ade..c9213ad44475 100644
--- a/drivers/usb/gadget/udc/mv_u3d_core.c
+++ b/drivers/usb/gadget/udc/mv_u3d_core.c
@@ -680,7 +680,7 @@ mv_u3d_alloc_request(struct usb_ep *_ep, gfp_t gfp_flags)
{
struct mv_u3d_req *req = NULL;
- req = kzalloc(sizeof *req, gfp_flags);
+ req = kzalloc(sizeof(*req), gfp_flags);
if (!req)
return NULL;
diff --git a/drivers/usb/gadget/udc/mv_udc_core.c b/drivers/usb/gadget/udc/mv_udc_core.c
index 81b6229c7805..c60c1bdcb385 100644
--- a/drivers/usb/gadget/udc/mv_udc_core.c
+++ b/drivers/usb/gadget/udc/mv_udc_core.c
@@ -610,7 +610,7 @@ mv_alloc_request(struct usb_ep *_ep, gfp_t gfp_flags)
{
struct mv_req *req = NULL;
- req = kzalloc(sizeof *req, gfp_flags);
+ req = kzalloc(sizeof(*req), gfp_flags);
if (!req)
return NULL;
diff --git a/drivers/usb/gadget/udc/omap_udc.c b/drivers/usb/gadget/udc/omap_udc.c
index 9b7d39484ed3..86b77117f648 100644
--- a/drivers/usb/gadget/udc/omap_udc.c
+++ b/drivers/usb/gadget/udc/omap_udc.c
@@ -2150,7 +2150,7 @@ static void proc_ep_show(struct seq_file *s, struct omap_ep *ep)
use_ep(ep, 0);
if (use_dma && ep->has_dma)
- snprintf(buf, sizeof buf, "(%cxdma%d lch%d) ",
+ snprintf(buf, sizeof(buf), "(%cxdma%d lch%d) ",
(ep->bEndpointAddress & USB_DIR_IN) ? 't' : 'r',
ep->dma_channel - 1, ep->lch);
else
@@ -2570,8 +2570,8 @@ omap_ep_setup(char *name, u8 addr, u8 type,
BUG_ON(buf > 2048);
/* set up driver data structures */
- BUG_ON(strlen(name) >= sizeof ep->name);
- strlcpy(ep->name, name, sizeof ep->name);
+ BUG_ON(strlen(name) >= sizeof(ep->name));
+ strlcpy(ep->name, name, sizeof(ep->name));
INIT_LIST_HEAD(&ep->queue);
INIT_LIST_HEAD(&ep->iso);
ep->bEndpointAddress = addr;
diff --git a/drivers/usb/gadget/udc/pch_udc.c b/drivers/usb/gadget/udc/pch_udc.c
index 7a04157ff579..3c5399d03ed0 100644
--- a/drivers/usb/gadget/udc/pch_udc.c
+++ b/drivers/usb/gadget/udc/pch_udc.c
@@ -1776,7 +1776,7 @@ static struct usb_request *pch_udc_alloc_request(struct usb_ep *usbep,
return NULL;
ep = container_of(usbep, struct pch_udc_ep, ep);
dev = ep->dev;
- req = kzalloc(sizeof *req, gfp);
+ req = kzalloc(sizeof(*req), gfp);
if (!req)
return NULL;
req->req.dma = DMA_ADDR_INVALID;
@@ -2098,7 +2098,7 @@ static void pch_udc_init_setup_buff(struct pch_udc_stp_dma_desc *td_stp)
if (!td_stp)
return;
td_stp->reserved = ++pky_marker;
- memset(&td_stp->request, 0xFF, sizeof td_stp->request);
+ memset(&td_stp->request, 0xFF, sizeof(td_stp->request));
td_stp->status = PCH_UDC_BS_HST_RDY;
}
@@ -2656,7 +2656,7 @@ static void pch_udc_svc_intf_interrupt(struct pch_udc_dev *dev)
UDC_DEVSTS_ALT_SHIFT;
dev->set_cfg_not_acked = 1;
/* Construct the usb request for gadget driver and inform it */
- memset(&dev->setup_data, 0 , sizeof dev->setup_data);
+ memset(&dev->setup_data, 0 , sizeof(dev->setup_data));
dev->setup_data.bRequest = USB_REQ_SET_INTERFACE;
dev->setup_data.bRequestType = USB_RECIP_INTERFACE;
dev->setup_data.wValue = cpu_to_le16(dev->cfg_data.cur_alt);
@@ -2695,7 +2695,7 @@ static void pch_udc_svc_cfg_interrupt(struct pch_udc_dev *dev)
dev->cfg_data.cur_cfg = (dev_stat & UDC_DEVSTS_CFG_MASK) >>
UDC_DEVSTS_CFG_SHIFT;
/* make usb request for gadget driver */
- memset(&dev->setup_data, 0 , sizeof dev->setup_data);
+ memset(&dev->setup_data, 0 , sizeof(dev->setup_data));
dev->setup_data.bRequest = USB_REQ_SET_CONFIGURATION;
dev->setup_data.wValue = cpu_to_le16(dev->cfg_data.cur_cfg);
/* program the NE registers */
@@ -2886,7 +2886,7 @@ static void pch_udc_pcd_reinit(struct pch_udc_dev *dev)
INIT_LIST_HEAD(&dev->gadget.ep_list);
/* Initialize the endpoints structures */
- memset(dev->ep, 0, sizeof dev->ep);
+ memset(dev->ep, 0, sizeof(dev->ep));
for (i = 0; i < PCH_UDC_EP_NUM; i++) {
struct pch_udc_ep *ep = &dev->ep[i];
ep->dev = dev;
@@ -3144,7 +3144,7 @@ static int pch_udc_probe(struct pci_dev *pdev,
struct pch_udc_dev *dev;
/* init */
- dev = kzalloc(sizeof *dev, GFP_KERNEL);
+ dev = kzalloc(sizeof(*dev), GFP_KERNEL);
if (!dev) {
pr_err("%s: no memory for device structure\n", __func__);
return -ENOMEM;
diff --git a/drivers/usb/gadget/udc/pxa25x_udc.c b/drivers/usb/gadget/udc/pxa25x_udc.c
index b82cb14850b6..e02c0feff6d6 100644
--- a/drivers/usb/gadget/udc/pxa25x_udc.c
+++ b/drivers/usb/gadget/udc/pxa25x_udc.c
@@ -1748,7 +1748,7 @@ pxa25x_udc_irq(int irq, void *_dev)
} else {
DBG(DBG_VERBOSE, "USB reset end\n");
dev->gadget.speed = USB_SPEED_FULL;
- memset(&dev->stats, 0, sizeof dev->stats);
+ memset(&dev->stats, 0, sizeof(dev->stats));
/* driver and endpoints are still reset */
}
diff --git a/drivers/usb/gadget/udc/pxa27x_udc.c b/drivers/usb/gadget/udc/pxa27x_udc.c
index 001a3b74a993..78234c87e180 100644
--- a/drivers/usb/gadget/udc/pxa27x_udc.c
+++ b/drivers/usb/gadget/udc/pxa27x_udc.c
@@ -646,7 +646,7 @@ pxa_ep_alloc_request(struct usb_ep *_ep, gfp_t gfp_flags)
{
struct pxa27x_request *req;
- req = kzalloc(sizeof *req, gfp_flags);
+ req = kzalloc(sizeof(*req), gfp_flags);
if (!req)
return NULL;
@@ -2299,7 +2299,7 @@ static void irq_udc_reset(struct pxa_udc *udc)
stop_activity(udc, udc->driver);
}
udc->gadget.speed = USB_SPEED_FULL;
- memset(&udc->stats, 0, sizeof udc->stats);
+ memset(&udc->stats, 0, sizeof(udc->stats));
nuke(ep, -EPROTO);
ep_write_UDCCSR(ep, UDCCSR0_FTF | UDCCSR0_OPC);
diff --git a/drivers/usb/host/ehci-dbg.c b/drivers/usb/host/ehci-dbg.c
index b7d623f1523c..6bc854d6271e 100644
--- a/drivers/usb/host/ehci-dbg.c
+++ b/drivers/usb/host/ehci-dbg.c
@@ -306,19 +306,19 @@ dbg_port_buf (char *buf, unsigned len, const char *label, int port, u32 status)
/* functions have the "wrong" filename when they're output... */
#define dbg_status(ehci, label, status) { \
char _buf [80]; \
- dbg_status_buf (_buf, sizeof _buf, label, status); \
+ dbg_status_buf (_buf, sizeof(_buf), label, status); \
ehci_dbg (ehci, "%s\n", _buf); \
}
#define dbg_cmd(ehci, label, command) { \
char _buf [80]; \
- dbg_command_buf (_buf, sizeof _buf, label, command); \
+ dbg_command_buf (_buf, sizeof(_buf), label, command); \
ehci_dbg (ehci, "%s\n", _buf); \
}
#define dbg_port(ehci, label, port, status) { \
char _buf [80]; \
- dbg_port_buf (_buf, sizeof _buf, label, port, status); \
+ dbg_port_buf (_buf, sizeof(_buf), label, port, status); \
ehci_dbg (ehci, "%s\n", _buf); \
}
@@ -635,7 +635,7 @@ static ssize_t fill_periodic_buffer(struct debug_buffer *buf)
unsigned i;
__hc32 tag;
- seen = kmalloc(DBG_SCHED_LIMIT * sizeof *seen, GFP_ATOMIC);
+ seen = kmalloc(DBG_SCHED_LIMIT * sizeof(*seen), GFP_ATOMIC);
if (!seen)
return 0;
seen_count = 0;
@@ -875,19 +875,19 @@ static ssize_t fill_registers_buffer(struct debug_buffer *buf)
next += temp;
/* Operational Registers */
- temp = dbg_status_buf (scratch, sizeof scratch, label,
+ temp = dbg_status_buf (scratch, sizeof(scratch), label,
ehci_readl(ehci, &ehci->regs->status));
temp = scnprintf (next, size, fmt, temp, scratch);
size -= temp;
next += temp;
- temp = dbg_command_buf (scratch, sizeof scratch, label,
+ temp = dbg_command_buf (scratch, sizeof(scratch), label,
ehci_readl(ehci, &ehci->regs->command));
temp = scnprintf (next, size, fmt, temp, scratch);
size -= temp;
next += temp;
- temp = dbg_intr_buf (scratch, sizeof scratch, label,
+ temp = dbg_intr_buf (scratch, sizeof(scratch), label,
ehci_readl(ehci, &ehci->regs->intr_enable));
temp = scnprintf (next, size, fmt, temp, scratch);
size -= temp;
@@ -899,7 +899,7 @@ static ssize_t fill_registers_buffer(struct debug_buffer *buf)
next += temp;
for (i = 1; i <= HCS_N_PORTS (ehci->hcs_params); i++) {
- temp = dbg_port_buf (scratch, sizeof scratch, label, i,
+ temp = dbg_port_buf (scratch, sizeof(scratch), label, i,
ehci_readl(ehci,
&ehci->regs->port_status[i - 1]));
temp = scnprintf (next, size, fmt, temp, scratch);
diff --git a/drivers/usb/host/ehci-mem.c b/drivers/usb/host/ehci-mem.c
index 4de43011df23..84f8e3823c4b 100644
--- a/drivers/usb/host/ehci-mem.c
+++ b/drivers/usb/host/ehci-mem.c
@@ -38,7 +38,7 @@
static inline void ehci_qtd_init(struct ehci_hcd *ehci, struct ehci_qtd *qtd,
dma_addr_t dma)
{
- memset (qtd, 0, sizeof *qtd);
+ memset (qtd, 0, sizeof(*qtd));
qtd->qtd_dma = dma;
qtd->hw_token = cpu_to_hc32(ehci, QTD_STS_HALT);
qtd->hw_next = EHCI_LIST_END(ehci);
@@ -82,14 +82,14 @@ static struct ehci_qh *ehci_qh_alloc (struct ehci_hcd *ehci, gfp_t flags)
struct ehci_qh *qh;
dma_addr_t dma;
- qh = kzalloc(sizeof *qh, GFP_ATOMIC);
+ qh = kzalloc(sizeof(*qh), GFP_ATOMIC);
if (!qh)
goto done;
qh->hw = (struct ehci_qh_hw *)
dma_pool_alloc(ehci->qh_pool, flags, &dma);
if (!qh->hw)
goto fail;
- memset(qh->hw, 0, sizeof *qh->hw);
+ memset(qh->hw, 0, sizeof(*qh->hw));
qh->qh_dma = dma;
// INIT_LIST_HEAD (&qh->qh_list);
INIT_LIST_HEAD (&qh->qtd_list);
@@ -139,7 +139,7 @@ static void ehci_mem_cleanup (struct ehci_hcd *ehci)
if (ehci->periodic)
dma_free_coherent (ehci_to_hcd(ehci)->self.controller,
- ehci->periodic_size * sizeof (u32),
+ ehci->periodic_size * sizeof(u32),
ehci->periodic, ehci->periodic_dma);
ehci->periodic = NULL;
diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c
index f9a332775c47..288df035dcbc 100644
--- a/drivers/usb/host/ehci-sched.c
+++ b/drivers/usb/host/ehci-sched.c
@@ -1026,7 +1026,7 @@ iso_stream_alloc (gfp_t mem_flags)
{
struct ehci_iso_stream *stream;
- stream = kzalloc(sizeof *stream, mem_flags);
+ stream = kzalloc(sizeof(*stream), mem_flags);
if (likely (stream != NULL)) {
INIT_LIST_HEAD(&stream->td_list);
INIT_LIST_HEAD(&stream->free_list);
@@ -1194,7 +1194,7 @@ static struct ehci_iso_sched *
iso_sched_alloc (unsigned packets, gfp_t mem_flags)
{
struct ehci_iso_sched *iso_sched;
- int size = sizeof *iso_sched;
+ int size = sizeof(*iso_sched);
size += packets * sizeof (struct ehci_iso_packet);
iso_sched = kzalloc(size, mem_flags);
@@ -1313,7 +1313,7 @@ itd_urb_transaction (
}
}
- memset (itd, 0, sizeof *itd);
+ memset (itd, 0, sizeof(*itd));
itd->itd_dma = itd_dma;
itd->frame = NO_FRAME;
list_add (&itd->itd_list, &sched->td_list);
@@ -2106,7 +2106,7 @@ sitd_urb_transaction (
}
}
- memset (sitd, 0, sizeof *sitd);
+ memset (sitd, 0, sizeof(*sitd));
sitd->sitd_dma = sitd_dma;
sitd->frame = NO_FRAME;
list_add (&sitd->sitd_list, &iso_sched->td_list);
diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c
index d089b3fb7a13..473eaf2aa2f5 100644
--- a/drivers/usb/host/isp116x-hcd.c
+++ b/drivers/usb/host/isp116x-hcd.c
@@ -702,7 +702,7 @@ static int isp116x_urb_enqueue(struct usb_hcd *hcd,
}
/* avoid all allocations within spinlocks: request or endpoint */
if (!hep->hcpriv) {
- ep = kzalloc(sizeof *ep, mem_flags);
+ ep = kzalloc(sizeof(*ep), mem_flags);
if (!ep)
return -ENOMEM;
}
diff --git a/drivers/usb/host/isp1362-hcd.c b/drivers/usb/host/isp1362-hcd.c
index 6cf82ee460a6..cba181199b06 100644
--- a/drivers/usb/host/isp1362-hcd.c
+++ b/drivers/usb/host/isp1362-hcd.c
@@ -1247,7 +1247,7 @@ static int isp1362_urb_enqueue(struct usb_hcd *hcd,
/* avoid all allocations within spinlocks: request or endpoint */
if (!hep->hcpriv) {
- ep = kzalloc(sizeof *ep, mem_flags);
+ ep = kzalloc(sizeof(*ep), mem_flags);
if (!ep)
return -ENOMEM;
}
diff --git a/drivers/usb/host/ohci-dbg.c b/drivers/usb/host/ohci-dbg.c
index c3eded317495..ee2efb47abcb 100644
--- a/drivers/usb/host/ohci-dbg.c
+++ b/drivers/usb/host/ohci-dbg.c
@@ -491,7 +491,7 @@ static ssize_t fill_periodic_buffer(struct debug_buffer *buf)
char *next;
unsigned i;
- seen = kmalloc(DBG_SCHED_LIMIT * sizeof *seen, GFP_ATOMIC);
+ seen = kmalloc(DBG_SCHED_LIMIT * sizeof(*seen), GFP_ATOMIC);
if (!seen)
return 0;
seen_count = 0;
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index 04dcedfdebf8..072fdfebb712 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -986,7 +986,7 @@ static void ohci_stop (struct usb_hcd *hcd)
ohci_mem_cleanup (ohci);
if (ohci->hcca) {
dma_free_coherent (hcd->self.controller,
- sizeof *ohci->hcca,
+ sizeof(*ohci->hcca),
ohci->hcca, ohci->hcca_dma);
ohci->hcca = NULL;
ohci->hcca_dma = 0;
diff --git a/drivers/usb/host/ohci-mem.c b/drivers/usb/host/ohci-mem.c
index c9e315c6808a..3c19658565ef 100644
--- a/drivers/usb/host/ohci-mem.c
+++ b/drivers/usb/host/ohci-mem.c
@@ -91,7 +91,7 @@ td_alloc (struct ohci_hcd *hc, gfp_t mem_flags)
td = dma_pool_alloc (hc->td_cache, mem_flags, &dma);
if (td) {
/* in case hc fetches it, make it look dead */
- memset (td, 0, sizeof *td);
+ memset (td, 0, sizeof(*td));
td->hwNextTD = cpu_to_hc32 (hc, dma);
td->td_dma = dma;
/* hashed in td_fill */
@@ -124,7 +124,7 @@ ed_alloc (struct ohci_hcd *hc, gfp_t mem_flags)
ed = dma_pool_alloc (hc->ed_cache, mem_flags, &dma);
if (ed) {
- memset (ed, 0, sizeof (*ed));
+ memset (ed, 0, sizeof(*ed));
INIT_LIST_HEAD (&ed->td_list);
ed->dma = dma;
}
diff --git a/drivers/usb/host/oxu210hp-hcd.c b/drivers/usb/host/oxu210hp-hcd.c
index bc74aca8a54c..ec5dc4ac4c16 100644
--- a/drivers/usb/host/oxu210hp-hcd.c
+++ b/drivers/usb/host/oxu210hp-hcd.c
@@ -204,19 +204,19 @@ dbg_port_buf(char *buf, unsigned len, const char *label, int port, u32 status)
/* functions have the "wrong" filename when they're output... */
#define dbg_status(oxu, label, status) { \
char _buf[80]; \
- dbg_status_buf(_buf, sizeof _buf, label, status); \
+ dbg_status_buf(_buf, sizeof(_buf), label, status); \
oxu_dbg(oxu, "%s\n", _buf); \
}
#define dbg_cmd(oxu, label, command) { \
char _buf[80]; \
- dbg_command_buf(_buf, sizeof _buf, label, command); \
+ dbg_command_buf(_buf, sizeof(_buf), label, command); \
oxu_dbg(oxu, "%s\n", _buf); \
}
#define dbg_port(oxu, label, port, status) { \
char _buf[80]; \
- dbg_port_buf(_buf, sizeof _buf, label, port, status); \
+ dbg_port_buf(_buf, sizeof(_buf), label, port, status); \
oxu_dbg(oxu, "%s\n", _buf); \
}
@@ -549,7 +549,7 @@ static void oxu_buf_free(struct oxu_hcd *oxu, struct ehci_qtd *qtd)
static inline void ehci_qtd_init(struct ehci_qtd *qtd, dma_addr_t dma)
{
- memset(qtd, 0, sizeof *qtd);
+ memset(qtd, 0, sizeof(*qtd));
qtd->qtd_dma = dma;
qtd->hw_token = cpu_to_le32(QTD_STS_HALT);
qtd->hw_next = EHCI_LIST_END;
@@ -585,7 +585,7 @@ static struct ehci_qtd *ehci_qtd_alloc(struct oxu_hcd *oxu)
if (i < QTD_NUM) {
qtd = (struct ehci_qtd *) &oxu->mem->qtd_pool[i];
- memset(qtd, 0, sizeof *qtd);
+ memset(qtd, 0, sizeof(*qtd));
qtd->hw_token = cpu_to_le32(QTD_STS_HALT);
qtd->hw_next = EHCI_LIST_END;
@@ -642,7 +642,7 @@ static struct ehci_qh *oxu_qh_alloc(struct oxu_hcd *oxu)
if (i < QHEAD_NUM) {
qh = (struct ehci_qh *) &oxu->mem->qh_pool[i];
- memset(qh, 0, sizeof *qh);
+ memset(qh, 0, sizeof(*qh));
kref_init(&qh->kref);
qh->oxu = oxu;
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index fd2a11473be7..67dce2d559e7 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -810,7 +810,7 @@ static int sl811h_urb_enqueue(
/* avoid all allocations within spinlocks */
if (!hep->hcpriv) {
- ep = kzalloc(sizeof *ep, mem_flags);
+ ep = kzalloc(sizeof(*ep), mem_flags);
if (ep == NULL)
return -ENOMEM;
}
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index 5cd080e0a685..01c9f4d944e2 100644
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -43,7 +43,7 @@ static struct xhci_segment *xhci_segment_alloc(struct xhci_hcd *xhci,
dma_addr_t dma;
int i;
- seg = kzalloc(sizeof *seg, flags);
+ seg = kzalloc(sizeof(*seg), flags);
if (!seg)
return NULL;
@@ -365,7 +365,7 @@ static struct xhci_ring *xhci_ring_alloc(struct xhci_hcd *xhci,
struct xhci_ring *ring;
int ret;
- ring = kzalloc(sizeof *(ring), flags);
+ ring = kzalloc(sizeof(*(ring)), flags);
if (!ring)
return NULL;
@@ -2375,7 +2375,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)
GFP_KERNEL);
if (!xhci->dcbaa)
goto fail;
- memset(xhci->dcbaa, 0, sizeof *(xhci->dcbaa));
+ memset(xhci->dcbaa, 0, sizeof(*(xhci->dcbaa)));
xhci->dcbaa->dma = dma;
xhci_dbg_trace(xhci, trace_xhci_dbg_init,
"// Device context base array address = 0x%llx (DMA), %p (virt)",
diff --git a/drivers/usb/musb/cppi_dma.c b/drivers/usb/musb/cppi_dma.c
index cc134109b056..0e78fec163a0 100644
--- a/drivers/usb/musb/cppi_dma.c
+++ b/drivers/usb/musb/cppi_dma.c
@@ -1305,7 +1305,7 @@ cppi_dma_controller_create(struct musb *musb, void __iomem *mregs)
struct platform_device *pdev = to_platform_device(dev);
int irq = platform_get_irq_byname(pdev, "dma");
- controller = kzalloc(sizeof *controller, GFP_KERNEL);
+ controller = kzalloc(sizeof(*controller), GFP_KERNEL);
if (!controller)
return NULL;
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index 87bd578799a8..e4561f765a03 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -1189,7 +1189,7 @@ struct usb_request *musb_alloc_request(struct usb_ep *ep, gfp_t gfp_flags)
struct musb *musb = musb_ep->musb;
struct musb_request *request = NULL;
- request = kzalloc(sizeof *request, gfp_flags);
+ request = kzalloc(sizeof(*request), gfp_flags);
if (!request) {
dev_dbg(musb->controller, "not enough memory\n");
return NULL;
@@ -1744,7 +1744,7 @@ init_peripheral_ep(struct musb *musb, struct musb_ep *ep, u8 epnum, int is_in)
{
struct musb_hw_ep *hw_ep = musb->endpoints + epnum;
- memset(ep, 0, sizeof *ep);
+ memset(ep, 0, sizeof(*ep));
ep->current_epnum = epnum;
ep->musb = musb;
diff --git a/drivers/usb/musb/musb_gadget_ep0.c b/drivers/usb/musb/musb_gadget_ep0.c
index 10d30afe4a3c..a87ae60d991b 100644
--- a/drivers/usb/musb/musb_gadget_ep0.c
+++ b/drivers/usb/musb/musb_gadget_ep0.c
@@ -602,7 +602,7 @@ musb_read_setup(struct musb *musb, struct usb_ctrlrequest *req)
struct musb_request *r;
void __iomem *regs = musb->control_ep->regs;
- musb_read_fifo(&musb->endpoints[0], sizeof *req, (u8 *)req);
+ musb_read_fifo(&musb->endpoints[0], sizeof(*req), (u8 *)req);
/* NOTE: earlier 2.6 versions changed setup packets to host
* order, but now USB packets always stay in USB byte order.
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index 795a45b1b25b..9d3ca7ba782d 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -2230,7 +2230,7 @@ static int musb_urb_enqueue(
* REVISIT consider a dedicated qh kmem_cache, so it's harder
* for bugs in other kernel code to break this driver...
*/
- qh = kzalloc(sizeof *qh, mem_flags);
+ qh = kzalloc(sizeof(*qh), mem_flags);
if (!qh) {
spin_lock_irqsave(&musb->lock, flags);
usb_hcd_unlink_urb_from_ep(hcd, urb);
diff --git a/drivers/usb/phy/phy-isp1301-omap.c b/drivers/usb/phy/phy-isp1301-omap.c
index 3af263cc0caa..b084c4113e74 100644
--- a/drivers/usb/phy/phy-isp1301-omap.c
+++ b/drivers/usb/phy/phy-isp1301-omap.c
@@ -1496,11 +1496,11 @@ isp1301_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
if (the_transceiver)
return 0;
- isp = kzalloc(sizeof *isp, GFP_KERNEL);
+ isp = kzalloc(sizeof(*isp), GFP_KERNEL);
if (!isp)
return 0;
- isp->phy.otg = kzalloc(sizeof *isp->phy.otg, GFP_KERNEL);
+ isp->phy.otg = kzalloc(sizeof(*isp->phy.otg), GFP_KERNEL);
if (!isp->phy.otg) {
kfree(isp);
return 0;
diff --git a/drivers/usb/renesas_usbhs/mod_gadget.c b/drivers/usb/renesas_usbhs/mod_gadget.c
index 657f9672ceba..00a92274f949 100644
--- a/drivers/usb/renesas_usbhs/mod_gadget.c
+++ b/drivers/usb/renesas_usbhs/mod_gadget.c
@@ -643,7 +643,7 @@ static struct usb_request *usbhsg_ep_alloc_request(struct usb_ep *ep,
{
struct usbhsg_request *ureq;
- ureq = kzalloc(sizeof *ureq, gfp_flags);
+ ureq = kzalloc(sizeof(*ureq), gfp_flags);
if (!ureq)
return NULL;
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index ae682e4eeaef..5183e53e7111 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -742,13 +742,13 @@ static int pl2303_ioctl(struct tty_struct *tty,
switch (cmd) {
case TIOCGSERIAL:
- memset(&ser, 0, sizeof ser);
+ memset(&ser, 0, sizeof(ser));
ser.type = PORT_16654;
ser.line = port->minor;
ser.port = port->port_number;
ser.baud_base = 460800;
- if (copy_to_user((void __user *)arg, &ser, sizeof ser))
+ if (copy_to_user((void __user *)arg, &ser, sizeof(ser)))
return -EFAULT;
return 0;
diff --git a/drivers/usb/storage/sddr55.c b/drivers/usb/storage/sddr55.c
index e5e0a25ecd96..f5c6c48bb044 100644
--- a/drivers/usb/storage/sddr55.c
+++ b/drivers/usb/storage/sddr55.c
@@ -813,16 +813,16 @@ static int sddr55_transport(struct scsi_cmnd *srb, struct us_data *us)
info->sense_data[12],
info->sense_data[13]);
- memcpy (ptr, info->sense_data, sizeof info->sense_data);
+ memcpy (ptr, info->sense_data, sizeof(info->sense_data));
ptr[0] = 0x70;
ptr[7] = 11;
- usb_stor_set_xfer_buf (ptr, sizeof info->sense_data, srb);
- memset (info->sense_data, 0, sizeof info->sense_data);
+ usb_stor_set_xfer_buf (ptr, sizeof(info->sense_data), srb);
+ memset (info->sense_data, 0, sizeof(info->sense_data));
return USB_STOR_TRANSPORT_GOOD;
}
- memset (info->sense_data, 0, sizeof info->sense_data);
+ memset (info->sense_data, 0, sizeof(info->sense_data));
/* Dummy up a response for INQUIRY since SDDR55 doesn't
respond to INQUIRY commands */
@@ -890,7 +890,7 @@ static int sddr55_transport(struct scsi_cmnd *srb, struct us_data *us)
if (srb->cmnd[0] == MODE_SENSE_10) {
- memcpy(ptr, mode_page_01, sizeof mode_page_01);
+ memcpy(ptr, mode_page_01, sizeof(mode_page_01));
ptr[3] = (info->read_only || info->force_read_only) ? 0x80 : 0;
usb_stor_set_xfer_buf(ptr, sizeof(mode_page_01), srb);
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index 9eda69e40678..9ab1644086c2 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -620,8 +620,8 @@ static void handle_rx(struct vhost_net *net)
num_buffers = cpu_to_vhost16(vq, headcount);
if (likely(mergeable) &&
- copy_to_iter(&num_buffers, sizeof num_buffers,
- &fixup) != sizeof num_buffers) {
+ copy_to_iter(&num_buffers, sizeof(num_buffers),
+ &fixup) != sizeof(num_buffers)) {
vq_err(vq, "Failed num_buffers write");
vhost_discard_vq_desc(vq, headcount);
break;
@@ -679,9 +679,9 @@ static int vhost_net_open(struct inode *inode, struct file *f)
struct vhost_virtqueue **vqs;
int i;
- n = kmalloc(sizeof *n, GFP_KERNEL | __GFP_NOWARN | __GFP_REPEAT);
+ n = kmalloc(sizeof(*n), GFP_KERNEL | __GFP_NOWARN | __GFP_REPEAT);
if (!n) {
- n = vmalloc(sizeof *n);
+ n = vmalloc(sizeof(*n));
if (!n)
return -ENOMEM;
}
@@ -814,7 +814,7 @@ static struct socket *get_raw_socket(int fd)
struct sockaddr_ll sa;
char buf[MAX_ADDR_LEN];
} uaddr;
- int uaddr_len = sizeof uaddr, r;
+ int uaddr_len = sizeof(uaddr), r;
struct socket *sock = sockfd_lookup(fd, &r);
if (!sock)
@@ -1060,16 +1060,16 @@ static long vhost_net_ioctl(struct file *f, unsigned int ioctl,
switch (ioctl) {
case VHOST_NET_SET_BACKEND:
- if (copy_from_user(&backend, argp, sizeof backend))
+ if (copy_from_user(&backend, argp, sizeof(backend)))
return -EFAULT;
return vhost_net_set_backend(n, backend.index, backend.fd);
case VHOST_GET_FEATURES:
features = VHOST_NET_FEATURES;
- if (copy_to_user(featurep, &features, sizeof features))
+ if (copy_to_user(featurep, &features, sizeof(features)))
return -EFAULT;
return 0;
case VHOST_SET_FEATURES:
- if (copy_from_user(&features, featurep, sizeof features))
+ if (copy_from_user(&features, featurep, sizeof(features)))
return -EFAULT;
if (features & ~VHOST_NET_FEATURES)
return -EOPNOTSUPP;
diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c
index 29cfc57d496e..05410866c556 100644
--- a/drivers/vhost/scsi.c
+++ b/drivers/vhost/scsi.c
@@ -1488,21 +1488,21 @@ vhost_scsi_ioctl(struct file *f,
switch (ioctl) {
case VHOST_SCSI_SET_ENDPOINT:
- if (copy_from_user(&backend, argp, sizeof backend))
+ if (copy_from_user(&backend, argp, sizeof(backend)))
return -EFAULT;
if (backend.reserved != 0)
return -EOPNOTSUPP;
return vhost_scsi_set_endpoint(vs, &backend);
case VHOST_SCSI_CLEAR_ENDPOINT:
- if (copy_from_user(&backend, argp, sizeof backend))
+ if (copy_from_user(&backend, argp, sizeof(backend)))
return -EFAULT;
if (backend.reserved != 0)
return -EOPNOTSUPP;
return vhost_scsi_clear_endpoint(vs, &backend);
case VHOST_SCSI_GET_ABI_VERSION:
- if (copy_to_user(argp, &abi_version, sizeof abi_version))
+ if (copy_to_user(argp, &abi_version, sizeof(abi_version)))
return -EFAULT;
return 0;
case VHOST_SCSI_SET_EVENTS_MISSED:
@@ -1521,11 +1521,11 @@ vhost_scsi_ioctl(struct file *f,
return 0;
case VHOST_GET_FEATURES:
features = VHOST_SCSI_FEATURES;
- if (copy_to_user(featurep, &features, sizeof features))
+ if (copy_to_user(featurep, &features, sizeof(features)))
return -EFAULT;
return 0;
case VHOST_SET_FEATURES:
- if (copy_from_user(&features, featurep, sizeof features))
+ if (copy_from_user(&features, featurep, sizeof(features)))
return -EFAULT;
return vhost_scsi_set_features(vs, features);
default:
diff --git a/drivers/vhost/test.c b/drivers/vhost/test.c
index f2882ac98726..c3a1b505906c 100644
--- a/drivers/vhost/test.c
+++ b/drivers/vhost/test.c
@@ -101,7 +101,7 @@ static void handle_vq_kick(struct vhost_work *work)
static int vhost_test_open(struct inode *inode, struct file *f)
{
- struct vhost_test *n = kmalloc(sizeof *n, GFP_KERNEL);
+ struct vhost_test *n = kmalloc(sizeof(*n), GFP_KERNEL);
struct vhost_dev *dev;
struct vhost_virtqueue **vqs;
@@ -268,17 +268,17 @@ static long vhost_test_ioctl(struct file *f, unsigned int ioctl,
int r;
switch (ioctl) {
case VHOST_TEST_RUN:
- if (copy_from_user(&test, argp, sizeof test))
+ if (copy_from_user(&test, argp, sizeof(test)))
return -EFAULT;
return vhost_test_run(n, test);
case VHOST_GET_FEATURES:
features = VHOST_FEATURES;
- if (copy_to_user(featurep, &features, sizeof features))
+ if (copy_to_user(featurep, &features, sizeof(features)))
return -EFAULT;
return 0;
case VHOST_SET_FEATURES:
printk(KERN_ERR "1\n");
- if (copy_from_user(&features, featurep, sizeof features))
+ if (copy_from_user(&features, featurep, sizeof(features)))
return -EFAULT;
printk(KERN_ERR "2\n");
if (features & ~VHOST_FEATURES)
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index ad2146a9ab2d..1381964b02dd 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -347,10 +347,10 @@ static long vhost_dev_alloc_iovecs(struct vhost_dev *dev)
for (i = 0; i < dev->nvqs; ++i) {
vq = dev->vqs[i];
- vq->indirect = kmalloc(sizeof *vq->indirect * UIO_MAXIOV,
+ vq->indirect = kmalloc(sizeof(*vq->indirect) * UIO_MAXIOV,
GFP_KERNEL);
- vq->log = kmalloc(sizeof *vq->log * UIO_MAXIOV, GFP_KERNEL);
- vq->heads = kmalloc(sizeof *vq->heads * UIO_MAXIOV, GFP_KERNEL);
+ vq->log = kmalloc(sizeof(*vq->log) * UIO_MAXIOV, GFP_KERNEL);
+ vq->heads = kmalloc(sizeof(*vq->heads) * UIO_MAXIOV, GFP_KERNEL);
if (!vq->indirect || !vq->log || !vq->heads)
goto err_nomem;
}
@@ -631,11 +631,11 @@ static int vq_access_ok(struct vhost_virtqueue *vq, unsigned int num,
struct vring_used __user *used)
{
size_t s = vhost_has_feature(vq, VIRTIO_RING_F_EVENT_IDX) ? 2 : 0;
- return access_ok(VERIFY_READ, desc, num * sizeof *desc) &&
+ return access_ok(VERIFY_READ, desc, num * sizeof(*desc)) &&
access_ok(VERIFY_READ, avail,
- sizeof *avail + num * sizeof *avail->ring + s) &&
+ sizeof(*avail) + num * sizeof(*avail->ring) + s) &&
access_ok(VERIFY_WRITE, used,
- sizeof *used + num * sizeof *used->ring + s);
+ sizeof(*used) + num * sizeof(*used->ring) + s);
}
/* Can we log writes? */
@@ -656,8 +656,8 @@ static int vq_log_access_ok(struct vhost_virtqueue *vq,
return vq_memory_access_ok(log_base, vq->memory,
vhost_has_feature(vq, VHOST_F_LOG_ALL)) &&
(!vq->log_used || log_access_ok(log_base, vq->log_addr,
- sizeof *vq->used +
- vq->num * sizeof *vq->used->ring + s));
+ sizeof(*vq->used) +
+ vq->num * sizeof(*vq->used->ring) + s));
}
/* Can we start vq? */
@@ -706,7 +706,7 @@ static long vhost_set_memory(struct vhost_dev *d, struct vhost_memory __user *m)
memcpy(newmem, &mem, size);
if (copy_from_user(newmem->regions, m->regions,
- mem.nregions * sizeof *m->regions)) {
+ mem.nregions * sizeof(*m->regions))) {
kvfree(newmem);
return -EFAULT;
}
@@ -761,7 +761,7 @@ long vhost_vring_ioctl(struct vhost_dev *d, int ioctl, void __user *argp)
r = -EBUSY;
break;
}
- if (copy_from_user(&s, argp, sizeof s)) {
+ if (copy_from_user(&s, argp, sizeof(s))) {
r = -EFAULT;
break;
}
@@ -778,7 +778,7 @@ long vhost_vring_ioctl(struct vhost_dev *d, int ioctl, void __user *argp)
r = -EBUSY;
break;
}
- if (copy_from_user(&s, argp, sizeof s)) {
+ if (copy_from_user(&s, argp, sizeof(s))) {
r = -EFAULT;
break;
}
@@ -793,11 +793,11 @@ long vhost_vring_ioctl(struct vhost_dev *d, int ioctl, void __user *argp)
case VHOST_GET_VRING_BASE:
s.index = idx;
s.num = vq->last_avail_idx;
- if (copy_to_user(argp, &s, sizeof s))
+ if (copy_to_user(argp, &s, sizeof(s)))
r = -EFAULT;
break;
case VHOST_SET_VRING_ADDR:
- if (copy_from_user(&a, argp, sizeof a)) {
+ if (copy_from_user(&a, argp, sizeof(a))) {
r = -EFAULT;
break;
}
@@ -839,8 +839,8 @@ long vhost_vring_ioctl(struct vhost_dev *d, int ioctl, void __user *argp)
/* Also validate log access for used ring if enabled. */
if ((a.flags & (0x1 << VHOST_VRING_F_LOG)) &&
!log_access_ok(vq->log_base, a.log_guest_addr,
- sizeof *vq->used +
- vq->num * sizeof *vq->used->ring)) {
+ sizeof(*vq->used) +
+ vq->num * sizeof(*vq->used->ring))) {
r = -EINVAL;
break;
}
@@ -853,7 +853,7 @@ long vhost_vring_ioctl(struct vhost_dev *d, int ioctl, void __user *argp)
vq->used = (void __user *)(unsigned long)a.used_user_addr;
break;
case VHOST_SET_VRING_KICK:
- if (copy_from_user(&f, argp, sizeof f)) {
+ if (copy_from_user(&f, argp, sizeof(f))) {
r = -EFAULT;
break;
}
@@ -869,7 +869,7 @@ long vhost_vring_ioctl(struct vhost_dev *d, int ioctl, void __user *argp)
filep = eventfp;
break;
case VHOST_SET_VRING_CALL:
- if (copy_from_user(&f, argp, sizeof f)) {
+ if (copy_from_user(&f, argp, sizeof(f))) {
r = -EFAULT;
break;
}
@@ -888,7 +888,7 @@ long vhost_vring_ioctl(struct vhost_dev *d, int ioctl, void __user *argp)
filep = eventfp;
break;
case VHOST_SET_VRING_ERR:
- if (copy_from_user(&f, argp, sizeof f)) {
+ if (copy_from_user(&f, argp, sizeof(f))) {
r = -EFAULT;
break;
}
@@ -960,7 +960,7 @@ long vhost_dev_ioctl(struct vhost_dev *d, unsigned int ioctl, void __user *argp)
r = vhost_set_memory(d, argp);
break;
case VHOST_SET_LOG_BASE:
- if (copy_from_user(&p, argp, sizeof p)) {
+ if (copy_from_user(&p, argp, sizeof(p))) {
r = -EFAULT;
break;
}
@@ -1126,7 +1126,7 @@ static int vhost_update_used_flags(struct vhost_virtqueue *vq)
used = &vq->used->flags;
log_write(vq->log_base, vq->log_addr +
(used - (void __user *)vq->used),
- sizeof vq->used->flags);
+ sizeof(vq->used->flags));
if (vq->log_ctx)
eventfd_signal(vq->log_ctx, 1);
}
@@ -1145,7 +1145,7 @@ static int vhost_update_avail_event(struct vhost_virtqueue *vq, u16 avail_event)
used = vhost_avail_event(vq);
log_write(vq->log_base, vq->log_addr +
(used - (void __user *)vq->used),
- sizeof *vhost_avail_event(vq));
+ sizeof(*vhost_avail_event(vq)));
if (vq->log_ctx)
eventfd_signal(vq->log_ctx, 1);
}
@@ -1167,7 +1167,7 @@ int vhost_init_used(struct vhost_virtqueue *vq)
if (r)
return r;
vq->signalled_used_valid = false;
- if (!access_ok(VERIFY_READ, &vq->used->idx, sizeof vq->used->idx))
+ if (!access_ok(VERIFY_READ, &vq->used->idx, sizeof(vq->used->idx)))
return -EFAULT;
r = __get_user(last_used_idx, &vq->used->idx);
if (r)
@@ -1245,11 +1245,11 @@ static int get_indirect(struct vhost_virtqueue *vq,
int ret;
/* Sanity check */
- if (unlikely(len % sizeof desc)) {
+ if (unlikely(len % sizeof(desc))) {
vq_err(vq, "Invalid length in indirect descriptor: "
"len 0x%llx not multiple of 0x%zx\n",
(unsigned long long)len,
- sizeof desc);
+ sizeof(desc));
return -EINVAL;
}
@@ -1265,7 +1265,7 @@ static int get_indirect(struct vhost_virtqueue *vq,
* architectures only need a compiler barrier here. */
read_barrier_depends();
- count = len / sizeof desc;
+ count = len / sizeof(desc);
/* Buffers are chained via a 16 bit next field, so
* we can have at most 2^16 of these. */
if (unlikely(count > USHRT_MAX + 1)) {
@@ -1285,12 +1285,12 @@ static int get_indirect(struct vhost_virtqueue *vq,
if (unlikely(copy_from_iter(&desc, sizeof(desc), &from) !=
sizeof(desc))) {
vq_err(vq, "Failed indirect descriptor: idx %d, %zx\n",
- i, (size_t)vhost64_to_cpu(vq, indirect->addr) + i * sizeof desc);
+ i, (size_t)vhost64_to_cpu(vq, indirect->addr) + i * sizeof(desc));
return -EINVAL;
}
if (unlikely(desc.flags & cpu_to_vhost16(vq, VRING_DESC_F_INDIRECT))) {
vq_err(vq, "Nested indirect descriptor: idx %d, %zx\n",
- i, (size_t)vhost64_to_cpu(vq, indirect->addr) + i * sizeof desc);
+ i, (size_t)vhost64_to_cpu(vq, indirect->addr) + i * sizeof(desc));
return -EINVAL;
}
@@ -1404,7 +1404,7 @@ int vhost_get_vq_desc(struct vhost_virtqueue *vq,
i, vq->num, head);
return -EINVAL;
}
- ret = __copy_from_user(&desc, vq->desc + i, sizeof desc);
+ ret = __copy_from_user(&desc, vq->desc + i, sizeof(desc));
if (unlikely(ret)) {
vq_err(vq, "Failed to get descriptor: idx %d addr %p\n",
i, vq->desc + i);
@@ -1500,7 +1500,7 @@ static int __vhost_add_used_n(struct vhost_virtqueue *vq,
vq_err(vq, "Failed to write used len");
return -EFAULT;
}
- } else if (__copy_to_user(used, heads, count * sizeof *used)) {
+ } else if (__copy_to_user(used, heads, count * sizeof(*used))) {
vq_err(vq, "Failed to write used");
return -EFAULT;
}
@@ -1511,7 +1511,7 @@ static int __vhost_add_used_n(struct vhost_virtqueue *vq,
log_write(vq->log_base,
vq->log_addr +
((void __user *)used - (void __user *)vq->used),
- count * sizeof *used);
+ count * sizeof(*used));
}
old = vq->last_used_idx;
new = (vq->last_used_idx += count);
@@ -1552,7 +1552,7 @@ int vhost_add_used_n(struct vhost_virtqueue *vq, struct vring_used_elem *heads,
/* Log used index update. */
log_write(vq->log_base,
vq->log_addr + offsetof(struct vring_used, idx),
- sizeof vq->used->idx);
+ sizeof(vq->used->idx));
if (vq->log_ctx)
eventfd_signal(vq->log_ctx, 1);
}
diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c
index 7da1ad03acb5..dbbe9c2db686 100644
--- a/drivers/video/console/sticore.c
+++ b/drivers/video/console/sticore.c
@@ -284,7 +284,7 @@ static char default_sti_path[21] __read_mostly;
static int sti_setup(char *str)
{
if (str)
- strlcpy (default_sti_path, str, sizeof (default_sti_path));
+ strlcpy (default_sti_path, str, sizeof(default_sti_path));
return 1;
}
@@ -733,7 +733,7 @@ static int sti_read_rom(int wordmode, struct sti_struct *sti,
struct sti_rom *raw = NULL;
unsigned long revno;
- cooked = kmalloc(sizeof *cooked, GFP_KERNEL);
+ cooked = kmalloc(sizeof(*cooked), GFP_KERNEL);
if (!cooked)
goto out_err;
diff --git a/drivers/video/fbdev/carminefb.c b/drivers/video/fbdev/carminefb.c
index 65f7c15f5fdb..1cba1c271b59 100644
--- a/drivers/video/fbdev/carminefb.c
+++ b/drivers/video/fbdev/carminefb.c
@@ -545,7 +545,7 @@ static int alloc_carmine_fb(void __iomem *regs, void __iomem *smem_base,
struct fb_info *info;
struct carmine_fb *par;
- info = framebuffer_alloc(sizeof *par, device);
+ info = framebuffer_alloc(sizeof(*par), device);
if (!info)
return -ENOMEM;
@@ -618,7 +618,7 @@ static int carminefb_probe(struct pci_dev *dev, const struct pci_device_id *ent)
return ret;
ret = -ENOMEM;
- hw = kzalloc(sizeof *hw, GFP_KERNEL);
+ hw = kzalloc(sizeof(*hw), GFP_KERNEL);
if (!hw)
goto err_enable_pci;
diff --git a/drivers/video/fbdev/omap2/omapfb/omapfb-main.c b/drivers/video/fbdev/omap2/omapfb/omapfb-main.c
index d3af01c94a58..e6b20d009762 100644
--- a/drivers/video/fbdev/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/fbdev/omap2/omapfb/omapfb-main.c
@@ -1378,7 +1378,7 @@ static int omapfb_alloc_fbmem(struct fb_info *fbi, unsigned long size,
rg->paddr = 0;
rg->vaddr = NULL;
- memset(&rg->vrfb, 0, sizeof rg->vrfb);
+ memset(&rg->vrfb, 0, sizeof(rg->vrfb));
rg->size = 0;
rg->type = 0;
rg->alloc = false;
diff --git a/drivers/video/fbdev/tmiofb.c b/drivers/video/fbdev/tmiofb.c
index 7fb4e321a431..2fa438e4f96e 100644
--- a/drivers/video/fbdev/tmiofb.c
+++ b/drivers/video/fbdev/tmiofb.c
@@ -518,7 +518,7 @@ static int tmiofb_ioctl(struct fb_info *fbi,
void __user *argp = (void __user *) arg;
tmiofb_vblank(fbi, &vblank);
- if (copy_to_user(argp, &vblank, sizeof vblank))
+ if (copy_to_user(argp, &vblank, sizeof(vblank)))
return -EFAULT;
return 0;
}
diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c
index 0c3691f46575..c8da32af4195 100644
--- a/drivers/virtio/virtio_balloon.c
+++ b/drivers/virtio/virtio_balloon.c
@@ -410,7 +410,7 @@ static int init_vqs(struct virtio_balloon *vb)
* Prime this virtqueue with one buffer so the hypervisor can
* use it to signal us later (it can't be broken yet!).
*/
- sg_init_one(&sg, vb->stats, sizeof vb->stats);
+ sg_init_one(&sg, vb->stats, sizeof(vb->stats));
if (virtqueue_add_outbuf(vb->stats_vq, &sg, 1, vb, GFP_KERNEL)
< 0)
BUG();
diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
index 745c6ee1bb3e..a17b3788733e 100644
--- a/drivers/virtio/virtio_mmio.c
+++ b/drivers/virtio/virtio_mmio.c
@@ -174,21 +174,21 @@ static void vm_get(struct virtio_device *vdev, unsigned offset,
switch (len) {
case 1:
b = readb(base + offset);
- memcpy(buf, &b, sizeof b);
+ memcpy(buf, &b, sizeof(b));
break;
case 2:
w = cpu_to_le16(readw(base + offset));
- memcpy(buf, &w, sizeof w);
+ memcpy(buf, &w, sizeof(w));
break;
case 4:
l = cpu_to_le32(readl(base + offset));
- memcpy(buf, &l, sizeof l);
+ memcpy(buf, &l, sizeof(l));
break;
case 8:
l = cpu_to_le32(readl(base + offset));
- memcpy(buf, &l, sizeof l);
- l = cpu_to_le32(ioread32(base + offset + sizeof l));
- memcpy(buf + sizeof l, &l, sizeof l);
+ memcpy(buf, &l, sizeof(l));
+ l = cpu_to_le32(ioread32(base + offset + sizeof(l)));
+ memcpy(buf + sizeof(l), &l, sizeof(l));
break;
default:
BUG();
@@ -216,22 +216,22 @@ static void vm_set(struct virtio_device *vdev, unsigned offset,
switch (len) {
case 1:
- memcpy(&b, buf, sizeof b);
+ memcpy(&b, buf, sizeof(b));
writeb(b, base + offset);
break;
case 2:
- memcpy(&w, buf, sizeof w);
+ memcpy(&w, buf, sizeof(w));
writew(le16_to_cpu(w), base + offset);
break;
case 4:
- memcpy(&l, buf, sizeof l);
+ memcpy(&l, buf, sizeof(l));
writel(le32_to_cpu(l), base + offset);
break;
case 8:
- memcpy(&l, buf, sizeof l);
+ memcpy(&l, buf, sizeof(l));
writel(le32_to_cpu(l), base + offset);
- memcpy(&l, buf + sizeof l, sizeof l);
- writel(le32_to_cpu(l), base + offset + sizeof l);
+ memcpy(&l, buf + sizeof(l), sizeof(l));
+ writel(le32_to_cpu(l), base + offset + sizeof(l));
break;
default:
BUG();
diff --git a/drivers/virtio/virtio_pci_common.c b/drivers/virtio/virtio_pci_common.c
index f6bed86c17f9..41fda6695c36 100644
--- a/drivers/virtio/virtio_pci_common.c
+++ b/drivers/virtio/virtio_pci_common.c
@@ -147,16 +147,16 @@ static int vp_request_msix_vectors(struct virtio_device *vdev, int nvectors,
vp_dev->msix_vectors = nvectors;
- vp_dev->msix_entries = kmalloc(nvectors * sizeof *vp_dev->msix_entries,
+ vp_dev->msix_entries = kmalloc(nvectors * sizeof(*vp_dev->msix_entries),
GFP_KERNEL);
if (!vp_dev->msix_entries)
goto error;
- vp_dev->msix_names = kmalloc(nvectors * sizeof *vp_dev->msix_names,
+ vp_dev->msix_names = kmalloc(nvectors * sizeof(*vp_dev->msix_names),
GFP_KERNEL);
if (!vp_dev->msix_names)
goto error;
vp_dev->msix_affinity_masks
- = kzalloc(nvectors * sizeof *vp_dev->msix_affinity_masks,
+ = kzalloc(nvectors * sizeof(*vp_dev->msix_affinity_masks),
GFP_KERNEL);
if (!vp_dev->msix_affinity_masks)
goto error;
@@ -176,7 +176,7 @@ static int vp_request_msix_vectors(struct virtio_device *vdev, int nvectors,
/* Set the vector used for configuration */
v = vp_dev->msix_used_vectors;
- snprintf(vp_dev->msix_names[v], sizeof *vp_dev->msix_names,
+ snprintf(vp_dev->msix_names[v], sizeof(*vp_dev->msix_names),
"%s-config", name);
err = request_irq(vp_dev->msix_entries[v].vector,
vp_config_changed, 0, vp_dev->msix_names[v],
@@ -195,7 +195,7 @@ static int vp_request_msix_vectors(struct virtio_device *vdev, int nvectors,
if (!per_vq_vectors) {
/* Shared vector for all VQs */
v = vp_dev->msix_used_vectors;
- snprintf(vp_dev->msix_names[v], sizeof *vp_dev->msix_names,
+ snprintf(vp_dev->msix_names[v], sizeof(*vp_dev->msix_names),
"%s-virtqueues", name);
err = request_irq(vp_dev->msix_entries[v].vector,
vp_vring_interrupt, 0, vp_dev->msix_names[v],
@@ -228,7 +228,7 @@ static struct virtqueue *vp_setup_vq(struct virtio_device *vdev, unsigned index,
u16 msix_vec)
{
struct virtio_pci_device *vp_dev = to_vp_device(vdev);
- struct virtio_pci_vq_info *info = kmalloc(sizeof *info, GFP_KERNEL);
+ struct virtio_pci_vq_info *info = kmalloc(sizeof(*info), GFP_KERNEL);
struct virtqueue *vq;
unsigned long flags;
@@ -304,7 +304,7 @@ static int vp_try_to_find_vqs(struct virtio_device *vdev, unsigned nvqs,
u16 msix_vec;
int i, err, nvectors, allocated_vectors;
- vp_dev->vqs = kmalloc(nvqs * sizeof *vp_dev->vqs, GFP_KERNEL);
+ vp_dev->vqs = kmalloc(nvqs * sizeof(*vp_dev->vqs), GFP_KERNEL);
if (!vp_dev->vqs)
return -ENOMEM;
@@ -353,7 +353,7 @@ static int vp_try_to_find_vqs(struct virtio_device *vdev, unsigned nvqs,
/* allocate per-vq irq if available and necessary */
snprintf(vp_dev->msix_names[msix_vec],
- sizeof *vp_dev->msix_names,
+ sizeof(*vp_dev->msix_names),
"%s-%s",
dev_name(&vp_dev->vdev.dev), names[i]);
err = request_irq(vp_dev->msix_entries[msix_vec].vector,
diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c
index c0c11fad4611..edbc6f9c89b4 100644
--- a/drivers/virtio/virtio_pci_modern.c
+++ b/drivers/virtio/virtio_pci_modern.c
@@ -188,21 +188,21 @@ static void vp_get(struct virtio_device *vdev, unsigned offset,
switch (len) {
case 1:
b = ioread8(vp_dev->device + offset);
- memcpy(buf, &b, sizeof b);
+ memcpy(buf, &b, sizeof(b));
break;
case 2:
w = cpu_to_le16(ioread16(vp_dev->device + offset));
- memcpy(buf, &w, sizeof w);
+ memcpy(buf, &w, sizeof(w));
break;
case 4:
l = cpu_to_le32(ioread32(vp_dev->device + offset));
- memcpy(buf, &l, sizeof l);
+ memcpy(buf, &l, sizeof(l));
break;
case 8:
l = cpu_to_le32(ioread32(vp_dev->device + offset));
- memcpy(buf, &l, sizeof l);
- l = cpu_to_le32(ioread32(vp_dev->device + offset + sizeof l));
- memcpy(buf + sizeof l, &l, sizeof l);
+ memcpy(buf, &l, sizeof(l));
+ l = cpu_to_le32(ioread32(vp_dev->device + offset + sizeof(l)));
+ memcpy(buf + sizeof(l), &l, sizeof(l));
break;
default:
BUG();
@@ -223,22 +223,22 @@ static void vp_set(struct virtio_device *vdev, unsigned offset,
switch (len) {
case 1:
- memcpy(&b, buf, sizeof b);
+ memcpy(&b, buf, sizeof(b));
iowrite8(b, vp_dev->device + offset);
break;
case 2:
- memcpy(&w, buf, sizeof w);
+ memcpy(&w, buf, sizeof(w));
iowrite16(le16_to_cpu(w), vp_dev->device + offset);
break;
case 4:
- memcpy(&l, buf, sizeof l);
+ memcpy(&l, buf, sizeof(l));
iowrite32(le32_to_cpu(l), vp_dev->device + offset);
break;
case 8:
- memcpy(&l, buf, sizeof l);
+ memcpy(&l, buf, sizeof(l));
iowrite32(le32_to_cpu(l), vp_dev->device + offset);
- memcpy(&l, buf + sizeof l, sizeof l);
- iowrite32(le32_to_cpu(l), vp_dev->device + offset + sizeof l);
+ memcpy(&l, buf + sizeof(l), sizeof(l));
+ iowrite32(le32_to_cpu(l), vp_dev->device + offset + sizeof(l));
break;
default:
BUG();
diff --git a/fs/autofs4/expire.c b/fs/autofs4/expire.c
index 1cebc3c52fa5..cba6666a7546 100644
--- a/fs/autofs4/expire.c
+++ b/fs/autofs4/expire.c
@@ -531,7 +531,7 @@ int autofs4_expire_run(struct super_block *sb,
struct dentry *dentry;
int ret = 0;
- memset(&pkt,0,sizeof pkt);
+ memset(&pkt,0,sizeof(pkt));
pkt.hdr.proto_version = sbi->version;
pkt.hdr.type = autofs_ptype_expire;
diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
index 35b755e79c2d..57ce5c76c790 100644
--- a/fs/autofs4/waitq.c
+++ b/fs/autofs4/waitq.c
@@ -105,7 +105,7 @@ static void autofs4_notify_daemon(struct autofs_sb_info *sbi,
DPRINTK("wait id = 0x%08lx, name = %.*s, type=%d",
(unsigned long) wq->wait_queue_token, wq->name.len, wq->name.name, type);
- memset(&pkt,0,sizeof pkt); /* For security reasons */
+ memset(&pkt,0,sizeof(pkt)); /* For security reasons */
pkt.hdr.proto_version = sbi->version;
pkt.hdr.type = type;
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index 051ea4809c14..1630d4b00f22 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -265,7 +265,7 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
#undef NEW_AUX_ENT
/* AT_NULL is zero; clear the rest too */
memset(&elf_info[ei_index], 0,
- sizeof current->mm->saved_auxv - ei_index * sizeof elf_info[0]);
+ sizeof(current->mm->saved_auxv) - ei_index * sizeof(elf_info[0]));
/* And advance past the AT_NULL entry. */
ei_index += 2;
@@ -1297,7 +1297,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
u32 cmp;
char elfmag[SELFMAG];
} magic;
- BUILD_BUG_ON(SELFMAG != sizeof word);
+ BUILD_BUG_ON(SELFMAG != sizeof(word));
magic.elfmag[EI_MAG0] = ELFMAG0;
magic.elfmag[EI_MAG1] = ELFMAG1;
magic.elfmag[EI_MAG2] = ELFMAG2;
diff --git a/fs/char_dev.c b/fs/char_dev.c
index 24b142569ca9..ed640ad2e2b8 100644
--- a/fs/char_dev.c
+++ b/fs/char_dev.c
@@ -537,7 +537,7 @@ struct cdev *cdev_alloc(void)
*/
void cdev_init(struct cdev *cdev, const struct file_operations *fops)
{
- memset(cdev, 0, sizeof *cdev);
+ memset(cdev, 0, sizeof(*cdev));
INIT_LIST_HEAD(&cdev->list);
kobject_init(&cdev->kobj, &ktype_cdev_default);
cdev->ops = fops;
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 4fbd92d2e113..7edfa47b7ead 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -3705,7 +3705,7 @@ cifs_mount(struct cifs_sb_info *cifs_sb, struct smb_vol *volume_info)
goto mount_fail_check;
/* now, hang the tcon off of the superblock */
- tlink = kzalloc(sizeof *tlink, GFP_KERNEL);
+ tlink = kzalloc(sizeof(*tlink), GFP_KERNEL);
if (tlink == NULL) {
rc = -ENOMEM;
goto mount_fail_check;
diff --git a/fs/compat.c b/fs/compat.c
index a71936a3f4cb..82d351098ab1 100644
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -212,7 +212,7 @@ COMPAT_SYSCALL_DEFINE2(newfstat, unsigned int, fd,
static int put_compat_statfs(struct compat_statfs __user *ubuf, struct kstatfs *kbuf)
{
- if (sizeof ubuf->f_blocks == 4) {
+ if (sizeof(ubuf->f_blocks) == 4) {
if ((kbuf->f_blocks | kbuf->f_bfree | kbuf->f_bavail |
kbuf->f_bsize | kbuf->f_frsize) & 0xffffffff00000000ULL)
return -EOVERFLOW;
@@ -267,7 +267,7 @@ COMPAT_SYSCALL_DEFINE2(fstatfs, unsigned int, fd, struct compat_statfs __user *,
static int put_compat_statfs64(struct compat_statfs64 __user *ubuf, struct kstatfs *kbuf)
{
- if (sizeof ubuf->f_blocks == 4) {
+ if (sizeof(ubuf->f_blocks) == 4) {
if ((kbuf->f_blocks | kbuf->f_bfree | kbuf->f_bavail |
kbuf->f_bsize | kbuf->f_frsize) & 0xffffffff00000000ULL)
return -EOVERFLOW;
@@ -693,7 +693,7 @@ static void *do_ncp_super_data_conv(void *raw_data)
n->file_mode = c_n->file_mode;
n->gid = c_n->gid;
n->uid = c_n->uid;
- memmove (n->mounted_vol, c_n->mounted_vol, (sizeof (c_n->mounted_vol) + 3 * sizeof (unsigned int)));
+ memmove (n->mounted_vol, c_n->mounted_vol, (sizeof(c_n->mounted_vol) + 3 * sizeof (unsigned int)));
n->wdog_pid = c_n->wdog_pid;
n->mounted_uid = c_n->mounted_uid;
} else if (version == 4) {
diff --git a/fs/hpfs/namei.c b/fs/hpfs/namei.c
index 506765afa1a3..4c4fb25f6c67 100644
--- a/fs/hpfs/namei.c
+++ b/fs/hpfs/namei.c
@@ -43,7 +43,7 @@ static int hpfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
dnode = hpfs_alloc_dnode(dir->i_sb, fno, &dno, &qbh0);
if (!dnode)
goto bail1;
- memset(&dee, 0, sizeof dee);
+ memset(&dee, 0, sizeof(dee));
dee.directory = 1;
if (!(mode & 0222)) dee.read_only = 1;
/*dee.archive = 0;*/
@@ -145,7 +145,7 @@ static int hpfs_create(struct inode *dir, struct dentry *dentry, umode_t mode, b
fnode = hpfs_alloc_fnode(dir->i_sb, hpfs_i(dir)->i_dno, &fno, &bh);
if (!fnode)
goto bail;
- memset(&dee, 0, sizeof dee);
+ memset(&dee, 0, sizeof(dee));
if (!(mode & 0222)) dee.read_only = 1;
dee.archive = 1;
dee.hidden = name[0] == '.';
@@ -232,7 +232,7 @@ static int hpfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, de
fnode = hpfs_alloc_fnode(dir->i_sb, hpfs_i(dir)->i_dno, &fno, &bh);
if (!fnode)
goto bail;
- memset(&dee, 0, sizeof dee);
+ memset(&dee, 0, sizeof(dee));
if (!(mode & 0222)) dee.read_only = 1;
dee.archive = 1;
dee.hidden = name[0] == '.';
@@ -309,7 +309,7 @@ static int hpfs_symlink(struct inode *dir, struct dentry *dentry, const char *sy
fnode = hpfs_alloc_fnode(dir->i_sb, hpfs_i(dir)->i_dno, &fno, &bh);
if (!fnode)
goto bail;
- memset(&dee, 0, sizeof dee);
+ memset(&dee, 0, sizeof(dee));
dee.archive = 1;
dee.hidden = name[0] == '.';
dee.fnode = cpu_to_le32(fno);
diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c
index bcd2d41b318a..fc615ea62d5b 100644
--- a/fs/isofs/inode.c
+++ b/fs/isofs/inode.c
@@ -628,7 +628,7 @@ static int isofs_fill_super(struct super_block *s, void *data, int silent)
* ISO CDs can match hdp->id==HS_STANDARD_ID as well. To ensure
* proper identification in this case, we first check for ISO.
*/
- if (strncmp (vdp->id, ISO_STANDARD_ID, sizeof vdp->id) == 0) {
+ if (strncmp (vdp->id, ISO_STANDARD_ID, sizeof(vdp->id)) == 0) {
if (isonum_711(vdp->type) == ISO_VD_END)
break;
if (isonum_711(vdp->type) == ISO_VD_PRIMARY) {
@@ -663,7 +663,7 @@ static int isofs_fill_super(struct super_block *s, void *data, int silent)
}
#endif
} else {
- if (strncmp (hdp->id, HS_STANDARD_ID, sizeof hdp->id) == 0) {
+ if (strncmp (hdp->id, HS_STANDARD_ID, sizeof(hdp->id)) == 0) {
if (isonum_711(hdp->type) != ISO_VD_PRIMARY)
goto out_freebh;
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 85d16c67c33e..0afebfeea006 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -724,7 +724,7 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
.private = &mss,
};
- memset(&mss, 0, sizeof mss);
+ memset(&mss, 0, sizeof(mss));
#ifdef CONFIG_SHMEM
if (vma->vm_file && shmem_mapping(vma->vm_file->f_mapping)) {
diff --git a/fs/pstore/inode.c b/fs/pstore/inode.c
index dc645b66cd79..a4616d824574 100644
--- a/fs/pstore/inode.c
+++ b/fs/pstore/inode.c
@@ -329,7 +329,7 @@ int pstore_mkfile(enum pstore_type_id type, char *psname, u64 id, int count,
goto fail;
inode->i_mode = S_IFREG | 0444;
inode->i_fop = &pstore_file_operations;
- private = kmalloc(sizeof *private + size, GFP_KERNEL);
+ private = kmalloc(sizeof(*private) + size, GFP_KERNEL);
if (!private)
goto fail_alloc;
private->type = type;
diff --git a/fs/statfs.c b/fs/statfs.c
index 083dc0ac9140..825542123b3c 100644
--- a/fs/statfs.c
+++ b/fs/statfs.c
@@ -110,7 +110,7 @@ static int do_statfs_native(struct kstatfs *st, struct statfs __user *p)
if (sizeof(buf) == sizeof(*st))
memcpy(&buf, st, sizeof(*st));
else {
- if (sizeof buf.f_blocks == 4) {
+ if (sizeof(buf.f_blocks) == 4) {
if ((st->f_blocks | st->f_bfree | st->f_bavail |
st->f_bsize | st->f_frsize) &
0xffffffff00000000ULL)
diff --git a/fs/xfs/uuid.c b/fs/xfs/uuid.c
index b83f76b6d410..b7af65af0046 100644
--- a/fs/xfs/uuid.c
+++ b/fs/xfs/uuid.c
@@ -51,7 +51,7 @@ uuid_is_nil(uuid_t *uuid)
if (uuid == NULL)
return 0;
/* implied check of version number here... */
- for (i = 0; i < sizeof *uuid; i++)
+ for (i = 0; i < sizeof(*uuid); i++)
if (*cp++) return 0; /* not nil */
return 1; /* is nil */
}
diff --git a/init/initramfs.c b/init/initramfs.c
index b32ad7d97ac9..fc6097672e05 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -488,7 +488,7 @@ static char * __init unpack_to_rootfs(char *buf, unsigned long len)
error("decompressor failed");
} else if (compress_name) {
if (!message) {
- snprintf(msg_buf, sizeof msg_buf,
+ snprintf(msg_buf, sizeof(msg_buf),
"compression method %s not configured",
compress_name);
message = msg_buf;
diff --git a/ipc/compat_mq.c b/ipc/compat_mq.c
index ef6f91cc4490..27496d912ae0 100644
--- a/ipc/compat_mq.c
+++ b/ipc/compat_mq.c
@@ -25,7 +25,7 @@ struct compat_mq_attr {
static inline int get_compat_mq_attr(struct mq_attr *attr,
const struct compat_mq_attr __user *uattr)
{
- if (!access_ok(VERIFY_READ, uattr, sizeof *uattr))
+ if (!access_ok(VERIFY_READ, uattr, sizeof(*uattr)))
return -EFAULT;
return __get_user(attr->mq_flags, &uattr->mq_flags)
@@ -37,7 +37,7 @@ static inline int get_compat_mq_attr(struct mq_attr *attr,
static inline int put_compat_mq_attr(const struct mq_attr *attr,
struct compat_mq_attr __user *uattr)
{
- if (clear_user(uattr, sizeof *uattr))
+ if (clear_user(uattr, sizeof(*uattr)))
return -EFAULT;
return __put_user(attr->mq_flags, &uattr->mq_flags)
diff --git a/kernel/fork.c b/kernel/fork.c
index 2e391c754ae7..30e04d28bff4 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1143,7 +1143,7 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk)
sig->real_timer.function = it_real_fn;
task_lock(current->group_leader);
- memcpy(sig->rlim, current->signal->rlim, sizeof sig->rlim);
+ memcpy(sig->rlim, current->signal->rlim, sizeof(sig->rlim));
task_unlock(current->group_leader);
posix_cpu_timers_init_group(sig);
diff --git a/kernel/power/suspend_test.c b/kernel/power/suspend_test.c
index 084452e34a12..14e002e0d16e 100644
--- a/kernel/power/suspend_test.c
+++ b/kernel/power/suspend_test.c
@@ -84,7 +84,7 @@ static void __init test_wakealarm(struct rtc_device *rtc, suspend_state_t state)
}
rtc_tm_to_time(&alm.time, &now);
- memset(&alm, 0, sizeof alm);
+ memset(&alm, 0, sizeof(alm));
rtc_time_to_tm(now + TEST_SUSPEND_SECONDS, &alm.time);
alm.enabled = true;
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index 2341efe7fe02..fd06700cd933 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -877,7 +877,7 @@ int ptrace_request(struct task_struct *child, long request,
break;
case PTRACE_SETSIGINFO:
- if (copy_from_user(&siginfo, datavp, sizeof siginfo))
+ if (copy_from_user(&siginfo, datavp, sizeof(siginfo)))
ret = -EFAULT;
else
ret = ptrace_setsiginfo(child, &siginfo);
@@ -1181,7 +1181,7 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,
break;
case PTRACE_SETSIGINFO:
- memset(&siginfo, 0, sizeof siginfo);
+ memset(&siginfo, 0, sizeof(siginfo));
if (copy_siginfo_from_user32(
&siginfo, (struct compat_siginfo __user *) datap))
ret = -EFAULT;
diff --git a/kernel/signal.c b/kernel/signal.c
index f3f1f7a972fd..13b267a99fea 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1900,7 +1900,7 @@ static void ptrace_do_notify(int signr, int exit_code, int why)
{
siginfo_t info;
- memset(&info, 0, sizeof info);
+ memset(&info, 0, sizeof(info));
info.si_signo = signr;
info.si_code = exit_code;
info.si_pid = task_pid_vnr(current);
diff --git a/kernel/sys.c b/kernel/sys.c
index 78947de6f969..b6a4bcc0f815 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -1546,7 +1546,7 @@ static void k_getrusage(struct task_struct *p, int who, struct rusage *r)
cputime_t tgutime, tgstime, utime, stime;
unsigned long maxrss = 0;
- memset((char *)r, 0, sizeof (*r));
+ memset((char *)r, 0, sizeof(*r));
utime = stime = 0;
if (who == RUSAGE_THREAD) {
diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
index f5e86d282d52..eb1760020a3f 100644
--- a/kernel/time/posix-cpu-timers.c
+++ b/kernel/time/posix-cpu-timers.c
@@ -1301,7 +1301,7 @@ static int do_cpu_nanosleep(const clockid_t which_clock, int flags,
/*
* Set up a temporary timer and then wait for it to go off.
*/
- memset(&timer, 0, sizeof timer);
+ memset(&timer, 0, sizeof(timer));
spin_lock_init(&timer.it_lock);
timer.it_clock = which_clock;
timer.it_overrun = -1;
@@ -1310,7 +1310,7 @@ static int do_cpu_nanosleep(const clockid_t which_clock, int flags,
if (!error) {
static struct itimerspec zero_it;
- memset(it, 0, sizeof *it);
+ memset(it, 0, sizeof(*it));
it->it_value = *rqtp;
spin_lock_irq(&timer.it_lock);
@@ -1403,7 +1403,7 @@ static int posix_cpu_nsleep(const clockid_t which_clock, int flags,
/*
* Report back to the user the time still remaining.
*/
- if (rmtp && copy_to_user(rmtp, &it.it_value, sizeof *rmtp))
+ if (rmtp && copy_to_user(rmtp, &it.it_value, sizeof(*rmtp)))
return -EFAULT;
restart_block->fn = posix_cpu_nsleep_restart;
@@ -1430,7 +1430,7 @@ static long posix_cpu_nsleep_restart(struct restart_block *restart_block)
/*
* Report back to the user the time still remaining.
*/
- if (rmtp && copy_to_user(rmtp, &it.it_value, sizeof *rmtp))
+ if (rmtp && copy_to_user(rmtp, &it.it_value, sizeof(*rmtp)))
return -EFAULT;
restart_block->nanosleep.expires = timespec_to_ns(&t);
diff --git a/lib/mpi/mpi-pow.c b/lib/mpi/mpi-pow.c
index 5464c8744ea9..a0367b6c2c85 100644
--- a/lib/mpi/mpi-pow.c
+++ b/lib/mpi/mpi-pow.c
@@ -164,7 +164,7 @@ int mpi_powm(MPI res, MPI base, MPI exp, MPI mod)
if (!xp)
goto enomem;
- memset(&karactx, 0, sizeof karactx);
+ memset(&karactx, 0, sizeof(karactx));
negative_result = (ep[0] & 1) && base->sign;
i = esize - 1;
diff --git a/lib/mpi/mpih-mul.c b/lib/mpi/mpih-mul.c
index 7c841719fdfb..8fc5b5cb0e2f 100644
--- a/lib/mpi/mpih-mul.c
+++ b/lib/mpi/mpih-mul.c
@@ -385,7 +385,7 @@ mpihelp_mul_karatsuba_case(mpi_ptr_t prodp,
return -ENOMEM;
} else {
if (!ctx->next) {
- ctx->next = kzalloc(sizeof *ctx, GFP_KERNEL);
+ ctx->next = kzalloc(sizeof(*ctx), GFP_KERNEL);
if (!ctx->next)
return -ENOMEM;
}
@@ -488,7 +488,7 @@ mpihelp_mul(mpi_ptr_t prodp, mpi_ptr_t up, mpi_size_t usize,
return 0;
}
- memset(&ctx, 0, sizeof ctx);
+ memset(&ctx, 0, sizeof(ctx));
if (mpihelp_mul_karatsuba_case(prodp, up, usize, vp, vsize, &ctx) < 0)
return -ENOMEM;
mpihelp_release_karatsuba_ctx(&ctx);
diff --git a/lib/mpi/mpiutil.c b/lib/mpi/mpiutil.c
index 314f4dfa603e..aeadcce5d2e0 100644
--- a/lib/mpi/mpiutil.c
+++ b/lib/mpi/mpiutil.c
@@ -31,7 +31,7 @@ MPI mpi_alloc(unsigned nlimbs)
{
MPI a;
- a = kmalloc(sizeof *a, GFP_KERNEL);
+ a = kmalloc(sizeof(*a), GFP_KERNEL);
if (!a)
return a;
diff --git a/net/9p/trans_rdma.c b/net/9p/trans_rdma.c
index 52b4a2f993f2..3cd4c1ea4a5c 100644
--- a/net/9p/trans_rdma.c
+++ b/net/9p/trans_rdma.c
@@ -455,7 +455,7 @@ static int rdma_request(struct p9_client *client, struct p9_req_t *req)
}
/* Allocate an fcall for the reply */
- rpl_context = kmalloc(sizeof *rpl_context, GFP_NOFS);
+ rpl_context = kmalloc(sizeof(*rpl_context), GFP_NOFS);
if (!rpl_context) {
err = -ENOMEM;
goto recv_error;
@@ -484,7 +484,7 @@ static int rdma_request(struct p9_client *client, struct p9_req_t *req)
dont_need_post_recv:
/* Post the request */
- c = kmalloc(sizeof *c, GFP_NOFS);
+ c = kmalloc(sizeof(*c), GFP_NOFS);
if (!c) {
err = -ENOMEM;
goto send_error;
@@ -709,7 +709,7 @@ rdma_create_trans(struct p9_client *client, const char *addr, char *args)
goto error;
/* Create the Queue Pair */
- memset(&qp_attr, 0, sizeof qp_attr);
+ memset(&qp_attr, 0, sizeof(qp_attr));
qp_attr.event_handler = qp_event_handler;
qp_attr.qp_context = client;
qp_attr.cap.max_send_wr = opts.sq_depth;
diff --git a/net/atm/br2684.c b/net/atm/br2684.c
index aa0047c5c467..975825678dfb 100644
--- a/net/atm/br2684.c
+++ b/net/atm/br2684.c
@@ -362,7 +362,7 @@ static int br2684_setfilt(struct atm_vcc *atmvcc, void __user * arg)
struct br2684_vcc *brvcc;
struct br2684_filter_set fs;
- if (copy_from_user(&fs, arg, sizeof fs))
+ if (copy_from_user(&fs, arg, sizeof(fs)))
return -EFAULT;
if (fs.ifspec.method != BR2684_FIND_BYNOTHING) {
/*
@@ -536,7 +536,7 @@ static int br2684_regvcc(struct atm_vcc *atmvcc, void __user * arg)
struct atm_backend_br2684 be;
int err;
- if (copy_from_user(&be, arg, sizeof be))
+ if (copy_from_user(&be, arg, sizeof(be)))
return -EFAULT;
brvcc = kzalloc(sizeof(struct br2684_vcc), GFP_KERNEL);
if (!brvcc)
@@ -668,7 +668,7 @@ static int br2684_create(void __user *arg)
pr_debug("\n");
- if (copy_from_user(&ni, arg, sizeof ni))
+ if (copy_from_user(&ni, arg, sizeof(ni)))
return -EFAULT;
if (ni.media & BR2684_FLAG_ROUTED)
diff --git a/net/atm/pppoatm.c b/net/atm/pppoatm.c
index c4e09846d1de..963670812cbb 100644
--- a/net/atm/pppoatm.c
+++ b/net/atm/pppoatm.c
@@ -400,7 +400,7 @@ static int pppoatm_assign_vcc(struct atm_vcc *atmvcc, void __user *arg)
* prototypical one used to initialize them
*/
static const DECLARE_TASKLET(tasklet_proto, pppoatm_wakeup_sender, 0);
- if (copy_from_user(&be, arg, sizeof be))
+ if (copy_from_user(&be, arg, sizeof(be)))
return -EFAULT;
if (be.encaps != PPPOATM_ENCAPS_AUTODETECT &&
be.encaps != PPPOATM_ENCAPS_VC && be.encaps != PPPOATM_ENCAPS_LLC)
diff --git a/net/compat.c b/net/compat.c
index 5cfd26a0006f..59851e30aa3a 100644
--- a/net/compat.c
+++ b/net/compat.c
@@ -243,7 +243,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
cmhdr.cmsg_type = type;
cmhdr.cmsg_len = cmlen;
- if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
+ if (copy_to_user(cm, &cmhdr, sizeof(cmhdr)))
return -EFAULT;
if (copy_to_user(CMSG_COMPAT_DATA(cm), data, cmlen - sizeof(struct compat_cmsghdr)))
return -EFAULT;
diff --git a/net/core/scm.c b/net/core/scm.c
index 14596fb37172..bddc9ded93e5 100644
--- a/net/core/scm.c
+++ b/net/core/scm.c
@@ -230,7 +230,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
cmhdr.cmsg_len = cmlen;
err = -EFAULT;
- if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
+ if (copy_to_user(cm, &cmhdr, sizeof(cmhdr)))
goto out;
if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
goto out;
diff --git a/net/openvswitch/flow_table.c b/net/openvswitch/flow_table.c
index d073fff82fdb..3f3645078913 100644
--- a/net/openvswitch/flow_table.c
+++ b/net/openvswitch/flow_table.c
@@ -60,7 +60,7 @@ void ovs_flow_mask_key(struct sw_flow_key *dst, const struct sw_flow_key *src,
bool full, const struct sw_flow_mask *mask)
{
int start = full ? 0 : mask->range.start;
- int len = full ? sizeof *dst : range_n_bytes(&mask->range);
+ int len = full ? sizeof(*dst) : range_n_bytes(&mask->range);
const long *m = (const long *)((const u8 *)&mask->key + start);
const long *s = (const long *)((const u8 *)src + start);
long *d = (long *)((u8 *)dst + start);
diff --git a/net/rds/ib_rdma.c b/net/rds/ib_rdma.c
index a2340748ec86..3d7680f6d8cb 100644
--- a/net/rds/ib_rdma.c
+++ b/net/rds/ib_rdma.c
@@ -131,7 +131,7 @@ static int rds_ib_add_ipaddr(struct rds_ib_device *rds_ibdev, __be32 ipaddr)
{
struct rds_ib_ipaddr *i_ipaddr;
- i_ipaddr = kmalloc(sizeof *i_ipaddr, GFP_KERNEL);
+ i_ipaddr = kmalloc(sizeof(*i_ipaddr), GFP_KERNEL);
if (!i_ipaddr)
return -ENOMEM;
diff --git a/net/rds/iw.c b/net/rds/iw.c
index f4a9fff829e0..ec68e0b0307e 100644
--- a/net/rds/iw.c
+++ b/net/rds/iw.c
@@ -65,7 +65,7 @@ static void rds_iw_add_one(struct ib_device *device)
if (device->node_type != RDMA_NODE_RNIC)
return;
- rds_iwdev = kmalloc(sizeof *rds_iwdev, GFP_KERNEL);
+ rds_iwdev = kmalloc(sizeof(*rds_iwdev), GFP_KERNEL);
if (!rds_iwdev)
return;
diff --git a/net/rds/iw_rdma.c b/net/rds/iw_rdma.c
index b09a40c1adce..341999a626dd 100644
--- a/net/rds/iw_rdma.c
+++ b/net/rds/iw_rdma.c
@@ -147,7 +147,7 @@ static int rds_iw_add_cm_id(struct rds_iw_device *rds_iwdev, struct rdma_cm_id *
{
struct rds_iw_cm_id *i_cm_id;
- i_cm_id = kmalloc(sizeof *i_cm_id, GFP_KERNEL);
+ i_cm_id = kmalloc(sizeof(*i_cm_id), GFP_KERNEL);
if (!i_cm_id)
return -ENOMEM;
diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
index df57f3ce6cd2..70db517e7c7f 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
@@ -280,7 +280,7 @@ static int send_write(struct svcxprt_rdma *xprt, struct svc_rqst *rqstp,
}
/* Prepare WRITE WR */
- memset(&write_wr, 0, sizeof write_wr);
+ memset(&write_wr, 0, sizeof(write_wr));
ctxt->wr_op = IB_WR_RDMA_WRITE;
write_wr.wr.wr_id = (unsigned long)ctxt;
write_wr.wr.sg_list = &sge[0];
@@ -542,7 +542,7 @@ static int send_reply(struct svcxprt_rdma *rdma,
pr_err("svcrdma: Too many sges (%d)\n", sge_no);
goto err;
}
- memset(&send_wr, 0, sizeof send_wr);
+ memset(&send_wr, 0, sizeof(send_wr));
ctxt->wr_op = IB_WR_SEND;
send_wr.wr_id = (unsigned long)ctxt;
send_wr.sg_list = ctxt->sge;
diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
index 5763825d09bf..ac3e796eeae6 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
@@ -642,7 +642,7 @@ static void sq_comp_handler(struct ib_cq *cq, void *cq_context)
static struct svcxprt_rdma *rdma_create_xprt(struct svc_serv *serv,
int listener)
{
- struct svcxprt_rdma *cma_xprt = kzalloc(sizeof *cma_xprt, GFP_KERNEL);
+ struct svcxprt_rdma *cma_xprt = kzalloc(sizeof(*cma_xprt), GFP_KERNEL);
if (!cma_xprt)
return NULL;
@@ -1090,7 +1090,7 @@ static struct svc_xprt *svc_rdma_accept(struct svc_xprt *xprt)
goto errout;
}
- memset(&qp_attr, 0, sizeof qp_attr);
+ memset(&qp_attr, 0, sizeof(qp_attr));
qp_attr.event_handler = qp_event_handler;
qp_attr.qp_context = &newxprt->sc_xprt;
qp_attr.cap.max_send_wr = newxprt->sc_sq_depth;
@@ -1182,7 +1182,7 @@ static struct svc_xprt *svc_rdma_accept(struct svc_xprt *xprt)
/* Accept Connection */
set_bit(RDMAXPRT_CONN_PENDING, &newxprt->sc_flags);
- memset(&conn_param, 0, sizeof conn_param);
+ memset(&conn_param, 0, sizeof(conn_param));
conn_param.responder_resources = 0;
conn_param.initiator_depth = newxprt->sc_ord;
ret = rdma_accept(newxprt->sc_cm_id, &conn_param);
@@ -1455,7 +1455,7 @@ void svc_rdma_send_error(struct svcxprt_rdma *xprt, struct rpcrdma_msg *rmsgp,
ctxt->sge[0].length = length;
/* Prepare SEND WR */
- memset(&err_wr, 0, sizeof err_wr);
+ memset(&err_wr, 0, sizeof(err_wr));
ctxt->wr_op = IB_WR_SEND;
err_wr.wr_id = (unsigned long)ctxt;
err_wr.sg_list = ctxt->sge;
diff --git a/security/keys/encrypted-keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c
index 696ccfa08d10..37688d7581f6 100644
--- a/security/keys/encrypted-keys/encrypted.c
+++ b/security/keys/encrypted-keys/encrypted.c
@@ -47,8 +47,8 @@ static const char key_format_ecryptfs[] = "ecryptfs";
static unsigned int ivsize;
static int blksize;
-#define KEY_TRUSTED_PREFIX_LEN (sizeof (KEY_TRUSTED_PREFIX) - 1)
-#define KEY_USER_PREFIX_LEN (sizeof (KEY_USER_PREFIX) - 1)
+#define KEY_TRUSTED_PREFIX_LEN (sizeof(KEY_TRUSTED_PREFIX) - 1)
+#define KEY_USER_PREFIX_LEN (sizeof(KEY_USER_PREFIX) - 1)
#define KEY_ECRYPTFS_DESC_LEN 16
#define HASH_SIZE SHA256_DIGEST_SIZE
#define MAX_DATA_SIZE 4096
@@ -482,7 +482,7 @@ static int derived_key_encrypt(struct encrypted_key_payload *epayload,
goto out;
dump_decrypted_data(epayload);
- memset(pad, 0, sizeof pad);
+ memset(pad, 0, sizeof(pad));
sg_init_table(sg_in, 2);
sg_set_buf(&sg_in[0], epayload->decrypted_data,
epayload->decrypted_datalen);
@@ -513,7 +513,7 @@ static int datablob_hmac_append(struct encrypted_key_payload *epayload,
goto out;
digest = epayload->format + epayload->datablob_len;
- ret = calc_hmac(digest, derived_key, sizeof derived_key,
+ ret = calc_hmac(digest, derived_key, sizeof(derived_key),
epayload->format, epayload->datablob_len);
if (!ret)
dump_hmac(NULL, digest, HASH_SIZE);
@@ -543,11 +543,11 @@ static int datablob_hmac_verify(struct encrypted_key_payload *epayload,
} else
p = epayload->format;
- ret = calc_hmac(digest, derived_key, sizeof derived_key, p, len);
+ ret = calc_hmac(digest, derived_key, sizeof(derived_key), p, len);
if (ret < 0)
goto out;
ret = memcmp(digest, epayload->format + epayload->datablob_len,
- sizeof digest);
+ sizeof(digest));
if (ret) {
ret = -EINVAL;
dump_hmac("datablob",
@@ -577,13 +577,13 @@ static int derived_key_decrypt(struct encrypted_key_payload *epayload,
goto out;
dump_encrypted_data(epayload, encrypted_datalen);
- memset(pad, 0, sizeof pad);
+ memset(pad, 0, sizeof(pad));
sg_init_table(sg_in, 1);
sg_init_table(sg_out, 2);
sg_set_buf(sg_in, epayload->encrypted_data, encrypted_datalen);
sg_set_buf(&sg_out[0], epayload->decrypted_data,
epayload->decrypted_datalen);
- sg_set_buf(&sg_out[1], pad, sizeof pad);
+ sg_set_buf(&sg_out[1], pad, sizeof(pad));
ret = crypto_blkcipher_decrypt(&desc, sg_out, sg_in, encrypted_datalen);
crypto_free_blkcipher(desc.tfm);
@@ -695,7 +695,7 @@ static int encrypted_key_decrypt(struct encrypted_key_payload *epayload,
if (ret < 0)
goto out;
- ret = derived_key_decrypt(epayload, derived_key, sizeof derived_key);
+ ret = derived_key_decrypt(epayload, derived_key, sizeof(derived_key));
if (ret < 0)
pr_err("encrypted_key: failed to decrypt key (%d)\n", ret);
out:
@@ -923,7 +923,7 @@ static long encrypted_read(const struct key *key, char __user *buffer,
if (ret < 0)
goto out;
- ret = derived_key_encrypt(epayload, derived_key, sizeof derived_key);
+ ret = derived_key_encrypt(epayload, derived_key, sizeof(derived_key));
if (ret < 0)
goto out;
diff --git a/security/keys/trusted.c b/security/keys/trusted.c
index 0dcab20cdacd..5428c679598f 100644
--- a/security/keys/trusted.c
+++ b/security/keys/trusted.c
@@ -214,11 +214,11 @@ static int TSS_checkhmac1(unsigned char *buffer,
if (ret < 0)
goto out;
ret = crypto_shash_update(&sdesc->shash, (const u8 *)&result,
- sizeof result);
+ sizeof(result));
if (ret < 0)
goto out;
ret = crypto_shash_update(&sdesc->shash, (const u8 *)&ordinal,
- sizeof ordinal);
+ sizeof(ordinal));
if (ret < 0)
goto out;
va_start(argp, keylen);
@@ -306,11 +306,11 @@ static int TSS_checkhmac2(unsigned char *buffer,
if (ret < 0)
goto out;
ret = crypto_shash_update(&sdesc->shash, (const u8 *)&result,
- sizeof result);
+ sizeof(result));
if (ret < 0)
goto out;
ret = crypto_shash_update(&sdesc->shash, (const u8 *)&ordinal,
- sizeof ordinal);
+ sizeof(ordinal));
if (ret < 0)
goto out;
@@ -476,7 +476,7 @@ static int tpm_seal(struct tpm_buf *tb, uint16_t keytype,
int i;
/* alloc some work space for all the hashes */
- td = kmalloc(sizeof *td, GFP_KERNEL);
+ td = kmalloc(sizeof(*td), GFP_KERNEL);
if (!td)
return -ENOMEM;
@@ -665,7 +665,7 @@ static int key_seal(struct trusted_key_payload *p,
struct tpm_buf *tb;
int ret;
- tb = kzalloc(sizeof *tb, GFP_KERNEL);
+ tb = kzalloc(sizeof(*tb), GFP_KERNEL);
if (!tb)
return -ENOMEM;
@@ -691,7 +691,7 @@ static int key_unseal(struct trusted_key_payload *p,
struct tpm_buf *tb;
int ret;
- tb = kzalloc(sizeof *tb, GFP_KERNEL);
+ tb = kzalloc(sizeof(*tb), GFP_KERNEL);
if (!tb)
return -ENOMEM;
@@ -922,7 +922,7 @@ static struct trusted_key_options *trusted_options_alloc(void)
if (tpm2 < 0)
return NULL;
- options = kzalloc(sizeof *options, GFP_KERNEL);
+ options = kzalloc(sizeof(*options), GFP_KERNEL);
if (options) {
/* set any non-zero defaults */
options->keytype = SRK_keytype;
@@ -938,10 +938,10 @@ static struct trusted_key_payload *trusted_payload_alloc(struct key *key)
struct trusted_key_payload *p = NULL;
int ret;
- ret = key_payload_reserve(key, sizeof *p);
+ ret = key_payload_reserve(key, sizeof(*p));
if (ret < 0)
return p;
- p = kzalloc(sizeof *p, GFP_KERNEL);
+ p = kzalloc(sizeof(*p), GFP_KERNEL);
if (p)
p->migratable = 1; /* migratable by default */
return p;
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index f8110cfd80ff..d8a3cf6fa0c8 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -2523,7 +2523,7 @@ static void selinux_bprm_committed_creds(struct linux_binprm *bprm)
*/
rc = avc_has_perm(osid, sid, SECCLASS_PROCESS, PROCESS__SIGINH, NULL);
if (rc) {
- memset(&itimer, 0, sizeof itimer);
+ memset(&itimer, 0, sizeof(itimer));
for (i = 0; i < 3; i++)
do_setitimer(i, &itimer, NULL);
spin_lock_irq(¤t->sighand->siglock);
@@ -3025,7 +3025,7 @@ static int selinux_inode_setotherxattr(struct dentry *dentry, const char *name)
const struct cred *cred = current_cred();
if (!strncmp(name, XATTR_SECURITY_PREFIX,
- sizeof XATTR_SECURITY_PREFIX - 1)) {
+ sizeof(XATTR_SECURITY_PREFIX) - 1)) {
if (!strcmp(name, XATTR_NAME_CAPS)) {
if (!capable(CAP_SETFCAP))
return -EPERM;
diff --git a/security/selinux/ss/conditional.c b/security/selinux/ss/conditional.c
index 456e1a9bcfde..e60f7855f4ce 100644
--- a/security/selinux/ss/conditional.c
+++ b/security/selinux/ss/conditional.c
@@ -230,7 +230,7 @@ int cond_read_bool(struct policydb *p, struct hashtab *h, void *fp)
if (!booldatum)
return -ENOMEM;
- rc = next_entry(buf, fp, sizeof buf);
+ rc = next_entry(buf, fp, sizeof(buf));
if (rc)
goto err;
@@ -457,7 +457,7 @@ int cond_read_list(struct policydb *p, void *fp)
u32 i, len;
int rc;
- rc = next_entry(buf, fp, sizeof buf);
+ rc = next_entry(buf, fp, sizeof(buf));
if (rc)
return rc;
diff --git a/security/selinux/ss/ebitmap.c b/security/selinux/ss/ebitmap.c
index 57644b1dc42e..e9c45692d6e4 100644
--- a/security/selinux/ss/ebitmap.c
+++ b/security/selinux/ss/ebitmap.c
@@ -350,7 +350,7 @@ int ebitmap_read(struct ebitmap *e, void *fp)
ebitmap_init(e);
- rc = next_entry(buf, fp, sizeof buf);
+ rc = next_entry(buf, fp, sizeof(buf));
if (rc < 0)
goto out;
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c
index 992a31530825..79ddb86b180e 100644
--- a/security/selinux/ss/policydb.c
+++ b/security/selinux/ss/policydb.c
@@ -1056,7 +1056,7 @@ static int context_read_and_validate(struct context *c,
__le32 buf[3];
int rc;
- rc = next_entry(buf, fp, sizeof buf);
+ rc = next_entry(buf, fp, sizeof(buf));
if (rc) {
printk(KERN_ERR "SELinux: context truncated\n");
goto out;
@@ -1122,7 +1122,7 @@ static int perm_read(struct policydb *p, struct hashtab *h, void *fp)
if (!perdatum)
goto bad;
- rc = next_entry(buf, fp, sizeof buf);
+ rc = next_entry(buf, fp, sizeof(buf));
if (rc)
goto bad;
@@ -1156,7 +1156,7 @@ static int common_read(struct policydb *p, struct hashtab *h, void *fp)
if (!comdatum)
goto bad;
- rc = next_entry(buf, fp, sizeof buf);
+ rc = next_entry(buf, fp, sizeof(buf));
if (rc)
goto bad;
@@ -1285,8 +1285,7 @@ static int read_cons_helper(struct policydb *p,
return rc;
if (p->policyvers >=
POLICYDB_VERSION_CONSTRAINT_NAMES) {
- e->type_names = kzalloc(sizeof
- (*e->type_names),
+ e->type_names = kzalloc(sizeof(*e->type_names),
GFP_KERNEL);
if (!e->type_names)
return -ENOMEM;
@@ -1520,7 +1519,7 @@ static int mls_read_level(struct mls_level *lp, void *fp)
memset(lp, 0, sizeof(*lp));
- rc = next_entry(buf, fp, sizeof buf);
+ rc = next_entry(buf, fp, sizeof(buf));
if (rc) {
printk(KERN_ERR "SELinux: mls: truncated level\n");
return rc;
@@ -1599,7 +1598,7 @@ static int sens_read(struct policydb *p, struct hashtab *h, void *fp)
if (!levdatum)
goto bad;
- rc = next_entry(buf, fp, sizeof buf);
+ rc = next_entry(buf, fp, sizeof(buf));
if (rc)
goto bad;
@@ -1641,7 +1640,7 @@ static int cat_read(struct policydb *p, struct hashtab *h, void *fp)
if (!catdatum)
goto bad;
- rc = next_entry(buf, fp, sizeof buf);
+ rc = next_entry(buf, fp, sizeof(buf));
if (rc)
goto bad;
diff --git a/sound/core/sound.c b/sound/core/sound.c
index 175f9e4e01c8..e35344c87b8a 100644
--- a/sound/core/sound.c
+++ b/sound/core/sound.c
@@ -268,7 +268,7 @@ int snd_register_device(int type, struct snd_card *card, int dev,
if (snd_BUG_ON(!device))
return -EINVAL;
- preg = kmalloc(sizeof *preg, GFP_KERNEL);
+ preg = kmalloc(sizeof(*preg), GFP_KERNEL);
if (preg == NULL)
return -ENOMEM;
preg->type = type;
diff --git a/sound/soc/codecs/tlv320aic26.c b/sound/soc/codecs/tlv320aic26.c
index 2c904d7150ad..e5fca13c264b 100644
--- a/sound/soc/codecs/tlv320aic26.c
+++ b/sound/soc/codecs/tlv320aic26.c
@@ -346,7 +346,7 @@ static int aic26_spi_probe(struct spi_device *spi)
dev_dbg(&spi->dev, "probing tlv320aic26 spi device\n");
/* Allocate driver data */
- aic26 = devm_kzalloc(&spi->dev, sizeof *aic26, GFP_KERNEL);
+ aic26 = devm_kzalloc(&spi->dev, sizeof(*aic26), GFP_KERNEL);
if (!aic26)
return -ENOMEM;
diff --git a/sound/soc/codecs/wm8983.c b/sound/soc/codecs/wm8983.c
index 7350ff654bbf..35b5d04c375d 100644
--- a/sound/soc/codecs/wm8983.c
+++ b/sound/soc/codecs/wm8983.c
@@ -1006,7 +1006,7 @@ static int wm8983_spi_probe(struct spi_device *spi)
struct wm8983_priv *wm8983;
int ret;
- wm8983 = devm_kzalloc(&spi->dev, sizeof *wm8983, GFP_KERNEL);
+ wm8983 = devm_kzalloc(&spi->dev, sizeof(*wm8983), GFP_KERNEL);
if (!wm8983)
return -ENOMEM;
@@ -1046,7 +1046,7 @@ static int wm8983_i2c_probe(struct i2c_client *i2c,
struct wm8983_priv *wm8983;
int ret;
- wm8983 = devm_kzalloc(&i2c->dev, sizeof *wm8983, GFP_KERNEL);
+ wm8983 = devm_kzalloc(&i2c->dev, sizeof(*wm8983), GFP_KERNEL);
if (!wm8983)
return -ENOMEM;
diff --git a/sound/soc/codecs/wm8985.c b/sound/soc/codecs/wm8985.c
index 9918152a03c7..0ef374b714ac 100644
--- a/sound/soc/codecs/wm8985.c
+++ b/sound/soc/codecs/wm8985.c
@@ -1068,7 +1068,7 @@ static int wm8985_spi_probe(struct spi_device *spi)
struct wm8985_priv *wm8985;
int ret;
- wm8985 = devm_kzalloc(&spi->dev, sizeof *wm8985, GFP_KERNEL);
+ wm8985 = devm_kzalloc(&spi->dev, sizeof(*wm8985), GFP_KERNEL);
if (!wm8985)
return -ENOMEM;
@@ -1109,7 +1109,7 @@ static int wm8985_i2c_probe(struct i2c_client *i2c,
struct wm8985_priv *wm8985;
int ret;
- wm8985 = devm_kzalloc(&i2c->dev, sizeof *wm8985, GFP_KERNEL);
+ wm8985 = devm_kzalloc(&i2c->dev, sizeof(*wm8985), GFP_KERNEL);
if (!wm8985)
return -ENOMEM;
diff --git a/sound/soc/fsl/mpc5200_dma.c b/sound/soc/fsl/mpc5200_dma.c
index 0b82e209b6e3..bc310ec4aa74 100644
--- a/sound/soc/fsl/mpc5200_dma.c
+++ b/sound/soc/fsl/mpc5200_dma.c
@@ -386,7 +386,7 @@ int mpc5200_audio_dma_create(struct platform_device *op)
}
/* Allocate and initialize the driver private data */
- psc_dma = kzalloc(sizeof *psc_dma, GFP_KERNEL);
+ psc_dma = kzalloc(sizeof(*psc_dma), GFP_KERNEL);
if (!psc_dma) {
ret = -ENOMEM;
goto out_unmap;
@@ -394,7 +394,7 @@ int mpc5200_audio_dma_create(struct platform_device *op)
/* Get the PSC ID */
prop = of_get_property(op->dev.of_node, "cell-index", &size);
- if (!prop || size < sizeof *prop) {
+ if (!prop || size < sizeof(*prop)) {
ret = -ENODEV;
goto out_free;
}
@@ -404,11 +404,11 @@ int mpc5200_audio_dma_create(struct platform_device *op)
psc_dma->id = be32_to_cpu(*prop);
psc_dma->irq = irq;
psc_dma->psc_regs = regs;
- psc_dma->fifo_regs = regs + sizeof *psc_dma->psc_regs;
+ psc_dma->fifo_regs = regs + sizeof(*psc_dma->psc_regs);
psc_dma->dev = &op->dev;
psc_dma->playback.psc_dma = psc_dma;
psc_dma->capture.psc_dma = psc_dma;
- snprintf(psc_dma->name, sizeof psc_dma->name, "PSC%u", psc_dma->id);
+ snprintf(psc_dma->name, sizeof(psc_dma->name), "PSC%u", psc_dma->id);
/* Find the address of the fifo data registers and setup the
* DMA tasks */
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 790ee2bf1a47..ae5c74c78433 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -74,10 +74,10 @@ static int min_bytes_needed(unsigned long val)
int c = 0;
int i;
- for (i = (sizeof val * 8) - 1; i >= 0; --i, ++c)
+ for (i = (sizeof(val) * 8) - 1; i >= 0; --i, ++c)
if (val & (1UL << i))
break;
- c = (sizeof val * 8) - c;
+ c = (sizeof(val) * 8) - c;
if (!c || (c % 8))
c = (c + 8) / 8;
else
@@ -3892,7 +3892,7 @@ int snd_soc_of_get_dai_link_codecs(struct device *dev,
return num_codecs;
}
component = devm_kzalloc(dev,
- sizeof *component * num_codecs,
+ sizeof(*component) * num_codecs,
GFP_KERNEL);
if (!component)
return -ENOMEM;
diff --git a/sound/spi/at73c213.c b/sound/spi/at73c213.c
index fac7e6eb9529..cf8571322090 100644
--- a/sound/spi/at73c213.c
+++ b/sound/spi/at73c213.c
@@ -970,7 +970,7 @@ static int snd_at73c213_probe(struct spi_device *spi)
}
/* Allocate "card" using some unused identifiers. */
- snprintf(id, sizeof id, "at73c213_%d", board->ssc_id);
+ snprintf(id, sizeof(id), "at73c213_%d", board->ssc_id);
retval = snd_card_new(&spi->dev, -1, id, THIS_MODULE,
sizeof(struct snd_at73c213), &card);
if (retval < 0)
diff --git a/tools/firewire/nosy-dump.c b/tools/firewire/nosy-dump.c
index 3179c711bd65..73287dea3026 100644
--- a/tools/firewire/nosy-dump.c
+++ b/tools/firewire/nosy-dump.c
@@ -149,7 +149,7 @@ subaction_create(uint32_t *data, size_t length)
struct subaction *sa;
/* we put the ack in the subaction struct for easy access. */
- sa = malloc(sizeof *sa - sizeof sa->packet + length);
+ sa = malloc(sizeof(*sa) - sizeof(sa->packet) + length);
if (!sa)
exit(EXIT_FAILURE);
sa->ack = data[length / 4 - 1];
@@ -181,7 +181,7 @@ link_transaction_lookup(int request_node, int response_node, int tlabel)
return t;
}
- t = malloc(sizeof *t);
+ t = malloc(sizeof(*t));
if (!t)
exit(EXIT_FAILURE);
t->request_node = request_node;
@@ -985,13 +985,13 @@ int main(int argc, const char *argv[])
while (run) {
if (input != NULL) {
- if (fread(&length, sizeof length, 1, input) != 1)
+ if (fread(&length, sizeof(length), 1, input) != 1)
return 0;
fread(buf, 1, length, input);
} else {
poll(pollfds, 2, -1);
if (pollfds[1].revents) {
- read(STDIN_FILENO, &c, sizeof c);
+ read(STDIN_FILENO, &c, sizeof(c));
switch (c) {
case 'q':
if (output != NULL)
@@ -1001,13 +1001,13 @@ int main(int argc, const char *argv[])
}
if (pollfds[0].revents)
- length = read(fd, buf, sizeof buf);
+ length = read(fd, buf, sizeof(buf));
else
continue;
}
if (output != NULL) {
- fwrite(&length, sizeof length, 1, output);
+ fwrite(&length, sizeof(length), 1, output);
fwrite(buf, 1, length, output);
}
diff --git a/tools/power/cpupower/utils/helpers/msr.c b/tools/power/cpupower/utils/helpers/msr.c
index 31a4b24a8bc6..852f18c35b18 100644
--- a/tools/power/cpupower/utils/helpers/msr.c
+++ b/tools/power/cpupower/utils/helpers/msr.c
@@ -34,7 +34,7 @@ int read_msr(int cpu, unsigned int idx, unsigned long long *val)
return -1;
if (lseek(fd, idx, SEEK_CUR) == -1)
goto err;
- if (read(fd, val, sizeof *val) != sizeof *val)
+ if (read(fd, val, sizeof(*val)) != sizeof(*val))
goto err;
close(fd);
return 0;
@@ -63,7 +63,7 @@ int write_msr(int cpu, unsigned int idx, unsigned long long val)
return -1;
if (lseek(fd, idx, SEEK_CUR) == -1)
goto err;
- if (write(fd, &val, sizeof val) != sizeof val)
+ if (write(fd, &val, sizeof(val)) != sizeof(val))
goto err;
close(fd);
return 0;
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 0dac7e05a6ac..c5d1cea97d1c 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -274,10 +274,10 @@ int get_msr(int cpu, off_t offset, unsigned long long *msr)
if (fd < 0)
err(-1, "%s open failed, try chown or chmod +r /dev/cpu/*/msr, or run as root", pathname);
- retval = pread(fd, msr, sizeof *msr, offset);
+ retval = pread(fd, msr, sizeof(*msr), offset);
close(fd);
- if (retval != sizeof *msr)
+ if (retval != sizeof(*msr))
err(-1, "%s offset 0x%llx read failed", pathname, (unsigned long long)offset);
return 0;
diff --git a/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c b/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c
index 40b3e5482f8a..0cece734cd3e 100644
--- a/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c
+++ b/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c
@@ -199,9 +199,9 @@ unsigned long long get_msr(int cpu, int offset)
exit(1);
}
- retval = pread(fd, &msr, sizeof msr, offset);
+ retval = pread(fd, &msr, sizeof(msr), offset);
- if (retval != sizeof msr) {
+ if (retval != sizeof(msr)) {
printf("pread cpu%d 0x%x = %d\n", cpu, offset, retval);
exit(-2);
}
@@ -223,15 +223,15 @@ unsigned long long put_msr(int cpu, unsigned long long new_msr, int offset)
exit(1);
}
- retval = pread(fd, &old_msr, sizeof old_msr, offset);
- if (retval != sizeof old_msr) {
+ retval = pread(fd, &old_msr, sizeof(old_msr), offset);
+ if (retval != sizeof(old_msr)) {
perror("pwrite");
printf("pread cpu%d 0x%x = %d\n", cpu, offset, retval);
exit(-2);
}
- retval = pwrite(fd, &new_msr, sizeof new_msr, offset);
- if (retval != sizeof new_msr) {
+ retval = pwrite(fd, &new_msr, sizeof(new_msr), offset);
+ if (retval != sizeof(new_msr)) {
perror("pwrite");
printf("pwrite cpu%d 0x%x = %d\n", cpu, offset, retval);
exit(-2);
diff --git a/tools/spi/spidev_fdx.c b/tools/spi/spidev_fdx.c
index 0ea3e51292fc..b304776fb21c 100644
--- a/tools/spi/spidev_fdx.c
+++ b/tools/spi/spidev_fdx.c
@@ -24,7 +24,7 @@ static void do_read(int fd, int len)
len = 2;
else if (len > sizeof(buf))
len = sizeof(buf);
- memset(buf, 0, sizeof buf);
+ memset(buf, 0, sizeof(buf));
status = read(fd, buf, len);
if (status < 0) {
@@ -51,11 +51,11 @@ static void do_msg(int fd, int len)
unsigned char buf[32], *bp;
int status;
- memset(xfer, 0, sizeof xfer);
- memset(buf, 0, sizeof buf);
+ memset(xfer, 0, sizeof(xfer));
+ memset(buf, 0, sizeof(buf));
- if (len > sizeof buf)
- len = sizeof buf;
+ if (len > sizeof(buf))
+ len = sizeof(buf);
buf[0] = 0xaa;
xfer[0].tx_buf = (unsigned long)buf;
diff --git a/tools/testing/selftests/vm/thuge-gen.c b/tools/testing/selftests/vm/thuge-gen.c
index c87957295f74..3e5c6975c22b 100644
--- a/tools/testing/selftests/vm/thuge-gen.c
+++ b/tools/testing/selftests/vm/thuge-gen.c
@@ -96,7 +96,7 @@ void show(unsigned long ps)
return;
printf("%luMB: ", ps >> 20);
fflush(stdout);
- snprintf(buf, sizeof buf,
+ snprintf(buf, sizeof(buf),
"cat /sys/kernel/mm/hugepages/hugepages-%lukB/free_hugepages",
ps >> 10);
system(buf);
@@ -112,7 +112,7 @@ unsigned long read_sysfs(int warn, char *fmt, ...)
unsigned long val = 0;
va_start(ap, fmt);
- vsnprintf(buf, sizeof buf, fmt, ap);
+ vsnprintf(buf, sizeof(buf), fmt, ap);
va_end(ap);
f = fopen(buf, "r");
diff --git a/tools/usb/testusb.c b/tools/usb/testusb.c
index 0692d99b6d8f..ec342121b75c 100644
--- a/tools/usb/testusb.c
+++ b/tools/usb/testusb.c
@@ -151,7 +151,7 @@ static int testdev_ffs_ifnum(FILE *fd)
if (fread(u.buf + 1, (unsigned char)u.buf[0] - 1, 1, fd) != 1)
return -1;
- if (u.intf.bLength == sizeof u.intf
+ if (u.intf.bLength == sizeof(u.intf)
&& u.intf.bDescriptorType == USB_DT_INTERFACE
&& u.intf.bNumEndpoints == 2
&& u.intf.bInterfaceClass == USB_CLASS_VENDOR_SPEC
@@ -165,10 +165,10 @@ static int testdev_ifnum(FILE *fd)
{
struct usb_device_descriptor dev;
- if (fread(&dev, sizeof dev, 1, fd) != 1)
+ if (fread(&dev, sizeof(dev), 1, fd) != 1)
return -1;
- if (dev.bLength != sizeof dev || dev.bDescriptorType != USB_DT_DEVICE)
+ if (dev.bLength != sizeof(dev) || dev.bDescriptorType != USB_DT_DEVICE)
return -1;
/* FX2 with (tweaked) bulksrc firmware */
@@ -265,7 +265,7 @@ static int find_testdev(const char *name, const struct stat *sb, int flag)
if (ifnum < 0)
return 0;
- entry = calloc(1, sizeof *entry);
+ entry = calloc(1, sizeof(*entry));
if (!entry)
goto nomem;
@@ -330,8 +330,8 @@ static void *handle_testdev (void *arg)
char buf [80];
int err = errno;
- if (strerror_r (errno, buf, sizeof buf)) {
- snprintf (buf, sizeof buf, "error %d", err);
+ if (strerror_r (errno, buf, sizeof(buf))) {
+ snprintf (buf, sizeof(buf), "error %d", err);
errno = err;
}
printf ("%s test %d --> %d (%s)\n",
@@ -516,7 +516,7 @@ int main (int argc, char **argv)
fprintf (stderr, "%s: %s may see only control tests\n",
argv [0], device);
- memset (&dev, 0, sizeof dev);
+ memset (&dev, 0, sizeof(dev));
dev.name = device;
dev.param = param;
dev.forever = forever;
diff --git a/tools/virtio/ringtest/main.c b/tools/virtio/ringtest/main.c
index 3a5ff438bd62..130e46f7ca91 100644
--- a/tools/virtio/ringtest/main.c
+++ b/tools/virtio/ringtest/main.c
@@ -36,8 +36,8 @@ void notify(int fd)
int r;
vmexit();
- r = write(fd, &v, sizeof v);
- assert(r == sizeof v);
+ r = write(fd, &v, sizeof(v));
+ assert(r == sizeof(v));
vmentry();
}
@@ -47,8 +47,8 @@ void wait_for_notify(int fd)
int r;
vmexit();
- r = read(fd, &v, sizeof v);
- assert(r == sizeof v);
+ r = read(fd, &v, sizeof(v));
+ assert(r == sizeof(v));
vmentry();
}
diff --git a/tools/virtio/ringtest/ring.c b/tools/virtio/ringtest/ring.c
index c25c8d248b6b..a62ea4743646 100644
--- a/tools/virtio/ringtest/ring.c
+++ b/tools/virtio/ringtest/ring.c
@@ -79,17 +79,17 @@ void alloc_ring(void)
int ret;
int i;
- ret = posix_memalign((void **)&ring, 0x1000, ring_size * sizeof *ring);
+ ret = posix_memalign((void **)&ring, 0x1000, ring_size * sizeof(*ring));
if (ret) {
perror("Unable to allocate ring buffer.\n");
exit(3);
}
- event = malloc(sizeof *event);
+ event = malloc(sizeof(*event));
if (!event) {
perror("Unable to allocate event buffer.\n");
exit(3);
}
- memset(event, 0, sizeof *event);
+ memset(event, 0, sizeof(*event));
guest.avail_idx = 0;
guest.kicked_avail_idx = -1;
guest.last_used_idx = 0;
@@ -102,12 +102,12 @@ void alloc_ring(void)
ring[i] = desc;
}
guest.num_free = ring_size;
- data = malloc(ring_size * sizeof *data);
+ data = malloc(ring_size * sizeof(*data));
if (!data) {
perror("Unable to allocate data buffer.\n");
exit(3);
}
- memset(data, 0, ring_size * sizeof *data);
+ memset(data, 0, ring_size * sizeof(*data));
}
/* guest side */
diff --git a/tools/virtio/ringtest/virtio_ring_0_9.c b/tools/virtio/ringtest/virtio_ring_0_9.c
index 47c9a1a18d36..70a2d5016f4e 100644
--- a/tools/virtio/ringtest/virtio_ring_0_9.c
+++ b/tools/virtio/ringtest/virtio_ring_0_9.c
@@ -73,12 +73,12 @@ void alloc_ring(void)
host.used_idx = 0;
host.called_used_idx = -1;
guest.num_free = ring_size;
- data = malloc(ring_size * sizeof *data);
+ data = malloc(ring_size * sizeof(*data));
if (!data) {
perror("Unable to allocate data buffer.\n");
exit(3);
}
- memset(data, 0, ring_size * sizeof *data);
+ memset(data, 0, ring_size * sizeof(*data));
}
/* guest side */
diff --git a/tools/virtio/virtio_test.c b/tools/virtio/virtio_test.c
index e0445898f08f..51ea75f7a950 100644
--- a/tools/virtio/virtio_test.c
+++ b/tools/virtio/virtio_test.c
@@ -47,8 +47,8 @@ bool vq_notify(struct virtqueue *vq)
struct vq_info *info = vq->priv;
unsigned long long v = 1;
int r;
- r = write(info->kick, &v, sizeof v);
- assert(r == sizeof v);
+ r = write(info->kick, &v, sizeof(v));
+ assert(r == sizeof(v));
return true;
}
@@ -113,7 +113,7 @@ static void vq_info_add(struct vdev_info *dev, int num)
static void vdev_info_init(struct vdev_info* dev, unsigned long long features)
{
int r;
- memset(dev, 0, sizeof *dev);
+ memset(dev, 0, sizeof(*dev));
dev->vdev.features = features;
dev->buf_size = 1024;
dev->buf = malloc(dev->buf_size);
@@ -123,10 +123,10 @@ static void vdev_info_init(struct vdev_info* dev, unsigned long long features)
r = ioctl(dev->control, VHOST_SET_OWNER, NULL);
assert(r >= 0);
dev->mem = malloc(offsetof(struct vhost_memory, regions) +
- sizeof dev->mem->regions[0]);
+ sizeof(dev->mem->regions[0]));
assert(dev->mem);
memset(dev->mem, 0, offsetof(struct vhost_memory, regions) +
- sizeof dev->mem->regions[0]);
+ sizeof(dev->mem->regions[0]));
dev->mem->nregions = 1;
dev->mem->regions[0].guest_phys_addr = (long)dev->buf;
dev->mem->regions[0].userspace_addr = (long)dev->buf;
@@ -146,7 +146,7 @@ static void wait_for_interrupt(struct vdev_info *dev)
poll(dev->fds, dev->nvqs, -1);
for (i = 0; i < dev->nvqs; ++i)
if (dev->fds[i].revents & POLLIN) {
- read(dev->fds[i].fd, &val, sizeof val);
+ read(dev->fds[i].fd, &val, sizeof(val));
}
}
diff --git a/usr/gen_init_cpio.c b/usr/gen_init_cpio.c
index 225ad244cf88..156101d8d67a 100644
--- a/usr/gen_init_cpio.c
+++ b/usr/gen_init_cpio.c
@@ -388,7 +388,7 @@ static char *cpio_replace_env(char *new_location)
(end = strchr(start + 2, '}'))) {
*start = *end = 0;
var = getenv(start + 2);
- snprintf(expanded, sizeof expanded, "%s%s%s",
+ snprintf(expanded, sizeof(expanded), "%s%s%s",
new_location, var ? var : "", end + 1);
strcpy(new_location, expanded);
}
next prev parent reply other threads:[~2016-02-02 11:29 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-02 7:53 [PATCH] kernel/fork.c: use sizeof() instead of sizeof Wei Tang
2016-02-02 9:11 ` Ingo Molnar
2016-02-02 11:28 ` Ingo Molnar [this message]
2016-02-02 13:58 ` [PATCH] treewide: Use 'sizeof(x)' instead of 'sizeof x' Joe Perches
2016-02-02 15:45 ` [PATCH] kernel/fork.c: use sizeof() instead of sizeof Al Viro
2016-02-02 17:02 ` Joe Perches
2016-02-02 17:11 ` Al Viro
2016-02-02 17:21 ` Joe Perches
[not found] ` <CAOviyajXB2y5zuFhdRPQfVSe_NYvaFjjUz6f86e791AvFPYfMw@mail.gmail.com>
2016-02-02 17:04 ` Al Viro
2016-02-03 3:46 ` Kevin Easton
2016-02-03 4:02 ` Al Viro
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160202112841.GA14524@gmail.com \
--to=mingo@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=akpm@linux-foundation.org \
--cc=cyphar@cyphar.com \
--cc=ebiederm@xmission.com \
--cc=jason.low2@hp.com \
--cc=josh@joshtriplett.org \
--cc=kirill.shutemov@linux.intel.com \
--cc=koct9i@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=oleg@redhat.com \
--cc=peterz@infradead.org \
--cc=tangwei@cmss.chinamobile.com \
--cc=tglx@linutronix.de \
--cc=tj@kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=xypron.glpk@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.