Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -u -p a/net/tipc/bcast.c b/net/tipc/bcast.c
- --- a/net/tipc/bcast.c
- +++ b/net/tipc/bcast.c
- @@ -105,7 +105,7 @@ static u32 bcbuf_acks(struct sk_buff *bu
- static void bcbuf_set_acks(struct sk_buff *buf, u32 acks)
- {
- - TIPC_SKB_CB(buf)->handle = (void *)(unsigned long)acks;
- + TIPC_SKB_CB(buf)->handle = acks;
- }
- static void bcbuf_decr_acks(struct sk_buff *buf)
- diff -u -p a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
- --- a/net/netfilter/nf_log.c
- +++ b/net/netfilter/nf_log.c
- @@ -454,7 +454,7 @@ static int netfilter_log_sysctl_init(str
- nf_log_sysctl_table[i].proc_handler =
- nf_log_proc_dostring;
- nf_log_sysctl_table[i].extra1 =
- - (void *)(unsigned long) i;
- + i;
- }
- }
- diff -u -p a/fs/dlm/user.c b/fs/dlm/user.c
- --- a/fs/dlm/user.c
- +++ b/fs/dlm/user.c
- @@ -110,11 +110,11 @@ static void compat_input(struct dlm_writ
- kb->i.lock.parent = kb32->i.lock.parent;
- kb->i.lock.xid = kb32->i.lock.xid;
- kb->i.lock.timeout = kb32->i.lock.timeout;
- - kb->i.lock.castparam = (void *)(long)kb32->i.lock.castparam;
- - kb->i.lock.castaddr = (void *)(long)kb32->i.lock.castaddr;
- - kb->i.lock.bastparam = (void *)(long)kb32->i.lock.bastparam;
- - kb->i.lock.bastaddr = (void *)(long)kb32->i.lock.bastaddr;
- - kb->i.lock.lksb = (void *)(long)kb32->i.lock.lksb;
- + kb->i.lock.castparam = kb32->i.lock.castparam;
- + kb->i.lock.castaddr = kb32->i.lock.castaddr;
- + kb->i.lock.bastparam = kb32->i.lock.bastparam;
- + kb->i.lock.bastaddr = kb32->i.lock.bastaddr;
- + kb->i.lock.lksb = kb32->i.lock.lksb;
- memcpy(kb->i.lock.lvb, kb32->i.lock.lvb, DLM_USER_LVB_LEN);
- memcpy(kb->i.lock.name, kb32->i.lock.name, namelen);
- }
- @@ -127,9 +127,9 @@ static void compat_output(struct dlm_loc
- res32->version[1] = res->version[1];
- res32->version[2] = res->version[2];
- - res32->user_astaddr = (__u32)(long)res->user_astaddr;
- - res32->user_astparam = (__u32)(long)res->user_astparam;
- - res32->user_lksb = (__u32)(long)res->user_lksb;
- + res32->user_astaddr = res->user_astaddr;
- + res32->user_astparam = res->user_astparam;
- + res32->user_lksb = res->user_lksb;
- res32->bast_mode = res->bast_mode;
- res32->lvb_offset = res->lvb_offset;
- @@ -138,7 +138,7 @@ static void compat_output(struct dlm_loc
- res32->lksb.sb_status = res->lksb.sb_status;
- res32->lksb.sb_flags = res->lksb.sb_flags;
- res32->lksb.sb_lkid = res->lksb.sb_lkid;
- - res32->lksb.sb_lvbptr = (__u32)(long)res->lksb.sb_lvbptr;
- + res32->lksb.sb_lvbptr = res->lksb.sb_lvbptr;
- }
- #endif
- diff -u -p a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
- --- a/fs/cifs/cifssmb.c
- +++ b/fs/cifs/cifssmb.c
- @@ -618,7 +618,7 @@ CIFSSMBNegotiate(const unsigned int xid,
- server->max_rw = le32_to_cpu(pSMBr->MaxRawSize);
- cifs_dbg(NOISY, "Max buf = %d\n", ses->server->maxBuf);
- server->capabilities = le32_to_cpu(pSMBr->Capabilities);
- - server->timeAdj = (int)(__s16)le16_to_cpu(pSMBr->ServerTimeZone);
- + server->timeAdj = le16_to_cpu(pSMBr->ServerTimeZone);
- server->timeAdj *= 60;
- if (pSMBr->EncryptionKeyLength == CIFS_CRYPTO_KEY_SIZE) {
- diff -u -p a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
- --- a/fs/btrfs/extent_io.c
- +++ b/fs/btrfs/extent_io.c
- @@ -2131,7 +2131,7 @@ int clean_io_failure(struct inode *inode
- if (ret)
- return 0;
- - failrec = (struct io_failure_record *)(unsigned long) private_failure;
- + failrec = private_failure;
- BUG_ON(!failrec->this_mirror);
- if (failrec->in_validation) {
- @@ -2191,7 +2191,7 @@ void btrfs_free_io_failure_record(struct
- next = next_state(state);
- - failrec = (struct io_failure_record *)(unsigned long)state->private;
- + failrec = state->private;
- free_extent_state(state);
- kfree(failrec);
- @@ -2272,7 +2272,7 @@ int btrfs_get_io_failure_record(struct i
- return ret;
- }
- } else {
- - failrec = (struct io_failure_record *)(unsigned long)private;
- + failrec = private;
- pr_debug("Get IO Failure Record: (found) logical=%llu, start=%llu, len=%llu, validation=%d\n",
- failrec->logical, failrec->start, failrec->len,
- failrec->in_validation);
- diff -u -p a/fs/fuse/dir.c b/fs/fuse/dir.c
- --- a/fs/fuse/dir.c
- +++ b/fs/fuse/dir.c
- @@ -54,7 +54,7 @@ static inline u64 fuse_dentry_time(struc
- static void fuse_dentry_settime(struct dentry *entry, u64 time)
- {
- entry->d_time = time;
- - entry->d_fsdata = (void *) (unsigned long) (time >> 32);
- + entry->d_fsdata = (time >> 32);
- }
- static u64 fuse_dentry_time(struct dentry *entry)
- diff -u -p a/fs/ubifs/find.c b/fs/ubifs/find.c
- --- a/fs/ubifs/find.c
- +++ b/fs/ubifs/find.c
- @@ -785,7 +785,7 @@ int ubifs_save_dirty_idx_lnums(struct ub
- c->dirty_idx.arr[c->dirty_idx.cnt - 1]->free);
- /* Replace the lprops pointers with LEB numbers */
- for (i = 0; i < c->dirty_idx.cnt; i++)
- - c->dirty_idx.arr[i] = (void *)(size_t)c->dirty_idx.arr[i]->lnum;
- + c->dirty_idx.arr[i] = c->dirty_idx.arr[i]->lnum;
- ubifs_release_lprops(c);
- return 0;
- }
- diff -u -p a/fs/aio.c b/fs/aio.c
- --- a/fs/aio.c
- +++ b/fs/aio.c
- @@ -1065,7 +1065,7 @@ void aio_complete(struct kiocb *iocb, lo
- ev_page = kmap_atomic(ctx->ring_pages[pos / AIO_EVENTS_PER_PAGE]);
- event = ev_page + pos % AIO_EVENTS_PER_PAGE;
- - event->obj = (u64)(unsigned long)iocb->ki_obj.user;
- + event->obj = iocb->ki_obj.user;
- event->data = iocb->ki_user_data;
- event->res = res;
- event->res2 = res2;
- diff -u -p a/virt/kvm/arm/vgic-v2-emul.c b/virt/kvm/arm/vgic-v2-emul.c
- --- a/virt/kvm/arm/vgic-v2-emul.c
- +++ b/virt/kvm/arm/vgic-v2-emul.c
- @@ -767,7 +767,7 @@ static int vgic_v2_set_attr(struct kvm_d
- switch (attr->group) {
- case KVM_DEV_ARM_VGIC_GRP_DIST_REGS:
- case KVM_DEV_ARM_VGIC_GRP_CPU_REGS: {
- - u32 __user *uaddr = (u32 __user *)(long)attr->addr;
- + u32 __user *uaddr = attr->addr;
- u32 reg;
- if (get_user(reg, uaddr))
- @@ -793,7 +793,7 @@ static int vgic_v2_get_attr(struct kvm_d
- switch (attr->group) {
- case KVM_DEV_ARM_VGIC_GRP_DIST_REGS:
- case KVM_DEV_ARM_VGIC_GRP_CPU_REGS: {
- - u32 __user *uaddr = (u32 __user *)(long)attr->addr;
- + u32 __user *uaddr = attr->addr;
- u32 reg = 0;
- ret = vgic_attr_regs_access(dev, attr, ®, false);
- diff -u -p a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
- --- a/scripts/kconfig/mconf.c
- +++ b/scripts/kconfig/mconf.c
- @@ -687,7 +687,7 @@ static void conf(struct menu *menu, stru
- switch (item_tag()) {
- case 'm':
- if (single_menu_mode)
- - submenu->data = (void *) (long) !submenu->data;
- + submenu->data = !submenu->data;
- else
- conf(submenu, NULL);
- break;
- diff -u -p a/kernel/jump_label.c b/kernel/jump_label.c
- --- a/kernel/jump_label.c
- +++ b/kernel/jump_label.c
- @@ -202,7 +202,7 @@ void __init jump_label_init(void)
- for (iter = iter_start; iter < iter_stop; iter++) {
- struct static_key *iterk;
- - iterk = (struct static_key *)(unsigned long)iter->key;
- + iterk = iter->key;
- arch_jump_label_transform_static(iter, jump_label_type(iterk));
- if (iterk == key)
- continue;
- @@ -297,7 +297,7 @@ static int jump_label_add_module(struct
- for (iter = iter_start; iter < iter_stop; iter++) {
- struct static_key *iterk;
- - iterk = (struct static_key *)(unsigned long)iter->key;
- + iterk = iter->key;
- if (iterk == key)
- continue;
- @@ -337,7 +337,7 @@ static void jump_label_del_module(struct
- if (iter->key == (jump_label_t)(unsigned long)key)
- continue;
- - key = (struct static_key *)(unsigned long)iter->key;
- + key = iter->key;
- if (__module_address(iter->key) == mod)
- continue;
- diff -u -p a/kernel/bpf/helpers.c b/kernel/bpf/helpers.c
- --- a/kernel/bpf/helpers.c
- +++ b/kernel/bpf/helpers.c
- @@ -27,8 +27,8 @@ static u64 bpf_map_lookup_elem(u64 r1, u
- * and R2 points to a program stack and map->key_size bytes were
- * initialized
- */
- - struct bpf_map *map = (struct bpf_map *) (unsigned long) r1;
- - void *key = (void *) (unsigned long) r2;
- + struct bpf_map *map = r1;
- + void *key = r2;
- void *value;
- WARN_ON_ONCE(!rcu_read_lock_held());
- @@ -51,9 +51,9 @@ struct bpf_func_proto bpf_map_lookup_ele
- static u64 bpf_map_update_elem(u64 r1, u64 r2, u64 r3, u64 r4, u64 r5)
- {
- - struct bpf_map *map = (struct bpf_map *) (unsigned long) r1;
- - void *key = (void *) (unsigned long) r2;
- - void *value = (void *) (unsigned long) r3;
- + struct bpf_map *map = r1;
- + void *key = r2;
- + void *value = r3;
- WARN_ON_ONCE(!rcu_read_lock_held());
- @@ -72,8 +72,8 @@ struct bpf_func_proto bpf_map_update_ele
- static u64 bpf_map_delete_elem(u64 r1, u64 r2, u64 r3, u64 r4, u64 r5)
- {
- - struct bpf_map *map = (struct bpf_map *) (unsigned long) r1;
- - void *key = (void *) (unsigned long) r2;
- + struct bpf_map *map = r1;
- + void *key = r2;
- WARN_ON_ONCE(!rcu_read_lock_held());
- diff -u -p a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
- --- a/drivers/net/hyperv/netvsc_drv.c
- +++ b/drivers/net/hyperv/netvsc_drv.c
- @@ -232,8 +232,7 @@ static u16 netvsc_select_queue(struct ne
- static void netvsc_xmit_completion(void *context)
- {
- struct hv_netvsc_packet *packet = (struct hv_netvsc_packet *)context;
- - struct sk_buff *skb = (struct sk_buff *)
- - (unsigned long)packet->send_completion_tid;
- + struct sk_buff *skb =packet->send_completion_tid;
- u32 index = packet->send_buf_index;
- kfree(packet);
- diff -u -p a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
- --- a/drivers/net/ethernet/neterion/vxge/vxge-config.c
- +++ b/drivers/net/ethernet/neterion/vxge/vxge-config.c
- @@ -2125,7 +2125,7 @@ __vxge_hw_ring_mempool_item_alloc(struct
- uld_priv = ((u8 *)rxdblock_priv + ring->rxd_priv_size * i);
- /* pre-format Host_Control */
- - rxdp->host_control = (u64)(size_t)uld_priv;
- + rxdp->host_control = uld_priv;
- }
- __vxge_hw_ring_block_memblock_idx_set(item, memblock_index);
- @@ -3425,7 +3425,7 @@ __vxge_hw_fifo_mempool_item_alloc(
- vxge_assert(txdp);
- - txdp->host_control = (u64) (size_t)
- + txdp->host_control =
- __vxge_hw_mempool_item_priv(mempoolh, memblock_index, txdp,
- &memblock_item_idx);
- diff -u -p a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c
- --- a/drivers/net/ethernet/sun/sunhme.c
- +++ b/drivers/net/ethernet/sun/sunhme.c
- @@ -267,14 +267,14 @@ static u32 pci_hme_read_desc32(hme32 *p)
- #define hme_read32(__hp, __reg) \
- sbus_readl(__reg)
- #define hme_write_rxd(__hp, __rxd, __flags, __addr) \
- -do { (__rxd)->rx_addr = (__force hme32)(u32)(__addr); \
- +do { (__rxd)->rx_addr = (__addr); \
- wmb(); \
- - (__rxd)->rx_flags = (__force hme32)(u32)(__flags); \
- + (__rxd)->rx_flags = (__flags); \
- } while(0)
- #define hme_write_txd(__hp, __txd, __flags, __addr) \
- -do { (__txd)->tx_addr = (__force hme32)(u32)(__addr); \
- +do { (__txd)->tx_addr = (__addr); \
- wmb(); \
- - (__txd)->tx_flags = (__force hme32)(u32)(__flags); \
- + (__txd)->tx_flags = (__flags); \
- } while(0)
- #define hme_read_desc32(__hp, __p) ((__force u32)(hme32)*(__p))
- #define hme_dma_map(__hp, __ptr, __size, __dir) \
- diff -u -p a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
- --- a/drivers/net/wireless/mwl8k.c
- +++ b/drivers/net/wireless/mwl8k.c
- @@ -5213,7 +5213,7 @@ static void mwl8k_configure_filter(struc
- u64 multicast)
- {
- struct mwl8k_priv *priv = hw->priv;
- - struct mwl8k_cmd_pkt *cmd = (void *)(unsigned long)multicast;
- + struct mwl8k_cmd_pkt *cmd = multicast;
- /*
- * AP firmware doesn't allow fine-grained control over
- diff -u -p a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
- --- a/drivers/macintosh/smu.c
- +++ b/drivers/macintosh/smu.c
- @@ -828,7 +828,7 @@ int smu_queue_i2c(struct smu_i2c_cmd *cm
- cmd->scmd.misc = cmd;
- cmd->scmd.reply_buf = cmd->pdata;
- cmd->scmd.reply_len = sizeof(cmd->pdata);
- - cmd->scmd.data_buf = (u8 *)(char *)&cmd->info;
- + cmd->scmd.data_buf = &cmd->info;
- cmd->scmd.status = 1;
- cmd->stage = 0;
- cmd->pdata[0] = 0xff;
- diff -u -p a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
- --- a/drivers/staging/slicoss/slicoss.c
- +++ b/drivers/staging/slicoss/slicoss.c
- @@ -965,7 +965,7 @@ static void slic_link_upr_complete(struc
- if ((isr & ISR_UPCERR) || (isr & ISR_UPCBSY)) {
- struct slic_shmem *pshmem;
- - pshmem = (struct slic_shmem *)(unsigned long)
- + pshmem =
- adapter->phys_shmem;
- #if BITS_PER_LONG == 64
- slic_upr_queue_request(adapter,
- @@ -1517,7 +1517,7 @@ retry_rcvqfill:
- #endif
- skb = alloc_skb(SLIC_RCVQ_RCVBUFSIZE, GFP_ATOMIC);
- if (skb) {
- - paddr = (void *)(unsigned long)
- + paddr =
- pci_map_single(adapter->pcidev,
- skb->data,
- SLIC_RCVQ_RCVBUFSIZE,
- @@ -1676,7 +1676,7 @@ static u32 slic_rcvqueue_reinsert(struct
- struct slic_rcvbuf *rcvbuf = (struct slic_rcvbuf *)skb->head;
- struct device *dev;
- - paddr = (void *)(unsigned long)
- + paddr =
- pci_map_single(adapter->pcidev, skb->head,
- SLIC_RCVQ_RCVBUFSIZE, PCI_DMA_FROMDEVICE);
- rcvbuf->status = 0;
- @@ -1736,7 +1736,7 @@ static void slic_link_event_handler(stru
- return;
- }
- - pshmem = (struct slic_shmem *)(unsigned long)adapter->phys_shmem;
- + pshmem = adapter->phys_shmem;
- #if BITS_PER_LONG == 64
- status = slic_upr_request(adapter,
- @@ -1763,7 +1763,7 @@ static void slic_init_cleanup(struct ada
- sizeof(struct slic_shmem),
- adapter->pshmem, adapter->phys_shmem);
- adapter->pshmem = NULL;
- - adapter->phys_shmem = (dma_addr_t)(unsigned long)NULL;
- + adapter->phys_shmem = NULL;
- }
- if (adapter->pingtimerset) {
- @@ -2339,7 +2339,7 @@ static int slic_if_init(struct adapter *
- mdelay(1);
- if (!adapter->isp_initialized) {
- - pshmem = (struct slic_shmem *)(unsigned long)
- + pshmem =
- adapter->phys_shmem;
- spin_lock_irqsave(&adapter->bit64reglock.lock,
- @@ -2731,7 +2731,7 @@ static int slic_card_init(struct sliccar
- slic_reg32_write(&slic_regs->slic_icr, ICR_INT_OFF, FLUSH);
- mdelay(1);
- - pshmem = (struct slic_shmem *)(unsigned long)
- + pshmem =
- adapter->phys_shmem;
- spin_lock_irqsave(&adapter->bit64reglock.lock,
- diff -u -p a/drivers/staging/lustre/lustre/obdclass/lustre_handles.c b/drivers/staging/lustre/lustre/obdclass/lustre_handles.c
- --- a/drivers/staging/lustre/lustre/obdclass/lustre_handles.c
- +++ b/drivers/staging/lustre/lustre/obdclass/lustre_handles.c
- @@ -181,7 +181,7 @@ EXPORT_SYMBOL(class_handle2object);
- void class_handle_free_cb(struct rcu_head *rcu)
- {
- struct portals_handle *h = RCU2HANDLE(rcu);
- - void *ptr = (void *)(unsigned long)h->h_cookie;
- + void *ptr = h->h_cookie;
- if (h->h_ops->hop_free != NULL)
- h->h_ops->hop_free(ptr, h->h_size);
- diff -u -p a/drivers/platform/goldfish/goldfish_pipe.c b/drivers/platform/goldfish/goldfish_pipe.c
- --- a/drivers/platform/goldfish/goldfish_pipe.c
- +++ b/drivers/platform/goldfish/goldfish_pipe.c
- @@ -294,7 +294,7 @@ static ssize_t goldfish_pipe_read_write(
- if (mutex_lock_interruptible(&pipe->lock))
- return -ERESTARTSYS;
- - address = (unsigned long)(void *)buffer;
- + address = buffer;
- address_end = address + bufflen;
- while (address < address_end) {
- @@ -470,7 +470,7 @@ static irqreturn_t goldfish_pipe_interru
- /* Convert channel to struct pipe pointer + read wake flags */
- wakes = readl(dev->base + PIPE_REG_WAKES);
- - pipe = (struct goldfish_pipe *)(ptrdiff_t)channel;
- + pipe = channel;
- /* Did the emulator just closed a pipe? */
- if (wakes & PIPE_WAKE_CLOSED) {
- diff -u -p a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
- --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
- +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
- @@ -1094,7 +1094,6 @@ int vmw_fence_event_ioctl(struct drm_dev
- struct vmw_fence_obj *fence = NULL;
- struct vmw_fpriv *vmw_fp = vmw_fpriv(file_priv);
- struct drm_vmw_fence_rep __user *user_fence_rep =
- - (struct drm_vmw_fence_rep __user *)(unsigned long)
- arg->fence_rep;
- uint32_t handle;
- int ret;
- diff -u -p a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
- --- a/drivers/gpu/drm/drm_ioctl.c
- +++ b/drivers/gpu/drm/drm_ioctl.c
- @@ -196,7 +196,7 @@ static int drm_getmap(struct drm_device
- map->size = r_list->map->size;
- map->type = r_list->map->type;
- map->flags = r_list->map->flags;
- - map->handle = (void *)(unsigned long) r_list->user_token;
- + map->handle = r_list->user_token;
- #ifdef CONFIG_X86
- /*
- diff -u -p a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c
- --- a/drivers/gpu/drm/armada/armada_gem.c
- +++ b/drivers/gpu/drm/armada/armada_gem.c
- @@ -380,7 +380,7 @@ int armada_gem_pwrite_ioctl(struct drm_d
- if (args->size == 0)
- return 0;
- - ptr = (char __user *)(uintptr_t)args->ptr;
- + ptr = args->ptr;
- if (!access_ok(VERIFY_READ, ptr, args->size))
- return -EFAULT;
- diff -u -p a/drivers/gpu/drm/i915/i915_sysfs.c b/drivers/gpu/drm/i915/i915_sysfs.c
- --- a/drivers/gpu/drm/i915/i915_sysfs.c
- +++ b/drivers/gpu/drm/i915/i915_sysfs.c
- @@ -178,7 +178,7 @@ i915_l3_read(struct file *filp, struct k
- struct drm_minor *dminor = dev_to_drm_minor(dev);
- struct drm_device *drm_dev = dminor->dev;
- struct drm_i915_private *dev_priv = drm_dev->dev_private;
- - int slice = (int)(uintptr_t)attr->private;
- + int slice = attr->private;
- int ret;
- count = round_down(count, 4);
- @@ -216,7 +216,7 @@ i915_l3_write(struct file *filp, struct
- struct drm_i915_private *dev_priv = drm_dev->dev_private;
- struct intel_context *ctx;
- u32 *temp = NULL; /* Just here to make handling failures easy */
- - int slice = (int)(uintptr_t)attr->private;
- + int slice = attr->private;
- int ret;
- if (!HAS_HW_CONTEXTS(drm_dev))
- diff -u -p a/drivers/gpu/drm/radeon/r600_cp.c b/drivers/gpu/drm/radeon/r600_cp.c
- --- a/drivers/gpu/drm/radeon/r600_cp.c
- +++ b/drivers/gpu/drm/radeon/r600_cp.c
- @@ -2105,11 +2105,11 @@ int r600_do_init_cp(struct drm_device *d
- } else
- #endif
- {
- - dev_priv->cp_ring->handle = (void *)(unsigned long)dev_priv->cp_ring->offset;
- + dev_priv->cp_ring->handle = dev_priv->cp_ring->offset;
- dev_priv->ring_rptr->handle =
- - (void *)(unsigned long)dev_priv->ring_rptr->offset;
- + dev_priv->ring_rptr->offset;
- dev->agp_buffer_map->handle =
- - (void *)(unsigned long)dev->agp_buffer_map->offset;
- + dev->agp_buffer_map->offset;
- DRM_DEBUG("dev_priv->cp_ring->handle %p\n",
- dev_priv->cp_ring->handle);
- diff -u -p a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c
- --- a/drivers/gpu/drm/qxl/qxl_ioctl.c
- +++ b/drivers/gpu/drm/qxl/qxl_ioctl.c
- @@ -295,7 +295,7 @@ static int qxl_execbuffer_ioctl(struct d
- for (cmd_num = 0; cmd_num < execbuffer->commands_num; ++cmd_num) {
- struct drm_qxl_command *commands =
- - (struct drm_qxl_command *)(uintptr_t)execbuffer->commands;
- + execbuffer->commands;
- if (copy_from_user(&user_cmd, &commands[cmd_num],
- sizeof(user_cmd)))
- diff -u -p a/drivers/s390/cio/device_pgid.c b/drivers/s390/cio/device_pgid.c
- --- a/drivers/s390/cio/device_pgid.c
- +++ b/drivers/s390/cio/device_pgid.c
- @@ -138,7 +138,7 @@ static void spid_build_cp(struct ccw_dev
- pgid->inf.fc = fn;
- cp->cmd_code = CCW_CMD_SET_PGID;
- - cp->cda = (u32) (addr_t) pgid;
- + cp->cda = pgid;
- cp->count = sizeof(*pgid);
- cp->flags = CCW_FLAG_SLI;
- req->cp = cp;
- @@ -438,7 +438,7 @@ static void snid_build_cp(struct ccw_dev
- /* Channel program setup. */
- cp->cmd_code = CCW_CMD_SENSE_PGID;
- - cp->cda = (u32) (addr_t) &cdev->private->pgid[i];
- + cp->cda = &cdev->private->pgid[i];
- cp->count = sizeof(struct pgid);
- cp->flags = CCW_FLAG_SLI;
- req->cp = cp;
- @@ -622,11 +622,11 @@ static void stlck_build_cp(struct ccw_de
- struct ccw1 *cp = cdev->private->iccws;
- cp[0].cmd_code = CCW_CMD_STLCK;
- - cp[0].cda = (u32) (addr_t) buf1;
- + cp[0].cda = buf1;
- cp[0].count = 32;
- cp[0].flags = CCW_FLAG_CC;
- cp[1].cmd_code = CCW_CMD_RELEASE;
- - cp[1].cda = (u32) (addr_t) buf2;
- + cp[1].cda = buf2;
- cp[1].count = 32;
- cp[1].flags = 0;
- req->cp = cp;
- diff -u -p a/drivers/s390/cio/chsc.c b/drivers/s390/cio/chsc.c
- --- a/drivers/s390/cio/chsc.c
- +++ b/drivers/s390/cio/chsc.c
- @@ -747,8 +747,8 @@ int __chsc_do_secm(struct channel_subsys
- secm_area->request.code = 0x0016;
- secm_area->key = PAGE_DEFAULT_KEY >> 4;
- - secm_area->cub_addr1 = (u64)(unsigned long)css->cub_addr1;
- - secm_area->cub_addr2 = (u64)(unsigned long)css->cub_addr2;
- + secm_area->cub_addr1 = css->cub_addr1;
- + secm_area->cub_addr2 = css->cub_addr2;
- secm_area->operation_code = enable ? 0 : 1;
- diff -u -p a/drivers/s390/block/dasd_eer.c b/drivers/s390/block/dasd_eer.c
- --- a/drivers/s390/block/dasd_eer.c
- +++ b/drivers/s390/block/dasd_eer.c
- @@ -479,7 +479,7 @@ int dasd_eer_enable(struct dasd_device *
- ccw->cmd_code = DASD_ECKD_CCW_SNSS;
- ccw->count = SNSS_DATA_SIZE;
- ccw->flags = 0;
- - ccw->cda = (__u32)(addr_t) cqr->data;
- + ccw->cda = cqr->data;
- cqr->buildclk = get_tod_clock();
- cqr->status = DASD_CQR_FILLED;
- diff -u -p a/drivers/s390/block/dasd_3990_erp.c b/drivers/s390/block/dasd_3990_erp.c
- --- a/drivers/s390/block/dasd_3990_erp.c
- +++ b/drivers/s390/block/dasd_3990_erp.c
- @@ -219,7 +219,7 @@ dasd_3990_erp_DCTL(struct dasd_ccw_req *
- memset(ccw, 0, sizeof(struct ccw1));
- ccw->cmd_code = CCW_CMD_DCTL;
- ccw->count = 4;
- - ccw->cda = (__u32)(addr_t) DCTL_data;
- + ccw->cda = DCTL_data;
- dctl_cqr->flags = erp->flags;
- dctl_cqr->function = dasd_3990_erp_DCTL;
- dctl_cqr->refers = erp;
- @@ -1695,7 +1695,7 @@ dasd_3990_erp_action_1B_32(struct dasd_c
- ccw->cmd_code = DASD_ECKD_CCW_DEFINE_EXTENT;
- ccw->flags = CCW_FLAG_CC;
- ccw->count = 16;
- - ccw->cda = (__u32)(addr_t) DE_data;
- + ccw->cda = DE_data;
- /* create LO ccw */
- ccw++;
- @@ -1703,7 +1703,7 @@ dasd_3990_erp_action_1B_32(struct dasd_c
- ccw->cmd_code = DASD_ECKD_CCW_LOCATE_RECORD;
- ccw->flags = CCW_FLAG_CC;
- ccw->count = 16;
- - ccw->cda = (__u32)(addr_t) LO_data;
- + ccw->cda = LO_data;
- /* TIC to the failed ccw */
- ccw++;
- diff -u -p a/drivers/acpi/acpica/exregion.c b/drivers/acpi/acpica/exregion.c
- --- a/drivers/acpi/acpica/exregion.c
- +++ b/drivers/acpi/acpica/exregion.c
- @@ -390,7 +390,7 @@ acpi_ex_pci_config_space_handler(u32 fun
- *
- */
- pci_id = (struct acpi_pci_id *)region_context;
- - pci_register = (u16) (u32) address;
- + pci_register = address;
- ACPI_DEBUG_PRINT((ACPI_DB_INFO,
- "Pci-Config %u (%u) Seg(%04x) Bus(%04x) Dev(%04x) Func(%04x) Reg(%04x)\n",
- diff -u -p a/drivers/acpi/acpica/nsaccess.c b/drivers/acpi/acpica/nsaccess.c
- --- a/drivers/acpi/acpica/nsaccess.c
- +++ b/drivers/acpi/acpica/nsaccess.c
- @@ -491,7 +491,7 @@ acpi_ns_lookup(union acpi_generic_state
- /* Extract segment count, point to first name segment */
- path++;
- - num_segments = (u32) (u8) * path;
- + num_segments = * path;
- path++;
- ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
- diff -u -p a/drivers/infiniband/hw/amso1100/c2_ae.c b/drivers/infiniband/hw/amso1100/c2_ae.c
- --- a/drivers/infiniband/hw/amso1100/c2_ae.c
- +++ b/drivers/infiniband/hw/amso1100/c2_ae.c
- @@ -171,7 +171,7 @@ void c2_ae_event(struct c2_dev *c2dev, u
- event_id = c2_wr_get_id(wr);
- resource_indicator = be32_to_cpu(wr->ae.ae_generic.resource_type);
- resource_user_context =
- - (void *) (unsigned long) wr->ae.ae_generic.user_context;
- + wr->ae.ae_generic.user_context;
- status = cm_event.status = c2_convert_cm_status(c2_wr_get_result(wr));
- @@ -282,7 +282,7 @@ void c2_ae_event(struct c2_dev *c2dev, u
- break;
- }
- cm_event.event = IW_CM_EVENT_CONNECT_REQUEST;
- - cm_event.provider_data = (void*)(unsigned long)req->cr_handle;
- + cm_event.provider_data = req->cr_handle;
- laddr->sin_addr.s_addr = req->laddr;
- raddr->sin_addr.s_addr = req->raddr;
- laddr->sin_port = req->lport;
- diff -u -p a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
- --- a/drivers/infiniband/hw/cxgb4/mem.c
- +++ b/drivers/infiniband/hw/cxgb4/mem.c
- @@ -144,7 +144,7 @@ static int _c4iw_write_mem_inline(struct
- if (i == (num_wqe-1)) {
- req->wr.wr_hi = cpu_to_be32(FW_WR_OP_V(FW_ULPTX_WR) |
- FW_WR_COMPL_F);
- - req->wr.wr_lo = (__force __be64)(unsigned long) &wr_wait;
- + req->wr.wr_lo = &wr_wait;
- } else
- req->wr.wr_hi = cpu_to_be32(FW_WR_OP_V(FW_ULPTX_WR));
- req->wr.wr_mid = cpu_to_be32(
- diff -u -p a/drivers/infiniband/hw/ipath/ipath_srq.c b/drivers/infiniband/hw/ipath/ipath_srq.c
- --- a/drivers/infiniband/hw/ipath/ipath_srq.c
- +++ b/drivers/infiniband/hw/ipath/ipath_srq.c
- @@ -252,7 +252,7 @@ int ipath_modify_srq(struct ib_srq *ibsr
- if (ret)
- goto bail_free;
- udata->outbuf =
- - (void __user *) (unsigned long) offset_addr;
- + offset_addr;
- ret = ib_copy_to_udata(udata, &offset,
- sizeof(offset));
- if (ret)
- diff -u -p a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c
- --- a/drivers/infiniband/hw/mlx5/qp.c
- +++ b/drivers/infiniband/hw/mlx5/qp.c
- @@ -2106,7 +2106,7 @@ static int set_data_inl_seg(struct mlx5_
- seg = wqe;
- wqe += sizeof(*seg);
- for (i = 0; i < wr->num_sge; i++) {
- - addr = (void *)(unsigned long)(wr->sg_list[i].addr);
- + addr = (wr->sg_list[i].addr);
- len = wr->sg_list[i].length;
- inl += len;
- diff -u -p a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
- --- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
- +++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
- @@ -2144,7 +2144,7 @@ static int ocrdma_build_fr(struct ocrdma
- fast_reg->num_sges = wr->wr.fast_reg.page_list_len;
- fast_reg->size_sge =
- get_encoded_page_size(1 << wr->wr.fast_reg.page_shift);
- - mr = (struct ocrdma_mr *) (unsigned long)
- + mr =
- dev->stag_arr[(hdr->lkey >> 8) & (OCRDMA_MAX_STAG - 1)];
- build_frmr_pbes(wr, mr->hwmr.pbl_table, &mr->hwmr);
- return 0;
- diff -u -p a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c
- --- a/drivers/infiniband/core/ucma.c
- +++ b/drivers/infiniband/core/ucma.c
- @@ -882,7 +882,7 @@ static ssize_t ucma_query(struct ucma_fi
- if (copy_from_user(&cmd, inbuf, sizeof(cmd)))
- return -EFAULT;
- - response = (void __user *)(unsigned long) cmd.response;
- + response = cmd.response;
- ctx = ucma_get_ctx(file, cmd.id);
- if (IS_ERR(ctx))
- return PTR_ERR(ctx);
- diff -u -p a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
- --- a/drivers/infiniband/core/uverbs_cmd.c
- +++ b/drivers/infiniband/core/uverbs_cmd.c
- @@ -1514,7 +1514,7 @@ ssize_t ib_uverbs_poll_cq(struct ib_uver
- return -EINVAL;
- /* we copy a struct ib_uverbs_poll_cq_resp to user space */
- - header_ptr = (void __user *)(unsigned long) cmd.response;
- + header_ptr = cmd.response;
- data_ptr = header_ptr + sizeof resp;
- memset(&resp, 0, sizeof resp);
- diff -u -p a/drivers/isdn/hardware/mISDN/hfcpci.c b/drivers/isdn/hardware/mISDN/hfcpci.c
- --- a/drivers/isdn/hardware/mISDN/hfcpci.c
- +++ b/drivers/isdn/hardware/mISDN/hfcpci.c
- @@ -2013,7 +2013,7 @@ setup_hw(struct hfc_pci *hc)
- return 1;
- }
- hc->hw.pci_io =
- - (char __iomem *)(unsigned long)hc->pdev->resource[1].start;
- + hc->pdev->resource[1].start;
- if (!hc->hw.pci_io) {
- printk(KERN_WARNING "HFC-PCI: No IO-Mem for PCI card found\n");
- diff -u -p a/drivers/isdn/hisax/avma1_cs.c b/drivers/isdn/hisax/avma1_cs.c
- --- a/drivers/isdn/hisax/avma1_cs.c
- +++ b/drivers/isdn/hisax/avma1_cs.c
- @@ -128,7 +128,7 @@ static int avma1cs_config(struct pcmcia_
- avma1cs_release(link);
- return -ENODEV;
- }
- - link->priv = (void *) (unsigned long) i;
- + link->priv = i;
- return 0;
- } /* avma1cs_config */
- diff -u -p a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
- --- a/drivers/video/fbdev/core/fbmem.c
- +++ b/drivers/video/fbdev/core/fbmem.c
- @@ -1303,7 +1303,7 @@ static int do_fscreeninfo_to_user(struct
- err = copy_to_user(&fix32->id, &fix->id, sizeof(fix32->id));
- - data = (__u32) (unsigned long) fix->smem_start;
- + data = fix->smem_start;
- err |= put_user(data, &fix32->smem_start);
- err |= put_user(fix->smem_len, &fix32->smem_len);
- @@ -1315,7 +1315,7 @@ static int do_fscreeninfo_to_user(struct
- err |= put_user(fix->ywrapstep, &fix32->ywrapstep);
- err |= put_user(fix->line_length, &fix32->line_length);
- - data = (__u32) (unsigned long) fix->mmio_start;
- + data = fix->mmio_start;
- err |= put_user(data, &fix32->mmio_start);
- err |= put_user(fix->mmio_len, &fix32->mmio_len);
- diff -u -p a/drivers/media/firewire/firedtv-dvb.c b/drivers/media/firewire/firedtv-dvb.c
- --- a/drivers/media/firewire/firedtv-dvb.c
- +++ b/drivers/media/firewire/firedtv-dvb.c
- @@ -95,7 +95,7 @@ int fdtv_start_feed(struct dvb_demux_fee
- goto out;
- }
- - dvbdmxfeed->priv = (typeof(dvbdmxfeed->priv))(unsigned long)c;
- + dvbdmxfeed->priv = c;
- fdtv->channel_pid[c] = dvbdmxfeed->pid;
- collect_channels(fdtv, &pidc, pids);
- diff -u -p a/drivers/cpuidle/coupled.c b/drivers/cpuidle/coupled.c
- --- a/drivers/cpuidle/coupled.c
- +++ b/drivers/cpuidle/coupled.c
- @@ -664,7 +664,7 @@ have_coupled:
- csd = &per_cpu(cpuidle_coupled_poke_cb, dev->cpu);
- csd->func = cpuidle_coupled_handle_poke;
- - csd->info = (void *)(unsigned long)dev->cpu;
- + csd->info = dev->cpu;
- return 0;
- }
- diff -u -p a/drivers/misc/vmw_vmci/vmci_host.c b/drivers/misc/vmw_vmci/vmci_host.c
- --- a/drivers/misc/vmw_vmci/vmci_host.c
- +++ b/drivers/misc/vmw_vmci/vmci_host.c
- @@ -430,7 +430,7 @@ static int vmci_host_do_receive_datagram
- &size, &dg);
- if (recv_info.result >= VMCI_SUCCESS) {
- - void __user *ubuf = (void __user *)(uintptr_t)recv_info.addr;
- + void __user *ubuf = recv_info.addr;
- retval = copy_to_user(ubuf, dg, VMCI_DG_SIZE(dg));
- kfree(dg);
- if (retval != 0)
- @@ -725,7 +725,7 @@ static int vmci_host_do_ctx_get_cpt_stat
- get_info.result = vmci_ctx_get_chkpt_state(cid, get_info.cpt_type,
- &get_info.buf_size, &cpt_buf);
- if (get_info.result == VMCI_SUCCESS && get_info.buf_size) {
- - void __user *ubuf = (void __user *)(uintptr_t)get_info.cpt_buf;
- + void __user *ubuf = get_info.cpt_buf;
- retval = copy_to_user(ubuf, cpt_buf, get_info.buf_size);
- kfree(cpt_buf);
- @@ -900,11 +900,11 @@ static int vmci_host_do_recv_notificatio
- if (info.result != VMCI_SUCCESS)
- return copy_to_user(uptr, &info, sizeof(info)) ? -EFAULT : 0;
- - ubuf = (void __user *)(uintptr_t)info.db_handle_buf_uva;
- + ubuf = info.db_handle_buf_uva;
- info.result = drv_cp_harray_to_user(ubuf, &info.db_handle_buf_size,
- db_handle_array, &retval);
- if (info.result == VMCI_SUCCESS && !retval) {
- - ubuf = (void __user *)(uintptr_t)info.qp_handle_buf_uva;
- + ubuf = info.qp_handle_buf_uva;
- info.result = drv_cp_harray_to_user(ubuf,
- &info.qp_handle_buf_size,
- qp_handle_array, &retval);
- diff -u -p a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
- --- a/drivers/tty/serial/serial_core.c
- +++ b/drivers/tty/serial/serial_core.c
- @@ -691,7 +691,7 @@ static void do_uart_get_info(struct tty_
- retinfo->hub6 = uport->hub6;
- retinfo->io_type = uport->iotype;
- retinfo->iomem_reg_shift = uport->regshift;
- - retinfo->iomem_base = (void *)(unsigned long)uport->mapbase;
- + retinfo->iomem_base = uport->mapbase;
- }
- static void uart_get_info(struct tty_port *port,
- diff -u -p a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
- --- a/drivers/tty/serial/sh-sci.c
- +++ b/drivers/tty/serial/sh-sci.c
- @@ -2063,7 +2063,7 @@ static int sci_remap_port(struct uart_po
- * need to do any remapping, just cast the cookie
- * directly.
- */
- - port->membase = (void __iomem *)(uintptr_t)port->mapbase;
- + port->membase = port->mapbase;
- }
- return 0;
- diff -u -p a/drivers/gpio/gpio-ge.c b/drivers/gpio/gpio-ge.c
- --- a/drivers/gpio/gpio-ge.c
- +++ b/drivers/gpio/gpio-ge.c
- @@ -84,7 +84,7 @@ static int __init gef_gpio_probe(struct
- }
- bgc->gc.base = -1;
- - bgc->gc.ngpio = (u16)(uintptr_t)of_id->data;
- + bgc->gc.ngpio = of_id->data;
- bgc->gc.of_gpio_n_cells = 2;
- bgc->gc.of_node = pdev->dev.of_node;
- diff -u -p a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
- --- a/drivers/usb/host/sl811-hcd.c
- +++ b/drivers/usb/host/sl811-hcd.c
- @@ -1663,8 +1663,8 @@ sl811h_probe(struct platform_device *dev
- * to avoid compiler warning, assuming that ->start
- * is always 32-bit for this case
- */
- - addr_reg = (void __iomem *) (unsigned long) addr->start;
- - data_reg = (void __iomem *) (unsigned long) data->start;
- + addr_reg = addr->start;
- + data_reg = data->start;
- } else {
- addr_reg = ioremap(addr->start, 1);
- if (addr_reg == NULL) {
- diff -u -p a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
- --- a/drivers/scsi/qla2xxx/qla_iocb.c
- +++ b/drivers/scsi/qla2xxx/qla_iocb.c
- @@ -390,7 +390,7 @@ qla2x00_start_scsi(srb_t *sp)
- req->current_outstanding_cmd = handle;
- req->outstanding_cmds[handle] = sp;
- sp->handle = handle;
- - cmd->host_scribble = (unsigned char *)(unsigned long)handle;
- + cmd->host_scribble = handle;
- req->cnt -= req_cnt;
- cmd_pkt = (cmd_entry_t *)req->ring_ptr;
- @@ -1516,7 +1516,7 @@ qla24xx_start_scsi(srb_t *sp)
- req->current_outstanding_cmd = handle;
- req->outstanding_cmds[handle] = sp;
- sp->handle = handle;
- - cmd->host_scribble = (unsigned char *)(unsigned long)handle;
- + cmd->host_scribble = handle;
- req->cnt -= req_cnt;
- cmd_pkt = (struct cmd_type_7 *)req->ring_ptr;
- @@ -1722,7 +1722,7 @@ qla24xx_dif_start_scsi(srb_t *sp)
- req->current_outstanding_cmd = handle;
- req->outstanding_cmds[handle] = sp;
- sp->handle = handle;
- - cmd->host_scribble = (unsigned char *)(unsigned long)handle;
- + cmd->host_scribble = handle;
- req->cnt -= req_cnt;
- /* Fill-in common area */
- @@ -2518,7 +2518,7 @@ sufficient_dsds:
- req->current_outstanding_cmd = handle;
- req->outstanding_cmds[handle] = sp;
- sp->handle = handle;
- - cmd->host_scribble = (unsigned char *)(unsigned long)handle;
- + cmd->host_scribble = handle;
- req->cnt -= req_cnt;
- wmb();
- diff -u -p a/drivers/scsi/megaraid/megaraid_mm.c b/drivers/scsi/megaraid/megaraid_mm.c
- --- a/drivers/scsi/megaraid/megaraid_mm.c
- +++ b/drivers/scsi/megaraid/megaraid_mm.c
- @@ -825,7 +825,7 @@ kioc_to_mimd(uioc_t *kioc, mimd_t __user
- case MEGAIOC_QADAPINFO:
- - hinfo = (mraid_hba_info_t *)(unsigned long)
- + hinfo =
- kioc->buf_vaddr;
- hinfo_to_cinfo(hinfo, &cinfo);
- @@ -842,7 +842,7 @@ kioc_to_mimd(uioc_t *kioc, mimd_t __user
- return 0;
- }
- - mbox64 = (mbox64_t *)(unsigned long)kioc->cmdbuf;
- + mbox64 = kioc->cmdbuf;
- if (kioc->user_pthru) {
- @@ -965,7 +965,7 @@ mraid_mm_register_adp(mraid_mmadp_t *lld
- for (i = 0; i < lld_adp->max_kioc; i++) {
- kioc = adapter->kioc_list + i;
- - kioc->cmdbuf = (uint64_t)(unsigned long)(mbox_list + i);
- + kioc->cmdbuf = (mbox_list + i);
- kioc->pthru32 = pci_pool_alloc(adapter->pthru_dma_pool,
- GFP_KERNEL, &kioc->pthru32_h);
- diff -u -p a/drivers/scsi/initio.c b/drivers/scsi/initio.c
- --- a/drivers/scsi/initio.c
- +++ b/drivers/scsi/initio.c
- @@ -2583,7 +2583,7 @@ static void initio_build_scb(struct init
- SENSE_SIZE, DMA_FROM_DEVICE);
- cblk->senseptr = (u32)dma_addr;
- cblk->senselen = SENSE_SIZE;
- - cmnd->SCp.ptr = (char *)(unsigned long)dma_addr;
- + cmnd->SCp.ptr = dma_addr;
- cblk->cdblen = cmnd->cmd_len;
- /* Clear the returned status */
- diff -u -p a/drivers/scsi/hptiop.c b/drivers/scsi/hptiop.c
- --- a/drivers/scsi/hptiop.c
- +++ b/drivers/scsi/hptiop.c
- @@ -819,7 +819,7 @@ void hptiop_iop_request_callback_itl(str
- BUG_ON(readl(&req->type) != IOP_REQUEST_TYPE_IOCTL_COMMAND);
- p = (struct hpt_iop_request_ioctl_command __iomem *)req;
- - arg = (struct hpt_ioctl_k *)(unsigned long)
- + arg =
- (readl(&req->context) |
- ((u64)readl(&req->context_hi32)<<32));
- diff -u -p a/drivers/scsi/qla4xxx/ql4_mbx.c b/drivers/scsi/qla4xxx/ql4_mbx.c
- --- a/drivers/scsi/qla4xxx/ql4_mbx.c
- +++ b/drivers/scsi/qla4xxx/ql4_mbx.c
- @@ -1187,7 +1187,7 @@ int qla4xxx_abort_task(struct scsi_qla_h
- memset(&mbox_sts, 0, sizeof(mbox_sts));
- spin_lock_irqsave(&ha->hardware_lock, flags);
- - index = (unsigned long)(unsigned char *)cmd->host_scribble;
- + index = cmd->host_scribble;
- spin_unlock_irqrestore(&ha->hardware_lock, flags);
- /* Firmware already posted completion on response queue */
- diff -u -p a/drivers/scsi/aic94xx/aic94xx_dev.c b/drivers/scsi/aic94xx/aic94xx_dev.c
- --- a/drivers/scsi/aic94xx/aic94xx_dev.c
- +++ b/drivers/scsi/aic94xx/aic94xx_dev.c
- @@ -82,7 +82,7 @@ static void asd_free_ddb(struct asd_ha_s
- static void asd_set_ddb_type(struct domain_device *dev)
- {
- struct asd_ha_struct *asd_ha = dev->port->ha->lldd_ha;
- - int ddb = (int) (unsigned long) dev->lldd_dev;
- + int ddb = dev->lldd_dev;
- if (dev->dev_type == SAS_SATA_PM_PORT)
- asd_ddbsite_write_byte(asd_ha,ddb, DDB_TYPE, DDB_TYPE_PM_PORT);
- @@ -113,7 +113,7 @@ void asd_set_dmamode(struct domain_devic
- {
- struct asd_ha_struct *asd_ha = dev->port->ha->lldd_ha;
- struct ata_device *ata_dev = sas_to_ata_dev(dev);
- - int ddb = (int) (unsigned long) dev->lldd_dev;
- + int ddb = dev->lldd_dev;
- u32 qdepth = 0;
- if (dev->dev_type == SAS_SATA_DEV || dev->dev_type == SAS_SATA_PM_PORT) {
- @@ -137,7 +137,7 @@ void asd_set_dmamode(struct domain_devic
- static int asd_init_sata(struct domain_device *dev)
- {
- struct asd_ha_struct *asd_ha = dev->port->ha->lldd_ha;
- - int ddb = (int) (unsigned long) dev->lldd_dev;
- + int ddb = dev->lldd_dev;
- asd_ddbsite_write_word(asd_ha, ddb, ATA_CMD_SCBPTR, 0xFFFF);
- if (dev->dev_type == SAS_SATA_DEV || dev->dev_type == SAS_SATA_PM ||
- @@ -161,7 +161,7 @@ static int asd_init_target_ddb(struct do
- if (ddb < 0)
- return ddb;
- - dev->lldd_dev = (void *) (unsigned long) ddb;
- + dev->lldd_dev = ddb;
- asd_ddbsite_write_byte(asd_ha, ddb, 0, DDB_TP_CONN_TYPE);
- asd_ddbsite_write_byte(asd_ha, ddb, 1, 0);
- @@ -278,7 +278,7 @@ static int asd_init_sata_pm_port_ddb(str
- asd_ddbsite_write_word(asd_ha, ddb, ATA_CMD_SCBPTR, 0xFFFF);
- asd_init_sata(dev);
- - parent_ddb = (int) (unsigned long) dev->parent->lldd_dev;
- + parent_ddb = dev->parent->lldd_dev;
- asd_ddbsite_write_word(asd_ha, ddb, PARENT_DDB, parent_ddb);
- pmtable_ddb = asd_ddbsite_read_word(asd_ha, parent_ddb, SISTER_DDB);
- asd_ddbsite_write_word(asd_ha, pmtable_ddb, dev->sata_dev.port_no,ddb);
- @@ -352,7 +352,7 @@ void asd_dev_gone(struct domain_device *
- struct asd_ha_struct *asd_ha = dev->port->ha->lldd_ha;
- spin_lock_irqsave(&asd_ha->hw_prof.ddb_lock, flags);
- - ddb = (int) (unsigned long) dev->lldd_dev;
- + ddb = dev->lldd_dev;
- sister_ddb = asd_ddbsite_read_word(asd_ha, ddb, SISTER_DDB);
- if (sister_ddb != 0xFFFF)
- diff -u -p a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
- --- a/drivers/scsi/megaraid.c
- +++ b/drivers/scsi/megaraid.c
- @@ -3207,7 +3207,7 @@ megadev_ioctl(struct file *filep, unsign
- /*
- * The user passthru structure
- */
- - upthru = (mega_passthru __user *)(unsigned long)MBOX(uioc)->xferaddr;
- + upthru = MBOX(uioc)->xferaddr;
- /*
- * Copy in the user passthru here.
- diff -u -p a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c
- --- a/drivers/ata/pata_amd.c
- +++ b/drivers/ata/pata_amd.c
- @@ -567,7 +567,7 @@ static int amd_init_one(struct pci_dev *
- u32 udma;
- pci_read_config_dword(pdev, 0x60, &udma);
- - hpriv = (void *)(unsigned long)udma;
- + hpriv = udma;
- }
- /* And fire it up */
- diff -u -p a/mm/mempool.c b/mm/mempool.c
- --- a/mm/mempool.c
- +++ b/mm/mempool.c
- @@ -366,14 +366,14 @@ EXPORT_SYMBOL(mempool_kfree);
- */
- void *mempool_alloc_pages(gfp_t gfp_mask, void *pool_data)
- {
- - int order = (int)(long)pool_data;
- + int order = pool_data;
- return alloc_pages(gfp_mask, order);
- }
- EXPORT_SYMBOL(mempool_alloc_pages);
- void mempool_free_pages(void *element, void *pool_data)
- {
- - int order = (int)(long)pool_data;
- + int order = pool_data;
- __free_pages(element, order);
- }
- EXPORT_SYMBOL(mempool_free_pages);
- diff -u -p a/sound/oss/mpu401.c b/sound/oss/mpu401.c
- --- a/sound/oss/mpu401.c
- +++ b/sound/oss/mpu401.c
- @@ -437,7 +437,7 @@ static void mpu401_input_loop(struct mpu
- static irqreturn_t mpuintr(int irq, void *dev_id)
- {
- struct mpu_config *devc;
- - int dev = (int)(unsigned long) dev_id;
- + int dev = dev_id;
- int handled = 0;
- devc = &dev_conf[dev];
- diff -u -p a/sound/oss/sb_common.c b/sound/oss/sb_common.c
- --- a/sound/oss/sb_common.c
- +++ b/sound/oss/sb_common.c
- @@ -1225,7 +1225,7 @@ int probe_sbmpu(struct address_info *hw_
- attach_mpu401(hw_config, owner);
- if (last_sb->irq == -hw_config->irq)
- last_sb->midi_irq_cookie =
- - (void *)(long) hw_config->slots[1];
- + hw_config->slots[1];
- return 1;
- }
- #endif
- diff -u -p a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
- --- a/sound/core/pcm_lib.c
- +++ b/sound/core/pcm_lib.c
- @@ -1485,7 +1485,7 @@ EXPORT_SYMBOL(snd_pcm_hw_constraint_pow2
- static int snd_pcm_hw_rule_noresample_func(struct snd_pcm_hw_params *params,
- struct snd_pcm_hw_rule *rule)
- {
- - unsigned int base_rate = (unsigned int)(uintptr_t)rule->private;
- + unsigned int base_rate = rule->private;
- struct snd_interval *rate;
- rate = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);
- diff -u -p a/sound/pci/oxygen/oxygen_pcm.c b/sound/pci/oxygen/oxygen_pcm.c
- --- a/sound/pci/oxygen/oxygen_pcm.c
- +++ b/sound/pci/oxygen/oxygen_pcm.c
- @@ -136,7 +136,7 @@ static int oxygen_open(struct snd_pcm_su
- struct snd_pcm_runtime *runtime = substream->runtime;
- int err;
- - runtime->private_data = (void *)(uintptr_t)channel;
- + runtime->private_data = channel;
- if (channel == PCM_B && chip->has_ac97_1 &&
- (chip->model.device_config & CAPTURE_2_FROM_AC97_1))
- runtime->hw = oxygen_ac97_hardware;
- diff -u -p a/arch/arm/common/mcpm_entry.c b/arch/arm/common/mcpm_entry.c
- --- a/arch/arm/common/mcpm_entry.c
- +++ b/arch/arm/common/mcpm_entry.c
- @@ -101,7 +101,7 @@ void mcpm_cpu_power_down(void)
- * had happened as described above.
- */
- - phys_reset = (phys_reset_t)(unsigned long)virt_to_phys(cpu_reset);
- + phys_reset = virt_to_phys(cpu_reset);
- phys_reset(virt_to_phys(mcpm_entry_point));
- /* should never get here */
- @@ -134,7 +134,7 @@ void mcpm_cpu_suspend(u64 expected_resid
- /* Very similar to mcpm_cpu_power_down() */
- setup_mm_for_reboot();
- platform_ops->suspend(expected_residency);
- - phys_reset = (phys_reset_t)(unsigned long)virt_to_phys(cpu_reset);
- + phys_reset = virt_to_phys(cpu_reset);
- phys_reset(virt_to_phys(mcpm_entry_point));
- BUG();
- }
- @@ -167,7 +167,7 @@ static int __init nocache_trampoline(uns
- __mcpm_outbound_leave_critical(cluster, CLUSTER_DOWN);
- __mcpm_cpu_down(cpu, cluster);
- - phys_reset = (phys_reset_t)(unsigned long)virt_to_phys(cpu_reset);
- + phys_reset = virt_to_phys(cpu_reset);
- phys_reset(virt_to_phys(mcpm_entry_point));
- BUG();
- }
- diff -u -p a/arch/mn10300/kernel/mn10300-serial.c b/arch/mn10300/kernel/mn10300-serial.c
- --- a/arch/mn10300/kernel/mn10300-serial.c
- +++ b/arch/mn10300/kernel/mn10300-serial.c
- @@ -1476,7 +1476,7 @@ static int mn10300_serial_verify_port(st
- {
- struct mn10300_serial_port *port =
- container_of(_port, struct mn10300_serial_port, uart);
- - void *mapbase = (void *) (unsigned long) port->uart.mapbase;
- + void *mapbase = port->uart.mapbase;
- _enter("%s", port->name);
- diff -u -p a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
- --- a/arch/sparc/mm/init_64.c
- +++ b/arch/sparc/mm/init_64.c
- @@ -1790,7 +1790,7 @@ static void patch_one_ktsb_phys(unsigned
- low_bits = (pa >> 0) & 0xffffffff;
- while (start < end) {
- - unsigned int *ia = (unsigned int *)(unsigned long)*start;
- + unsigned int *ia = *start;
- ia[0] = (ia[0] & ~0x3fffff) | (high_bits >> 10);
- __asm__ __volatile__("flush %0" : : "r" (ia));
- diff -u -p a/arch/s390/kernel/kprobes.c b/arch/s390/kernel/kprobes.c
- --- a/arch/s390/kernel/kprobes.c
- +++ b/arch/s390/kernel/kprobes.c
- @@ -87,8 +87,8 @@ static void copy_instruction(struct kpro
- * Therefore the new displacement will always fit.
- */
- disp = *(s32 *)&p->ainsn.insn[1];
- - addr = (u64)(unsigned long)p->addr;
- - new_addr = (u64)(unsigned long)p->ainsn.insn;
- + addr = p->addr;
- + new_addr = p->ainsn.insn;
- new_disp = ((addr + (disp * 2)) - new_addr) / 2;
- *(s32 *)&p->ainsn.insn[1] = new_disp;
- }
- diff -u -p a/arch/s390/boot/compressed/misc.c b/arch/s390/boot/compressed/misc.c
- --- a/arch/s390/boot/compressed/misc.c
- +++ b/arch/s390/boot/compressed/misc.c
- @@ -131,7 +131,7 @@ static void check_ipl_parmblock(void *st
- {
- void *src, *dst;
- - src = (void *)(unsigned long) S390_lowcore.ipl_parmblock_ptr;
- + src = S390_lowcore.ipl_parmblock_ptr;
- if (src + PAGE_SIZE <= start || src >= start + size)
- return;
- dst = (void *) IPL_PARMBLOCK_ORIGIN;
- diff -u -p a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c
- --- a/arch/mips/kernel/vpe.c
- +++ b/arch/mips/kernel/vpe.c
- @@ -241,7 +241,7 @@ static int apply_r_mips_gprel16(struct m
- } else {
- /* .sbss + gp(relative) + offset */
- /* kludge! */
- - rel = (int)(short)((int)v + gp_offs +
- + rel = ((int)v + gp_offs +
- (int)(short)(*location & 0xffff) - gp_addr);
- }
- diff -u -p a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c
- --- a/arch/mips/txx9/generic/setup.c
- +++ b/arch/mips/txx9/generic/setup.c
- @@ -179,7 +179,7 @@ static void __init prom_init_cmdline(voi
- arcs_cmdline[0] = '\0';
- for (i = 1; i < argc; i++) {
- - char *str = (char *)(long)argv32[i];
- + char *str = argv32[i];
- if (i != 1)
- strcat(arcs_cmdline, " ");
- if (strchr(str, ' ')) {
- diff -u -p a/arch/mips/dec/prom/cmdline.c b/arch/mips/dec/prom/cmdline.c
- --- a/arch/mips/dec/prom/cmdline.c
- +++ b/arch/mips/dec/prom/cmdline.c
- @@ -27,7 +27,7 @@ void __init prom_init_cmdline(s32 argc,
- else
- start_arg = 2;
- for (i = start_arg; i < argc; i++) {
- - arg = (void *)(long)(argv[i]);
- + arg = (argv[i]);
- strcat(arcs_cmdline, arg);
- if (i < (argc - 1))
- strcat(arcs_cmdline, " ");
- diff -u -p a/arch/parisc/kernel/drivers.c b/arch/parisc/kernel/drivers.c
- --- a/arch/parisc/kernel/drivers.c
- +++ b/arch/parisc/kernel/drivers.c
- @@ -796,7 +796,7 @@ void walk_lower_bus(struct parisc_device
- return;
- if (dev->id.hw_type == HPHW_IOA) {
- - io_io_low = (unsigned long)(signed int)(READ_IO_IO_LOW(dev) << 16);
- + io_io_low = (READ_IO_IO_LOW(dev) << 16);
- io_io_high = io_io_low + MAX_NATIVE_DEVICES * NATIVE_DEVICE_OFFSET;
- } else {
- io_io_low = (READ_IO_IO_LOW(dev) + ~FLEX_MASK) & FLEX_MASK;
- diff -u -p a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c
- --- a/arch/arm64/kvm/guest.c
- +++ b/arch/arm64/kvm/guest.c
- @@ -54,7 +54,7 @@ static int get_core_reg(struct kvm_vcpu
- * array. Hence below, nr_regs is the number of entries, and
- * off the index in the "array".
- */
- - __u32 __user *uaddr = (__u32 __user *)(unsigned long)reg->addr;
- + __u32 __user *uaddr = reg->addr;
- struct kvm_regs *regs = vcpu_gp_regs(vcpu);
- int nr_regs = sizeof(*regs) / sizeof(__u32);
- u32 off;
- @@ -73,7 +73,7 @@ static int get_core_reg(struct kvm_vcpu
- static int set_core_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)
- {
- - __u32 __user *uaddr = (__u32 __user *)(unsigned long)reg->addr;
- + __u32 __user *uaddr = reg->addr;
- struct kvm_regs *regs = vcpu_gp_regs(vcpu);
- int nr_regs = sizeof(*regs) / sizeof(__u32);
- __uint128_t tmp;
- @@ -167,7 +167,7 @@ static int copy_timer_indices(struct kvm
- static int set_timer_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)
- {
- - void __user *uaddr = (void __user *)(long)reg->addr;
- + void __user *uaddr = reg->addr;
- u64 val;
- int ret;
- @@ -180,7 +180,7 @@ static int set_timer_reg(struct kvm_vcpu
- static int get_timer_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)
- {
- - void __user *uaddr = (void __user *)(long)reg->addr;
- + void __user *uaddr = reg->addr;
- u64 val;
- val = kvm_arm_timer_get_reg(vcpu, reg->id);
- diff -u -p a/arch/um/os-Linux/elf_aux.c b/arch/um/os-Linux/elf_aux.c
- --- a/arch/um/os-Linux/elf_aux.c
- +++ b/arch/um/os-Linux/elf_aux.c
- @@ -52,7 +52,7 @@ __init void scan_elf_aux( char **envp)
- * all that's left.
- */
- elf_aux_platform =
- - (char *) (long) auxv->a_un.a_val;
- + auxv->a_un.a_val;
- break;
- case AT_PAGESZ:
- page_size = auxv->a_un.a_val;
- diff -u -p a/arch/x86/mm/mpx.c b/arch/x86/mm/mpx.c
- --- a/arch/x86/mm/mpx.c
- +++ b/arch/x86/mm/mpx.c
- @@ -319,8 +319,8 @@ siginfo_t *mpx_generate_siginfo(struct p
- * complains when casting from integers to different-size
- * pointers.
- */
- - info->si_lower = (void __user *)(unsigned long)bndreg->lower_bound;
- - info->si_upper = (void __user *)(unsigned long)~bndreg->upper_bound;
- + info->si_lower = bndreg->lower_bound;
- + info->si_upper = ~bndreg->upper_bound;
- info->si_addr_lsb = 0;
- info->si_signo = SIGSEGV;
- info->si_errno = 0;
- diff -u -p a/arch/powerpc/kernel/jump_label.c b/arch/powerpc/kernel/jump_label.c
- --- a/arch/powerpc/kernel/jump_label.c
- +++ b/arch/powerpc/kernel/jump_label.c
- @@ -15,7 +15,7 @@
- void arch_jump_label_transform(struct jump_entry *entry,
- enum jump_label_type type)
- {
- - u32 *addr = (u32 *)(unsigned long)entry->code;
- + u32 *addr = entry->code;
- if (type == JUMP_LABEL_ENABLE)
- patch_branch(addr, entry->target, 0);
- diff -u -p a/net/9p/trans_rdma.c b/net/9p/trans_rdma.c
- --- a/net/9p/trans_rdma.c
- +++ b/net/9p/trans_rdma.c
- @@ -341,7 +341,7 @@ static void cq_comp_handler(struct ib_cq
- ib_req_notify_cq(rdma->cq, IB_CQ_NEXT_COMP);
- while ((ret = ib_poll_cq(cq, 1, &wc)) > 0) {
- - struct p9_rdma_context *c = (void *) (unsigned long) wc.wr_id;
- + struct p9_rdma_context *c = wc.wr_id;
- switch (c->wc_op) {
- case IB_WC_RECV:
- diff -u -p a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c
- --- a/net/sunrpc/xprtrdma/verbs.c
- +++ b/net/sunrpc/xprtrdma/verbs.c
- @@ -217,7 +217,7 @@ rpcrdma_sendcq_process_wc(struct ib_wc *
- } else {
- struct rpcrdma_mw *r;
- - r = (struct rpcrdma_mw *)(unsigned long)wc->wr_id;
- + r = wc->wr_id;
- r->r.frmr.fr_state = FRMR_IS_STALE;
- pr_err("RPC: %s: frmr %p (stale): %s\n",
- __func__, r, COMPLETION_MSG(wc->status));
- @@ -283,7 +283,7 @@ static void
- rpcrdma_recvcq_process_wc(struct ib_wc *wc, struct list_head *sched_list)
- {
- struct rpcrdma_rep *rep =
- - (struct rpcrdma_rep *)(unsigned long)wc->wr_id;
- + wc->wr_id;
- /* WARNING: Only wr_id and status are reliable at this point */
- if (wc->status != IB_WC_SUCCESS)
- @@ -1526,7 +1526,7 @@ rpcrdma_retry_local_inv(struct rpcrdma_m
- r->r.frmr.fr_state = FRMR_IS_INVALID;
- memset(&invalidate_wr, 0, sizeof(invalidate_wr));
- - invalidate_wr.wr_id = (unsigned long)(void *)r;
- + invalidate_wr.wr_id = r;
- invalidate_wr.opcode = IB_WR_LOCAL_INV;
- invalidate_wr.ex.invalidate_rkey = r->r.frmr.fr_mr->rkey;
- DECR_CQCOUNT(&r_xprt->rx_ep);
- @@ -1933,7 +1933,7 @@ rpcrdma_register_frmr_external(struct rp
- frmr->fr_state = FRMR_IS_VALID;
- memset(&fastreg_wr, 0, sizeof(fastreg_wr));
- - fastreg_wr.wr_id = (unsigned long)(void *)mw;
- + fastreg_wr.wr_id = mw;
- fastreg_wr.opcode = IB_WR_FAST_REG_MR;
- fastreg_wr.wr.fast_reg.iova_start = seg1->mr_dma;
- fastreg_wr.wr.fast_reg.page_list = frmr->fr_pgl;
- @@ -1987,7 +1987,7 @@ rpcrdma_deregister_frmr_external(struct
- seg1->rl_mw->r.frmr.fr_state = FRMR_IS_INVALID;
- memset(&invalidate_wr, 0, sizeof invalidate_wr);
- - invalidate_wr.wr_id = (unsigned long)(void *)seg1->rl_mw;
- + invalidate_wr.wr_id = seg1->rl_mw;
- invalidate_wr.opcode = IB_WR_LOCAL_INV;
- invalidate_wr.ex.invalidate_rkey = seg1->rl_mw->r.frmr.fr_mr->rkey;
- DECR_CQCOUNT(&r_xprt->rx_ep);
- @@ -2198,7 +2198,7 @@ rpcrdma_ep_post_recv(struct rpcrdma_ia *
- int rc;
- recv_wr.next = NULL;
- - recv_wr.wr_id = (u64) (unsigned long) rep;
- + recv_wr.wr_id = rep;
- recv_wr.sg_list = &rep->rr_rdmabuf->rg_iov;
- recv_wr.num_sge = 1;
- diff -u -p a/net/core/sock_diag.c b/net/core/sock_diag.c
- --- a/net/core/sock_diag.c
- +++ b/net/core/sock_diag.c
- @@ -27,7 +27,7 @@ EXPORT_SYMBOL_GPL(sock_diag_check_cookie
- void sock_diag_save_cookie(void *sk, __u32 *cookie)
- {
- - cookie[0] = (u32)(unsigned long)sk;
- + cookie[0] = sk;
- cookie[1] = (u32)(((unsigned long)sk >> 31) >> 1);
- }
- EXPORT_SYMBOL_GPL(sock_diag_save_cookie);
- diff -u -p a/fs/proc/base.c b/fs/proc/base.c
- --- a/fs/proc/base.c
- +++ b/fs/proc/base.c
- @@ -1757,7 +1757,7 @@ static int
- proc_map_files_instantiate(struct inode *dir, struct dentry *dentry,
- struct task_struct *task, const void *ptr)
- {
- - fmode_t mode = (fmode_t)(unsigned long)ptr;
- + fmode_t mode = ptr;
- struct proc_inode *ei;
- struct inode *inode;
- diff -u -p a/fs/afs/dir.c b/fs/afs/dir.c
- --- a/fs/afs/dir.c
- +++ b/fs/afs/dir.c
- @@ -548,7 +548,7 @@ static struct dentry *afs_lookup(struct
- _leave(" = %d [do]", ret);
- return ERR_PTR(ret);
- }
- - dentry->d_fsdata = (void *)(unsigned long) vnode->status.data_version;
- + dentry->d_fsdata = vnode->status.data_version;
- /* instantiate the dentry */
- inode = afs_iget(dir->i_sb, key, &fid, NULL, NULL);
- @@ -612,7 +612,7 @@ static int afs_d_revalidate(struct dentr
- goto out_bad;
- }
- - dir_version = (void *) (unsigned long) dir->status.data_version;
- + dir_version = dir->status.data_version;
- if (dentry->d_fsdata == dir_version)
- goto out_valid; /* the dir contents are unchanged */
- diff -u -p a/fs/affs/namei.c b/fs/affs/namei.c
- --- a/fs/affs/namei.c
- +++ b/fs/affs/namei.c
- @@ -230,7 +230,7 @@ affs_lookup(struct inode *dir, struct de
- u32 ino = bh->b_blocknr;
- /* store the real header ino in d_fsdata for faster lookups */
- - dentry->d_fsdata = (void *)(long)ino;
- + dentry->d_fsdata = ino;
- switch (be32_to_cpu(AFFS_TAIL(sb, bh)->stype)) {
- //link to dirs disabled
- //case ST_LINKDIR:
- diff -u -p a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
- --- a/fs/reiserfs/inode.c
- +++ b/fs/reiserfs/inode.c
- @@ -2770,7 +2770,7 @@ static int reiserfs_write_begin(struct f
- if (flags & AOP_FLAG_CONT_EXPAND &&
- (pos & (inode->i_sb->s_blocksize - 1)) == 0) {
- pos ++;
- - *fsdata = (void *)(unsigned long)flags;
- + *fsdata = flags;
- }
- index = pos >> PAGE_CACHE_SHIFT;
- diff -u -p a/fs/btrfs/send.c b/fs/btrfs/send.c
- --- a/fs/btrfs/send.c
- +++ b/fs/btrfs/send.c
- @@ -1164,7 +1164,7 @@ struct backref_ctx {
- static int __clone_root_cmp_bsearch(const void *key, const void *elt)
- {
- - u64 root = (u64)(uintptr_t)key;
- + u64 root = key;
- struct clone_root *cr = (struct clone_root *)elt;
- if (root < cr->root->objectid)
- diff -u -p a/fs/fuse/file.c b/fs/fuse/file.c
- --- a/fs/fuse/file.c
- +++ b/fs/fuse/file.c
- @@ -2389,7 +2389,7 @@ static int fuse_copy_ioctl_iovec(struct
- fiov[i].len != (unsigned long) fiov[i].len)
- return -EIO;
- - dst[i].iov_base = (void __user *) (unsigned long) fiov[i].base;
- + dst[i].iov_base = fiov[i].base;
- dst[i].iov_len = (size_t) fiov[i].len;
- #ifdef CONFIG_COMPAT
- diff -u -p a/fs/ocfs2/ioctl.c b/fs/ocfs2/ioctl.c
- --- a/fs/ocfs2/ioctl.c
- +++ b/fs/ocfs2/ioctl.c
- @@ -781,12 +781,12 @@ static int ocfs2_get_request_ptr(struct
- * pointer bp stores the base address of a pointers array,
- * which collects all addresses of separate request.
- */
- - bp = (u64 __user *)(unsigned long)compat_ptr(info->oi_requests);
- + bp = compat_ptr(info->oi_requests);
- #else
- BUG();
- #endif
- } else
- - bp = (u64 __user *)(unsigned long)(info->oi_requests);
- + bp = (info->oi_requests);
- if (o2info_from_user(*req_addr, bp + idx))
- goto bail;
- @@ -826,7 +826,7 @@ static int ocfs2_info_handle(struct inod
- if (status)
- break;
- - reqp = (struct ocfs2_info_request __user *)(unsigned long)req_addr;
- + reqp = req_addr;
- if (!reqp) {
- status = -EINVAL;
- goto bail;
- @@ -913,8 +913,8 @@ long ocfs2_ioctl(struct file *filp, unsi
- case OCFS2_IOC_REFLINK:
- if (copy_from_user(&args, argp, sizeof(args)))
- return -EFAULT;
- - old_path = (const char __user *)(unsigned long)args.old_path;
- - new_path = (const char __user *)(unsigned long)args.new_path;
- + old_path = args.old_path;
- + new_path = args.new_path;
- preserve = (args.preserve != 0);
- return ocfs2_reflink_ioctl(inode, old_path, new_path, preserve);
- diff -u -p a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c
- --- a/virt/kvm/arm/vgic.c
- +++ b/virt/kvm/arm/vgic.c
- @@ -1762,7 +1762,7 @@ int vgic_set_common_attr(struct kvm_devi
- switch (attr->group) {
- case KVM_DEV_ARM_VGIC_GRP_ADDR: {
- - u64 __user *uaddr = (u64 __user *)(long)attr->addr;
- + u64 __user *uaddr = attr->addr;
- u64 addr;
- unsigned long type = (unsigned long)attr->attr;
- @@ -1773,7 +1773,7 @@ int vgic_set_common_attr(struct kvm_devi
- return (r == -ENODEV) ? -ENXIO : r;
- }
- case KVM_DEV_ARM_VGIC_GRP_NR_IRQS: {
- - u32 __user *uaddr = (u32 __user *)(long)attr->addr;
- + u32 __user *uaddr = attr->addr;
- u32 val;
- int ret = 0;
- @@ -1821,7 +1821,7 @@ int vgic_get_common_attr(struct kvm_devi
- switch (attr->group) {
- case KVM_DEV_ARM_VGIC_GRP_ADDR: {
- - u64 __user *uaddr = (u64 __user *)(long)attr->addr;
- + u64 __user *uaddr = attr->addr;
- u64 addr;
- unsigned long type = (unsigned long)attr->attr;
- @@ -1834,7 +1834,7 @@ int vgic_get_common_attr(struct kvm_devi
- break;
- }
- case KVM_DEV_ARM_VGIC_GRP_NR_IRQS: {
- - u32 __user *uaddr = (u32 __user *)(long)attr->addr;
- + u32 __user *uaddr = attr->addr;
- r = put_user(dev->kvm->arch.vgic.nr_irqs, uaddr);
- break;
- diff -u -p a/scripts/dtc/libfdt/fdt_rw.c b/scripts/dtc/libfdt/fdt_rw.c
- --- a/scripts/dtc/libfdt/fdt_rw.c
- +++ b/scripts/dtc/libfdt/fdt_rw.c
- @@ -256,7 +256,7 @@ int fdt_set_name(void *fdt, int nodeoffs
- FDT_RW_CHECK_HEADER(fdt);
- - namep = (char *)(uintptr_t)fdt_get_name(fdt, nodeoffset, &oldlen);
- + namep = fdt_get_name(fdt, nodeoffset, &oldlen);
- if (!namep)
- return oldlen;
- @@ -460,7 +460,7 @@ int fdt_open_into(const void *fdt, void
- /* But if that overlaps with the old tree... */
- if (((tmp + newsize) > fdtstart) && (tmp < fdtend)) {
- /* Try right after the old tree instead */
- - tmp = (char *)(uintptr_t)fdtend;
- + tmp = fdtend;
- if ((tmp + newsize) > ((char *)buf + bufsize))
- return -FDT_ERR_NOSPACE;
- }
- diff -u -p a/scripts/mod/modpost.c b/scripts/mod/modpost.c
- --- a/scripts/mod/modpost.c
- +++ b/scripts/mod/modpost.c
- @@ -1499,7 +1499,7 @@ static int addend_arm_rel(struct elf_inf
- switch (r_typ) {
- case R_ARM_ABS32:
- /* From ARM ABI: (S + A) | T */
- - r->r_addend = (int)(long)
- + r->r_addend =
- (elf->symtab_start + ELF_R_SYM(r->r_info));
- break;
- case R_ARM_PC24:
- @@ -1509,7 +1509,7 @@ static int addend_arm_rel(struct elf_inf
- case R_ARM_THM_JUMP24:
- case R_ARM_THM_JUMP19:
- /* From ARM ABI: ((S + A) | T) - P */
- - r->r_addend = (int)(long)(elf->hdr +
- + r->r_addend = (elf->hdr +
- sechdr->sh_offset +
- (r->r_offset - sechdr->sh_addr));
- break;
- diff -u -p a/kernel/cpu.c b/kernel/cpu.c
- --- a/kernel/cpu.c
- +++ b/kernel/cpu.c
- @@ -347,7 +347,7 @@ static int __ref take_cpu_down(void *_pa
- static int __ref _cpu_down(unsigned int cpu, int tasks_frozen)
- {
- int err, nr_calls = 0;
- - void *hcpu = (void *)(long)cpu;
- + void *hcpu = cpu;
- unsigned long mod = tasks_frozen ? CPU_TASKS_FROZEN : 0;
- struct take_cpu_down_param tcd_param = {
- .mod = mod,
- @@ -450,7 +450,7 @@ EXPORT_SYMBOL(cpu_down);
- static int _cpu_up(unsigned int cpu, int tasks_frozen)
- {
- int ret, nr_calls = 0;
- - void *hcpu = (void *)(long)cpu;
- + void *hcpu = cpu;
- unsigned long mod = tasks_frozen ? CPU_TASKS_FROZEN : 0;
- struct task_struct *idle;
- diff -u -p a/kernel/smp.c b/kernel/smp.c
- --- a/kernel/smp.c
- +++ b/kernel/smp.c
- @@ -88,7 +88,7 @@ static struct notifier_block hotplug_cfd
- void __init call_function_init(void)
- {
- - void *cpu = (void *)(long)smp_processor_id();
- + void *cpu = smp_processor_id();
- int i;
- for_each_possible_cpu(i)
- diff -u -p a/kernel/irq/proc.c b/kernel/irq/proc.c
- --- a/kernel/irq/proc.c
- +++ b/kernel/irq/proc.c
- @@ -91,7 +91,7 @@ static int irq_affinity_list_proc_show(s
- static ssize_t write_irq_affinity(int type, struct file *file,
- const char __user *buffer, size_t count, loff_t *pos)
- {
- - unsigned int irq = (int)(long)PDE_DATA(file_inode(file));
- + unsigned int irq = PDE_DATA(file_inode(file));
- cpumask_var_t new_value;
- int err;
- diff -u -p a/drivers/net/wireless/iwlwifi/mvm/tx.c b/drivers/net/wireless/iwlwifi/mvm/tx.c
- --- a/drivers/net/wireless/iwlwifi/mvm/tx.c
- +++ b/drivers/net/wireless/iwlwifi/mvm/tx.c
- @@ -685,7 +685,7 @@ static void iwl_mvm_rx_tx_cmd_single(str
- le16_to_cpu(tx_resp->wireless_media_time);
- BUILD_BUG_ON(ARRAY_SIZE(info->status.status_driver_data) < 1);
- info->status.status_driver_data[0] =
- - (void *)(uintptr_t)tx_resp->reduced_tpc;
- + tx_resp->reduced_tpc;
- ieee80211_tx_status(mvm->hw, skb);
- }
- @@ -908,7 +908,7 @@ static void iwl_mvm_tx_info_from_ba_noti
- /* TODO: not accounted if the whole A-MPDU failed */
- info->status.tx_time = tid_data->tx_time;
- info->status.status_driver_data[0] =
- - (void *)(uintptr_t)tid_data->reduced_tpc;
- + tid_data->reduced_tpc;
- }
- int iwl_mvm_rx_ba_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb,
- diff -u -p a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
- --- a/drivers/net/wireless/ti/wlcore/main.c
- +++ b/drivers/net/wireless/ti/wlcore/main.c
- @@ -3186,7 +3186,7 @@ static void wl1271_op_configure_filter(s
- unsigned int changed,
- unsigned int *total, u64 multicast)
- {
- - struct wl1271_filter_params *fp = (void *)(unsigned long)multicast;
- + struct wl1271_filter_params *fp = multicast;
- struct wl1271 *wl = hw->priv;
- struct wl12xx_vif *wlvif;
- diff -u -p a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
- --- a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
- +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
- @@ -1272,7 +1272,7 @@ static int ft1000_proc_drvmsg(struct ft1
- *pmsg++ = 0;
- *pmsg++ = htons(info->DSPInfoBlklen + 20 + info->DSPInfoBlklen);
- ppseudo_hdr =
- - (struct pseudo_hdr *)(u16 *)&info->DSPInfoBlk[2];
- + &info->DSPInfoBlk[2];
- ppseudo_hdr->length = htons(info->DSPInfoBlklen + 4
- + info->DSPInfoBlklen);
- ppseudo_hdr->source = 0x10;
- diff -u -p a/drivers/gpu/drm/nouveau/nvif/notify.c b/drivers/gpu/drm/nouveau/nvif/notify.c
- --- a/drivers/gpu/drm/nouveau/nvif/notify.c
- +++ b/drivers/gpu/drm/nouveau/nvif/notify.c
- @@ -120,7 +120,7 @@ nvif_notify(const void *header, u32 leng
- if (length == sizeof(args->v0) && args->v0.version == 0) {
- if (WARN_ON(args->v0.route))
- return NVIF_NOTIFY_DROP;
- - notify = (void *)(unsigned long)args->v0.token;
- + notify = args->v0.token;
- }
- if (!WARN_ON(notify == NULL)) {
- @@ -200,7 +200,7 @@ nvif_notify_init(struct nvif_object *obj
- args->req.version = 0;
- args->req.reply = notify->size;
- args->req.route = 0;
- - args->req.token = (unsigned long)(void *)notify;
- + args->req.token = notify;
- memcpy(args->req.data, data, size);
- ret = nvif_object_ioctl(object, args, sizeof(*args) + size, NULL);
- diff -u -p a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
- --- a/drivers/gpu/drm/drm_crtc.c
- +++ b/drivers/gpu/drm/drm_crtc.c
- @@ -1834,7 +1834,7 @@ int drm_mode_getresources(struct drm_dev
- /* FBs */
- if (card_res->count_fbs >= fb_count) {
- copied = 0;
- - fb_id = (uint32_t __user *)(unsigned long)card_res->fb_id_ptr;
- + fb_id = card_res->fb_id_ptr;
- list_for_each_entry(fb, &file_priv->fbs, filp_head) {
- if (put_user(fb->base.id, fb_id + copied)) {
- mutex_unlock(&file_priv->fbs_lock);
- @@ -1876,7 +1876,7 @@ int drm_mode_getresources(struct drm_dev
- /* CRTCs */
- if (card_res->count_crtcs >= crtc_count) {
- copied = 0;
- - crtc_id = (uint32_t __user *)(unsigned long)card_res->crtc_id_ptr;
- + crtc_id = card_res->crtc_id_ptr;
- if (!mode_group) {
- list_for_each_entry(crtc, &dev->mode_config.crtc_list,
- head) {
- @@ -1903,7 +1903,7 @@ int drm_mode_getresources(struct drm_dev
- /* Encoders */
- if (card_res->count_encoders >= encoder_count) {
- copied = 0;
- - encoder_id = (uint32_t __user *)(unsigned long)card_res->encoder_id_ptr;
- + encoder_id = card_res->encoder_id_ptr;
- if (!mode_group) {
- list_for_each_entry(encoder,
- &dev->mode_config.encoder_list,
- @@ -1934,7 +1934,7 @@ int drm_mode_getresources(struct drm_dev
- /* Connectors */
- if (card_res->count_connectors >= connector_count) {
- copied = 0;
- - connector_id = (uint32_t __user *)(unsigned long)card_res->connector_id_ptr;
- + connector_id = card_res->connector_id_ptr;
- if (!mode_group) {
- list_for_each_entry(connector,
- &dev->mode_config.connector_list,
- @@ -2160,7 +2160,7 @@ int drm_mode_getconnector(struct drm_dev
- */
- if ((out_resp->count_modes >= mode_count) && mode_count) {
- copied = 0;
- - mode_ptr = (struct drm_mode_modeinfo __user *)(unsigned long)out_resp->modes_ptr;
- + mode_ptr = out_resp->modes_ptr;
- list_for_each_entry(mode, &connector->modes, head) {
- if (!drm_mode_expose_to_userspace(mode, file_priv))
- continue;
- @@ -2185,7 +2185,7 @@ int drm_mode_getconnector(struct drm_dev
- if ((out_resp->count_encoders >= encoders_count) && encoders_count) {
- copied = 0;
- - encoder_ptr = (uint32_t __user *)(unsigned long)(out_resp->encoders_ptr);
- + encoder_ptr = (out_resp->encoders_ptr);
- for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {
- if (connector->encoder_ids[i] != 0) {
- if (put_user(connector->encoder_ids[i],
- @@ -2319,7 +2319,7 @@ int drm_mode_getplane_res(struct drm_dev
- */
- if (num_planes &&
- (plane_resp->count_planes >= num_planes)) {
- - plane_ptr = (uint32_t __user *)(unsigned long)plane_resp->plane_id_ptr;
- + plane_ptr = plane_resp->plane_id_ptr;
- /* Plane lists are invariant, no locking needed. */
- list_for_each_entry(plane, &config->plane_list, head) {
- @@ -2390,7 +2390,7 @@ int drm_mode_getplane(struct drm_device
- */
- if (plane->format_count &&
- (plane_resp->count_format_types >= plane->format_count)) {
- - format_ptr = (uint32_t __user *)(unsigned long)plane_resp->format_type_ptr;
- + format_ptr = plane_resp->format_type_ptr;
- if (copy_to_user(format_ptr,
- plane->format_types,
- sizeof(uint32_t) * plane->format_count)) {
- @@ -2813,7 +2813,7 @@ int drm_mode_setcrtc(struct drm_device *
- }
- for (i = 0; i < crtc_req->count_connectors; i++) {
- - set_connectors_ptr = (uint32_t __user *)(unsigned long)crtc_req->set_connectors_ptr;
- + set_connectors_ptr = crtc_req->set_connectors_ptr;
- if (get_user(out_id, &set_connectors_ptr[i])) {
- ret = -EFAULT;
- goto out;
- @@ -3481,7 +3481,7 @@ int drm_mode_dirtyfb_ioctl(struct drm_de
- return -ENOENT;
- num_clips = r->num_clips;
- - clips_ptr = (struct drm_clip_rect __user *)(unsigned long)r->clips_ptr;
- + clips_ptr = r->clips_ptr;
- if (!num_clips != !clips_ptr) {
- ret = -EINVAL;
- @@ -4096,7 +4096,7 @@ int drm_mode_getproperty_ioctl(struct dr
- out_resp->flags = property->flags;
- if ((out_resp->count_values >= value_count) && value_count) {
- - values_ptr = (uint64_t __user *)(unsigned long)out_resp->values_ptr;
- + values_ptr = out_resp->values_ptr;
- for (i = 0; i < value_count; i++) {
- if (copy_to_user(values_ptr + i, &property->values[i], sizeof(uint64_t))) {
- ret = -EFAULT;
- @@ -4110,7 +4110,7 @@ int drm_mode_getproperty_ioctl(struct dr
- drm_property_type_is(property, DRM_MODE_PROP_BITMASK)) {
- if ((out_resp->count_enum_blobs >= enum_count) && enum_count) {
- copied = 0;
- - enum_ptr = (struct drm_mode_property_enum __user *)(unsigned long)out_resp->enum_blob_ptr;
- + enum_ptr = out_resp->enum_blob_ptr;
- list_for_each_entry(prop_enum, &property->enum_list, head) {
- if (copy_to_user(&enum_ptr[copied].value, &prop_enum->value, sizeof(uint64_t))) {
- @@ -4213,7 +4213,7 @@ int drm_mode_getblob_ioctl(struct drm_de
- }
- if (out_resp->length == blob->length) {
- - blob_ptr = (void __user *)(unsigned long)out_resp->data;
- + blob_ptr = out_resp->data;
- if (copy_to_user(blob_ptr, blob->data, blob->length)) {
- ret = -EFAULT;
- goto done;
- diff -u -p a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
- --- a/drivers/gpu/drm/drm_bufs.c
- +++ b/drivers/gpu/drm/drm_bufs.c
- @@ -403,7 +403,7 @@ int drm_legacy_addmap_ioctl(struct drm_d
- return err;
- /* avoid a warning on 64-bit, this casting isn't very nice, but the API is set so too late */
- - map->handle = (void *)(unsigned long)maplist->user_token;
- + map->handle = maplist->user_token;
- /*
- * It appears that there are no users of this value whatsoever --
- diff -u -p a/drivers/s390/cio/eadm_sch.c b/drivers/s390/cio/eadm_sch.c
- --- a/drivers/s390/cio/eadm_sch.c
- +++ b/drivers/s390/cio/eadm_sch.c
- @@ -68,7 +68,7 @@ static int eadm_subchannel_start(struct
- orb_init(orb);
- orb->eadm.aob = (u32)__pa(aob);
- - orb->eadm.intparm = (u32)(addr_t)sch;
- + orb->eadm.intparm = sch;
- orb->eadm.key = PAGE_DEFAULT_KEY >> 4;
- EADM_LOG(6, "start");
- diff -u -p a/drivers/s390/block/dasd_fba.c b/drivers/s390/block/dasd_fba.c
- --- a/drivers/s390/block/dasd_fba.c
- +++ b/drivers/s390/block/dasd_fba.c
- @@ -353,11 +353,11 @@ static struct dasd_ccw_req *dasd_fba_bui
- ccw->cmd_code = cmd;
- ccw->count = block->bp_block;
- if (idal_is_needed(dst, blksize)) {
- - ccw->cda = (__u32)(addr_t) idaws;
- + ccw->cda = idaws;
- ccw->flags = CCW_FLAG_IDA;
- idaws = idal_create_words(idaws, dst, blksize);
- } else {
- - ccw->cda = (__u32)(addr_t) dst;
- + ccw->cda = dst;
- ccw->flags = 0;
- }
- ccw++;
- diff -u -p a/drivers/s390/block/dasd_alias.c b/drivers/s390/block/dasd_alias.c
- --- a/drivers/s390/block/dasd_alias.c
- +++ b/drivers/s390/block/dasd_alias.c
- @@ -438,7 +438,7 @@ static int read_unit_address_configurati
- ccw->cmd_code = DASD_ECKD_CCW_PSF;
- ccw->count = sizeof(struct dasd_psf_prssd_data);
- ccw->flags |= CCW_FLAG_CC;
- - ccw->cda = (__u32)(addr_t) prssdp;
- + ccw->cda = prssdp;
- /* Read Subsystem Data - feature codes */
- memset(lcu->uac, 0, sizeof(*(lcu->uac)));
- @@ -446,7 +446,7 @@ static int read_unit_address_configurati
- ccw++;
- ccw->cmd_code = DASD_ECKD_CCW_RSSD;
- ccw->count = sizeof(*(lcu->uac));
- - ccw->cda = (__u32)(addr_t) lcu->uac;
- + ccw->cda = lcu->uac;
- cqr->buildclk = get_tod_clock();
- cqr->status = DASD_CQR_FILLED;
- @@ -724,7 +724,7 @@ static int reset_summary_unit_check(stru
- ccw->cmd_code = DASD_ECKD_CCW_RSCK;
- ccw->flags = 0 ;
- ccw->count = 16;
- - ccw->cda = (__u32)(addr_t) cqr->data;
- + ccw->cda = cqr->data;
- ((char *)cqr->data)[0] = reason;
- clear_bit(DASD_CQR_FLAGS_USE_ERP, &cqr->flags);
- diff -u -p a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
- --- a/drivers/s390/block/dasd_eckd.c
- +++ b/drivers/s390/block/dasd_eckd.c
- @@ -862,7 +862,7 @@ static void dasd_eckd_fill_rcd_cqr(struc
- ccw = cqr->cpaddr;
- ccw->cmd_code = DASD_ECKD_CCW_RCD;
- ccw->flags = 0;
- - ccw->cda = (__u32)(addr_t)rcd_buffer;
- + ccw->cda = rcd_buffer;
- ccw->count = DASD_ECKD_RCD_DATA_SIZE;
- cqr->magic = DASD_ECKD_MAGIC;
- @@ -1470,7 +1470,7 @@ static int dasd_eckd_read_features(struc
- ccw->cmd_code = DASD_ECKD_CCW_PSF;
- ccw->count = sizeof(struct dasd_psf_prssd_data);
- ccw->flags |= CCW_FLAG_CC;
- - ccw->cda = (__u32)(addr_t) prssdp;
- + ccw->cda = prssdp;
- /* Read Subsystem Data - feature codes */
- features = (struct dasd_rssd_features *) (prssdp + 1);
- @@ -1479,7 +1479,7 @@ static int dasd_eckd_read_features(struc
- ccw++;
- ccw->cmd_code = DASD_ECKD_CCW_RSSD;
- ccw->count = sizeof(struct dasd_rssd_features);
- - ccw->cda = (__u32)(addr_t) features;
- + ccw->cda = features;
- cqr->buildclk = get_tod_clock();
- cqr->status = DASD_CQR_FILLED;
- @@ -1525,7 +1525,7 @@ static struct dasd_ccw_req *dasd_eckd_bu
- }
- ccw = cqr->cpaddr;
- ccw->cmd_code = DASD_ECKD_CCW_PSF;
- - ccw->cda = (__u32)(addr_t)psf_ssc_data;
- + ccw->cda = psf_ssc_data;
- ccw->count = 66;
- cqr->startdev = device;
- @@ -1859,7 +1859,7 @@ dasd_eckd_analysis_ccw(struct dasd_devic
- ccw->cmd_code = DASD_ECKD_CCW_READ_COUNT;
- ccw->flags = 0;
- ccw->count = 8;
- - ccw->cda = (__u32)(addr_t) count_data;
- + ccw->cda = count_data;
- ccw++;
- count_data++;
- }
- @@ -1873,7 +1873,7 @@ dasd_eckd_analysis_ccw(struct dasd_devic
- ccw->cmd_code = DASD_ECKD_CCW_READ_COUNT;
- ccw->flags = 0;
- ccw->count = 8;
- - ccw->cda = (__u32)(addr_t) count_data;
- + ccw->cda = count_data;
- cqr->block = NULL;
- cqr->startdev = device;
- @@ -2284,7 +2284,7 @@ dasd_eckd_build_format(struct dasd_devic
- ccw->cmd_code = DASD_ECKD_CCW_WRITE_RECORD_ZERO;
- ccw->flags = CCW_FLAG_SLI;
- ccw->count = 8;
- - ccw->cda = (__u32)(addr_t) ect;
- + ccw->cda = ect;
- ccw++;
- }
- if ((intensity & ~0x08) & 0x04) { /* erase track */
- @@ -2299,7 +2299,7 @@ dasd_eckd_build_format(struct dasd_devic
- ccw->cmd_code = DASD_ECKD_CCW_WRITE_CKD;
- ccw->flags = CCW_FLAG_SLI;
- ccw->count = 8;
- - ccw->cda = (__u32)(addr_t) ect;
- + ccw->cda = ect;
- } else { /* write remaining records */
- for (i = 0; i < rpt; i++) {
- ect = (struct eckd_count *) data;
- @@ -2334,7 +2334,7 @@ dasd_eckd_build_format(struct dasd_devic
- DASD_ECKD_CCW_WRITE_CKD_MT;
- ccw->flags = CCW_FLAG_SLI;
- ccw->count = 8;
- - ccw->cda = (__u32)(addr_t) ect;
- + ccw->cda = ect;
- ccw++;
- }
- }
- @@ -2730,11 +2730,11 @@ static struct dasd_ccw_req *dasd_eckd_bu
- ccw->cmd_code = rcmd;
- ccw->count = count;
- if (idal_is_needed(dst, blksize)) {
- - ccw->cda = (__u32)(addr_t) idaws;
- + ccw->cda = idaws;
- ccw->flags = CCW_FLAG_IDA;
- idaws = idal_create_words(idaws, dst, blksize);
- } else {
- - ccw->cda = (__u32)(addr_t) dst;
- + ccw->cda = dst;
- ccw->flags = 0;
- }
- ccw++;
- @@ -2864,7 +2864,7 @@ static struct dasd_ccw_req *dasd_eckd_bu
- ccw[-1].flags |= CCW_FLAG_CC;
- ccw->cmd_code = cmd;
- ccw->count = len_to_track_end;
- - ccw->cda = (__u32)(addr_t)idaws;
- + ccw->cda = idaws;
- ccw->flags = CCW_FLAG_IDA;
- ccw++;
- recid += count;
- @@ -3408,7 +3408,7 @@ static struct dasd_ccw_req *dasd_raw_bui
- ccw->count = 57326;
- /* 64k map to one track */
- len_to_track_end = 65536 - start_padding_sectors * 512;
- - ccw->cda = (__u32)(addr_t)idaws;
- + ccw->cda = idaws;
- ccw->flags |= CCW_FLAG_IDA;
- ccw->flags |= CCW_FLAG_SLI;
- ccw++;
- @@ -3427,7 +3427,7 @@ static struct dasd_ccw_req *dasd_raw_bui
- ccw->count = 57326;
- /* 64k map to one track */
- len_to_track_end = 65536;
- - ccw->cda = (__u32)(addr_t)idaws;
- + ccw->cda = idaws;
- ccw->flags |= CCW_FLAG_IDA;
- ccw->flags |= CCW_FLAG_SLI;
- ccw++;
- @@ -3640,7 +3640,7 @@ dasd_eckd_release(struct dasd_device *de
- ccw->cmd_code = DASD_ECKD_CCW_RELEASE;
- ccw->flags |= CCW_FLAG_SLI;
- ccw->count = 32;
- - ccw->cda = (__u32)(addr_t) cqr->data;
- + ccw->cda = cqr->data;
- cqr->startdev = device;
- cqr->memdev = device;
- clear_bit(DASD_CQR_FLAGS_USE_ERP, &cqr->flags);
- @@ -3695,7 +3695,7 @@ dasd_eckd_reserve(struct dasd_device *de
- ccw->cmd_code = DASD_ECKD_CCW_RESERVE;
- ccw->flags |= CCW_FLAG_SLI;
- ccw->count = 32;
- - ccw->cda = (__u32)(addr_t) cqr->data;
- + ccw->cda = cqr->data;
- cqr->startdev = device;
- cqr->memdev = device;
- clear_bit(DASD_CQR_FLAGS_USE_ERP, &cqr->flags);
- @@ -3749,7 +3749,7 @@ dasd_eckd_steal_lock(struct dasd_device
- ccw->cmd_code = DASD_ECKD_CCW_SLCK;
- ccw->flags |= CCW_FLAG_SLI;
- ccw->count = 32;
- - ccw->cda = (__u32)(addr_t) cqr->data;
- + ccw->cda = cqr->data;
- cqr->startdev = device;
- cqr->memdev = device;
- clear_bit(DASD_CQR_FLAGS_USE_ERP, &cqr->flags);
- @@ -3809,7 +3809,7 @@ static int dasd_eckd_snid(struct dasd_de
- ccw->cmd_code = DASD_ECKD_CCW_SNID;
- ccw->flags |= CCW_FLAG_SLI;
- ccw->count = 12;
- - ccw->cda = (__u32)(addr_t) cqr->data;
- + ccw->cda = cqr->data;
- cqr->startdev = device;
- cqr->memdev = device;
- clear_bit(DASD_CQR_FLAGS_USE_ERP, &cqr->flags);
- @@ -3876,7 +3876,7 @@ dasd_eckd_performance(struct dasd_device
- ccw->cmd_code = DASD_ECKD_CCW_PSF;
- ccw->count = sizeof(struct dasd_psf_prssd_data);
- ccw->flags |= CCW_FLAG_CC;
- - ccw->cda = (__u32)(addr_t) prssdp;
- + ccw->cda = prssdp;
- /* Read Subsystem Data - Performance Statistics */
- stats = (struct dasd_rssd_perf_stats_t *) (prssdp + 1);
- @@ -3885,7 +3885,7 @@ dasd_eckd_performance(struct dasd_device
- ccw++;
- ccw->cmd_code = DASD_ECKD_CCW_RSSD;
- ccw->count = sizeof(struct dasd_rssd_perf_stats_t);
- - ccw->cda = (__u32)(addr_t) stats;
- + ccw->cda = stats;
- cqr->buildclk = get_tod_clock();
- cqr->status = DASD_CQR_FILLED;
- @@ -4023,7 +4023,7 @@ static int dasd_symm_io(struct dasd_devi
- ccw->cmd_code = DASD_ECKD_CCW_PSF;
- ccw->count = usrparm.psf_data_len;
- ccw->flags |= CCW_FLAG_CC;
- - ccw->cda = (__u32)(addr_t) psf_data;
- + ccw->cda = psf_data;
- ccw++;
- @@ -4031,7 +4031,7 @@ static int dasd_symm_io(struct dasd_devi
- ccw->cmd_code = DASD_ECKD_CCW_RSSD;
- ccw->count = usrparm.rssd_result_len;
- ccw->flags = CCW_FLAG_SLI ;
- - ccw->cda = (__u32)(addr_t) rssd_result;
- + ccw->cda = rssd_result;
- rc = dasd_sleep_on(cqr);
- if (rc)
- @@ -4218,7 +4218,7 @@ static void dasd_eckd_dump_sense_ccw(str
- /* scsw->cda is either valid or zero */
- len = 0;
- from = ++to;
- - fail = (struct ccw1 *)(addr_t)
- + fail =
- irb->scsw.cmd.cpa; /* failing CCW */
- if (from < fail - 2) {
- from = fail - 2; /* there is a gap - print header */
- @@ -4549,7 +4549,7 @@ static int dasd_eckd_read_message_buffer
- ccw->count = sizeof(struct dasd_psf_prssd_data);
- ccw->flags |= CCW_FLAG_CC;
- ccw->flags |= CCW_FLAG_SLI;
- - ccw->cda = (__u32)(addr_t) prssdp;
- + ccw->cda = prssdp;
- /* Read Subsystem Data - message buffer */
- message_buf = (struct dasd_rssd_messages *) (prssdp + 1);
- @@ -4559,7 +4559,7 @@ static int dasd_eckd_read_message_buffer
- ccw->cmd_code = DASD_ECKD_CCW_RSSD;
- ccw->count = sizeof(struct dasd_rssd_messages);
- ccw->flags |= CCW_FLAG_SLI;
- - ccw->cda = (__u32)(addr_t) message_buf;
- + ccw->cda = message_buf;
- cqr->buildclk = get_tod_clock();
- cqr->status = DASD_CQR_FILLED;
- @@ -4613,7 +4613,7 @@ dasd_eckd_psf_cuir_response(struct dasd_
- ccw = cqr->cpaddr;
- ccw->cmd_code = DASD_ECKD_CCW_PSF;
- - ccw->cda = (__u32)(addr_t)psf_cuir;
- + ccw->cda = psf_cuir;
- ccw->count = sizeof(struct dasd_psf_cuir_response);
- cqr->startdev = device;
- diff -u -p a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
- --- a/drivers/mtd/mtdchar.c
- +++ b/drivers/mtd/mtdchar.c
- @@ -547,8 +547,8 @@ static int mtdchar_write_ioctl(struct mt
- if (copy_from_user(&req, argp, sizeof(req)))
- return -EFAULT;
- - usr_data = (const void __user *)(uintptr_t)req.usr_data;
- - usr_oob = (const void __user *)(uintptr_t)req.usr_oob;
- + usr_data = req.usr_data;
- + usr_oob = req.usr_oob;
- if (!access_ok(VERIFY_READ, usr_data, req.len) ||
- !access_ok(VERIFY_READ, usr_oob, req.ooblen))
- return -EFAULT;
- diff -u -p a/drivers/mtd/maps/gpio-addr-flash.c b/drivers/mtd/maps/gpio-addr-flash.c
- --- a/drivers/mtd/maps/gpio-addr-flash.c
- +++ b/drivers/mtd/maps/gpio-addr-flash.c
- @@ -226,7 +226,7 @@ static int gpio_flash_probe(struct platf
- * away their pointer types here to the known types (gpios->xxx).
- */
- state->gpio_count = gpios->end;
- - state->gpio_addrs = (void *)(unsigned long)gpios->start;
- + state->gpio_addrs = gpios->start;
- state->gpio_values = (void *)(state + 1);
- state->win_size = resource_size(memory);
- memset(state->gpio_values, 0xff, arr_size);
- diff -u -p a/drivers/infiniband/hw/amso1100/c2_cm.c b/drivers/infiniband/hw/amso1100/c2_cm.c
- --- a/drivers/infiniband/hw/amso1100/c2_cm.c
- +++ b/drivers/infiniband/hw/amso1100/c2_cm.c
- @@ -159,12 +159,12 @@ int c2_llp_service_create(struct iw_cm_i
- * Build the WR
- */
- c2_wr_set_id(&wr, CCWR_EP_LISTEN_CREATE);
- - wr.hdr.context = (u64) (unsigned long) vq_req;
- + wr.hdr.context = vq_req;
- wr.rnic_handle = c2dev->adapter_handle;
- wr.local_addr = laddr->sin_addr.s_addr;
- wr.local_port = laddr->sin_port;
- wr.backlog = cpu_to_be32(backlog);
- - wr.user_context = (u64) (unsigned long) cm_id;
- + wr.user_context = cm_id;
- /*
- * Reference the request struct. Dereferenced in the int handler.
- @@ -191,7 +191,7 @@ int c2_llp_service_create(struct iw_cm_i
- * Process reply
- */
- reply =
- - (struct c2wr_ep_listen_create_rep *) (unsigned long) vq_req->reply_msg;
- + vq_req->reply_msg;
- if (!reply) {
- err = -ENOMEM;
- goto bail1;
- @@ -203,7 +203,7 @@ int c2_llp_service_create(struct iw_cm_i
- /*
- * Keep the adapter handle. Used in subsequent destroy
- */
- - cm_id->provider_data = (void*)(unsigned long) reply->ep_handle;
- + cm_id->provider_data = reply->ep_handle;
- /*
- * free vq stuff
- @@ -247,7 +247,7 @@ int c2_llp_service_destroy(struct iw_cm_
- c2_wr_set_id(&wr, CCWR_EP_LISTEN_DESTROY);
- wr.hdr.context = (unsigned long) vq_req;
- wr.rnic_handle = c2dev->adapter_handle;
- - wr.ep_handle = (u32)(unsigned long)cm_id->provider_data;
- + wr.ep_handle = cm_id->provider_data;
- /*
- * reference the request struct. dereferenced in the int handler.
- @@ -273,7 +273,7 @@ int c2_llp_service_destroy(struct iw_cm_
- /*
- * Process reply
- */
- - reply=(struct c2wr_ep_listen_destroy_rep *)(unsigned long)vq_req->reply_msg;
- + reply=vq_req->reply_msg;
- if (!reply) {
- err = -ENOMEM;
- goto bail0;
- @@ -328,7 +328,7 @@ int c2_llp_accept(struct iw_cm_id *cm_id
- c2_wr_set_id(wr, CCWR_CR_ACCEPT);
- wr->hdr.context = (unsigned long) vq_req;
- wr->rnic_handle = c2dev->adapter_handle;
- - wr->ep_handle = (u32) (unsigned long) cm_id->provider_data;
- + wr->ep_handle = cm_id->provider_data;
- wr->qp_handle = qp->adapter_handle;
- /* Replace the cr_handle with the QP after accept */
- @@ -367,7 +367,7 @@ int c2_llp_accept(struct iw_cm_id *cm_id
- goto bail1;
- /* Check that reply is present */
- - reply = (struct c2wr_cr_accept_rep *) (unsigned long) vq_req->reply_msg;
- + reply = vq_req->reply_msg;
- if (!reply) {
- err = -ENOMEM;
- goto bail1;
- @@ -417,7 +417,7 @@ int c2_llp_reject(struct iw_cm_id *cm_id
- c2_wr_set_id(&wr, CCWR_CR_REJECT);
- wr.hdr.context = (unsigned long) vq_req;
- wr.rnic_handle = c2dev->adapter_handle;
- - wr.ep_handle = (u32) (unsigned long) cm_id->provider_data;
- + wr.ep_handle = cm_id->provider_data;
- /*
- * reference the request struct. dereferenced in the int handler.
- @@ -443,7 +443,7 @@ int c2_llp_reject(struct iw_cm_id *cm_id
- /*
- * Process reply
- */
- - reply = (struct c2wr_cr_reject_rep *) (unsigned long)
- + reply =
- vq_req->reply_msg;
- if (!reply) {
- err = -ENOMEM;
- diff -u -p a/drivers/infiniband/hw/amso1100/c2_cq.c b/drivers/infiniband/hw/amso1100/c2_cq.c
- --- a/drivers/infiniband/hw/amso1100/c2_cq.c
- +++ b/drivers/infiniband/hw/amso1100/c2_cq.c
- @@ -146,7 +146,7 @@ static inline int c2_poll_one(struct c2_
- * try pulling the next message
- */
- while ((qp =
- - (struct c2_qp *) (unsigned long) ce->qp_user_context) == NULL) {
- + ce->qp_user_context) == NULL) {
- c2_mq_free(&cq->mq);
- ce = c2_mq_consume(&cq->mq);
- if (!ce)
- @@ -325,7 +325,7 @@ int c2_init_cq(struct c2_dev *c2dev, int
- wr.depth = cpu_to_be32(cq->mq.q_size);
- wr.shared_ht = cpu_to_be64(cq->mq.shared_dma);
- wr.msg_pool = cpu_to_be64(cq->mq.host_dma);
- - wr.user_context = (u64) (unsigned long) (cq);
- + wr.user_context = (cq);
- vq_req_get(c2dev, vq_req);
- @@ -339,7 +339,7 @@ int c2_init_cq(struct c2_dev *c2dev, int
- if (err)
- goto bail2;
- - reply = (struct c2wr_cq_create_rep *) (unsigned long) (vq_req->reply_msg);
- + reply = (vq_req->reply_msg);
- if (!reply) {
- err = -ENOMEM;
- goto bail2;
- @@ -426,7 +426,7 @@ void c2_free_cq(struct c2_dev *c2dev, st
- if (err)
- goto bail1;
- - reply = (struct c2wr_cq_destroy_rep *) (unsigned long) (vq_req->reply_msg);
- + reply = (vq_req->reply_msg);
- if (reply)
- vq_repbuf_free(c2dev, reply);
- bail1:
- diff -u -p a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
- --- a/drivers/infiniband/hw/nes/nes_cm.c
- +++ b/drivers/infiniband/hw/nes/nes_cm.c
- @@ -3281,7 +3281,7 @@ int nes_accept(struct iw_cm_id *cm_id, s
- nespd = nesqp->nespd;
- ibphysbuf.addr = nesqp->ietf_frame_pbase + mpa_frame_offset;
- ibphysbuf.size = buff_len;
- - tagged_offset = (u64)(unsigned long)*start_buff;
- + tagged_offset = *start_buff;
- ibmr = nesibdev->ibdev.reg_phys_mr((struct ib_pd *)nespd,
- &ibphysbuf, 1,
- IB_ACCESS_LOCAL_WRITE,
- diff -u -p a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
- --- a/drivers/infiniband/core/cm.c
- +++ b/drivers/infiniband/core/cm.c
- @@ -1166,7 +1166,7 @@ int ib_send_cm_req(struct ib_cm_id *cm_i
- cm_format_req(req_msg, cm_id_priv, param);
- cm_id_priv->tid = req_msg->hdr.tid;
- cm_id_priv->msg->timeout_ms = cm_id_priv->timeout_ms;
- - cm_id_priv->msg->context[1] = (void *) (unsigned long) IB_CM_REQ_SENT;
- + cm_id_priv->msg->context[1] = IB_CM_REQ_SENT;
- cm_id_priv->local_qpn = cm_req_get_local_qpn(req_msg);
- cm_id_priv->rq_psn = cm_req_get_starting_psn(req_msg);
- @@ -1666,7 +1666,7 @@ int ib_send_cm_rep(struct ib_cm_id *cm_i
- rep_msg = (struct cm_rep_msg *) msg->mad;
- cm_format_rep(rep_msg, cm_id_priv, param);
- msg->timeout_ms = cm_id_priv->timeout_ms;
- - msg->context[1] = (void *) (unsigned long) IB_CM_REP_SENT;
- + msg->context[1] = IB_CM_REP_SENT;
- ret = ib_post_send_mad(msg, NULL);
- if (ret) {
- @@ -2021,7 +2021,7 @@ int ib_send_cm_dreq(struct ib_cm_id *cm_
- cm_format_dreq((struct cm_dreq_msg *) msg->mad, cm_id_priv,
- private_data, private_data_len);
- msg->timeout_ms = cm_id_priv->timeout_ms;
- - msg->context[1] = (void *) (unsigned long) IB_CM_DREQ_SENT;
- + msg->context[1] = IB_CM_DREQ_SENT;
- ret = ib_post_send_mad(msg, NULL);
- if (ret) {
- @@ -2557,7 +2557,7 @@ static int cm_mra_handler(struct cm_work
- goto out;
- }
- - cm_id_priv->msg->context[1] = (void *) (unsigned long)
- + cm_id_priv->msg->context[1] =
- cm_id_priv->id.state;
- ret = atomic_inc_and_test(&cm_id_priv->work_count);
- if (!ret)
- @@ -2642,7 +2642,7 @@ int ib_send_cm_lap(struct ib_cm_id *cm_i
- cm_format_lap((struct cm_lap_msg *) msg->mad, cm_id_priv,
- alternate_path, private_data, private_data_len);
- msg->timeout_ms = cm_id_priv->timeout_ms;
- - msg->context[1] = (void *) (unsigned long) IB_CM_ESTABLISHED;
- + msg->context[1] = IB_CM_ESTABLISHED;
- ret = ib_post_send_mad(msg, NULL);
- if (ret) {
- @@ -2947,7 +2947,7 @@ int ib_send_cm_sidr_req(struct ib_cm_id
- cm_format_sidr_req((struct cm_sidr_req_msg *) msg->mad, cm_id_priv,
- param);
- msg->timeout_ms = cm_id_priv->timeout_ms;
- - msg->context[1] = (void *) (unsigned long) IB_CM_SIDR_REQ_SENT;
- + msg->context[1] = IB_CM_SIDR_REQ_SENT;
- spin_lock_irqsave(&cm_id_priv->lock, flags);
- if (cm_id->state == IB_CM_IDLE)
- @@ -3165,7 +3165,7 @@ static void cm_process_send_error(struct
- /* Discard old sends or ones without a response. */
- spin_lock_irq(&cm_id_priv->lock);
- - state = (enum ib_cm_state) (unsigned long) msg->context[1];
- + state = msg->context[1];
- if (msg != cm_id_priv->msg || state != cm_id_priv->id.state)
- goto discard;
- diff -u -p a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
- --- a/drivers/infiniband/ulp/srp/ib_srp.c
- +++ b/drivers/infiniband/ulp/srp/ib_srp.c
- @@ -1852,7 +1852,7 @@ static void srp_handle_recv(struct srp_r
- {
- struct srp_target_port *target = ch->target;
- struct ib_device *dev = target->srp_host->srp_dev->dev;
- - struct srp_iu *iu = (struct srp_iu *) (uintptr_t) wc->wr_id;
- + struct srp_iu *iu = wc->wr_id;
- int res;
- u8 opcode;
- @@ -1971,7 +1971,7 @@ static void srp_send_completion(struct i
- while (ib_poll_cq(cq, 1, &wc) > 0) {
- if (likely(wc.status == IB_WC_SUCCESS)) {
- - iu = (struct srp_iu *) (uintptr_t) wc.wr_id;
- + iu = wc.wr_id;
- list_add(&iu->list, &ch->free_tx);
- } else {
- srp_handle_qp_err(wc.wr_id, wc.status, true, ch);
- diff -u -p a/drivers/isdn/sc/interrupt.c b/drivers/isdn/sc/interrupt.c
- --- a/drivers/isdn/sc/interrupt.c
- +++ b/drivers/isdn/sc/interrupt.c
- @@ -29,7 +29,7 @@ irqreturn_t interrupt_handler(int dummy,
- RspMessage rcvmsg;
- int channel;
- - int card = (int)(unsigned long) card_inst;
- + int card = card_inst;
- if (!IS_VALID_CARD(card)) {
- pr_debug("Invalid param: %d is not a valid card id\n", card);
- diff -u -p a/drivers/isdn/mISDN/layer2.c b/drivers/isdn/mISDN/layer2.c
- --- a/drivers/isdn/mISDN/layer2.c
- +++ b/drivers/isdn/mISDN/layer2.c
- @@ -1356,7 +1356,7 @@ l2_got_tei(struct FsmInst *fi, int event
- struct layer2 *l2 = fi->userdata;
- u_int info;
- - l2->tei = (signed char)(long)arg;
- + l2->tei = arg;
- set_channel_address(&l2->ch, l2->sapi, l2->tei);
- info = DL_INFO_L2_CONNECT;
- l2up_create(l2, DL_INFORMATION_IND, sizeof(info), &info);
- diff -u -p a/drivers/isdn/hisax/hfc_pci.c b/drivers/isdn/hisax/hfc_pci.c
- --- a/drivers/isdn/hisax/hfc_pci.c
- +++ b/drivers/isdn/hisax/hfc_pci.c
- @@ -1693,7 +1693,7 @@ setup_hfcpci(struct IsdnCard *card)
- printk(KERN_WARNING "HFC-PCI: No IRQ for PCI card found\n");
- return (0);
- }
- - cs->hw.hfcpci.pci_io = (char *)(unsigned long)dev_hfcpci->resource[1].start;
- + cs->hw.hfcpci.pci_io = dev_hfcpci->resource[1].start;
- printk(KERN_INFO "HiSax: HFC-PCI card manufacturer: %s card name: %s\n", id_list[i].vendor_name, id_list[i].card_name);
- if (!cs->hw.hfcpci.pci_io) {
- diff -u -p a/drivers/media/common/saa7146/saa7146_hlp.c b/drivers/media/common/saa7146/saa7146_hlp.c
- --- a/drivers/media/common/saa7146/saa7146_hlp.c
- +++ b/drivers/media/common/saa7146/saa7146_hlp.c
- @@ -573,7 +573,7 @@ static void saa7146_set_position(struct
- FIXME: might not work on some 64-bit platforms, but see the FIXME
- in struct v4l2_framebuffer (videodev2.h) for that.
- */
- - u32 base = (u32)(unsigned long)vv->ov_fb.base;
- + u32 base = vv->ov_fb.base;
- struct saa7146_video_dma vdma1;
- diff -u -p a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c
- --- a/drivers/scsi/megaraid/megaraid_mbox.c
- +++ b/drivers/scsi/megaraid/megaraid_mbox.c
- @@ -3658,7 +3658,7 @@ megaraid_mbox_mm_command(adapter_t *adap
- scb->dma_direction = PCI_DMA_NONE;
- ccb = (mbox_ccb_t *)scb->ccb;
- - mbox64 = (mbox64_t *)(unsigned long)kioc->cmdbuf;
- + mbox64 = kioc->cmdbuf;
- raw_mbox = (uint8_t *)&mbox64->mbox32;
- memcpy(ccb->mbox64, mbox64, sizeof(mbox64_t));
- @@ -3758,7 +3758,7 @@ megaraid_mbox_mm_done(adapter_t *adapter
- unsigned long flags;
- kioc = (uioc_t *)scb->gp;
- - mbox64 = (mbox64_t *)(unsigned long)kioc->cmdbuf;
- + mbox64 = kioc->cmdbuf;
- mbox64->mbox32.status = scb->status;
- raw_mbox = (uint8_t *)&mbox64->mbox32;
- @@ -3973,7 +3973,7 @@ megaraid_sysfs_get_ldmap(adapter_t *adap
- mbox = &mbox64->mbox32;
- raw_mbox = (char *)mbox;
- - uioc->cmdbuf = (uint64_t)(unsigned long)mbox64;
- + uioc->cmdbuf = mbox64;
- uioc->buf_vaddr = (caddr_t)adapter;
- uioc->status = -ENODATA;
- uioc->done = megaraid_sysfs_get_ldmap_done;
- diff -u -p a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c
- --- a/drivers/scsi/aacraid/commctrl.c
- +++ b/drivers/scsi/aacraid/commctrl.c
- @@ -615,7 +615,7 @@ static int aac_send_raw_srb(struct aac_d
- }
- addr = (u64)upsg->sg[i].addr[0];
- addr += ((u64)upsg->sg[i].addr[1]) << 32;
- - sg_user[i] = (void __user *)(uintptr_t)addr;
- + sg_user[i] = addr;
- sg_list[i] = p; // save so we can clean up later
- sg_indx = i;
- @@ -667,7 +667,7 @@ static int aac_send_raw_srb(struct aac_d
- rcode = -ENOMEM;
- goto cleanup;
- }
- - sg_user[i] = (void __user *)(uintptr_t)usg->sg[i].addr;
- + sg_user[i] = usg->sg[i].addr;
- sg_list[i] = p; // save so we can clean up later
- sg_indx = i;
- @@ -754,7 +754,7 @@ static int aac_send_raw_srb(struct aac_d
- rcode = -ENOMEM;
- goto cleanup;
- }
- - sg_user[i] = (void __user *)(uintptr_t)upsg->sg[i].addr;
- + sg_user[i] = upsg->sg[i].addr;
- sg_list[i] = p; // save so we can clean up later
- sg_indx = i;
- diff -u -p a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c
- --- a/drivers/scsi/fnic/fnic_scsi.c
- +++ b/drivers/scsi/fnic/fnic_scsi.c
- @@ -755,7 +755,7 @@ static inline void fnic_fcpio_ack_handle
- struct vnic_wq_copy *wq;
- u16 request_out = desc->u.ack.request_out;
- unsigned long flags;
- - u64 *ox_id_tag = (u64 *)(void *)desc;
- + u64 *ox_id_tag = desc;
- /* mark the ack state */
- wq = &fnic->wq_copy[cq_index - fnic->raw_wq_count - fnic->rq_count];
- diff -u -p a/drivers/scsi/bfa/bfad_bsg.c b/drivers/scsi/bfa/bfad_bsg.c
- --- a/drivers/scsi/bfa/bfad_bsg.c
- +++ b/drivers/scsi/bfa/bfad_bsg.c
- @@ -3198,7 +3198,7 @@ bfad_fcxp_get_req_sgaddr_cb(void *bfad_f
- u64 addr;
- sge = drv_fcxp->req_sge + sgeid;
- - addr = (u64)(size_t) sge->sg_addr;
- + addr = sge->sg_addr;
- return addr;
- }
- @@ -3220,7 +3220,7 @@ bfad_fcxp_get_rsp_sgaddr_cb(void *bfad_f
- u64 addr;
- sge = drv_fcxp->rsp_sge + sgeid;
- - addr = (u64)(size_t) sge->sg_addr;
- + addr = sge->sg_addr;
- return addr;
- }
- @@ -3281,7 +3281,7 @@ bfad_fcxp_map_sg(struct bfad_s *bfad, vo
- * Setup SG table
- */
- sg_table->sg_len = buf_info->size;
- - sg_table->sg_addr = (void *)(size_t) buf_info->phys;
- + sg_table->sg_addr = buf_info->phys;
- *num_sgles = sge_num;
- diff -u -p a/drivers/scsi/qla4xxx/ql4_iocb.c b/drivers/scsi/qla4xxx/ql4_iocb.c
- --- a/drivers/scsi/qla4xxx/ql4_iocb.c
- +++ b/drivers/scsi/qla4xxx/ql4_iocb.c
- @@ -356,7 +356,7 @@ int qla4xxx_send_command_to_isp(struct s
- qla4xxx_build_scsi_iocbs(srb, cmd_entry, tot_dsds);
- wmb();
- - srb->cmd->host_scribble = (unsigned char *)(unsigned long)index;
- + srb->cmd->host_scribble = index;
- /* update counters */
- srb->state = SRB_ACTIVE_STATE;
- diff -u -p a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
- --- a/drivers/scsi/storvsc_drv.c
- +++ b/drivers/scsi/storvsc_drv.c
- @@ -1231,8 +1231,7 @@ static void storvsc_on_channel_callback(
- &bytes_recvd, &request_id);
- if (ret == 0 && bytes_recvd > 0) {
- - request = (struct storvsc_cmd_request *)
- - (unsigned long)request_id;
- + request =request_id;
- if ((request == &stor_device->init_request) ||
- (request == &stor_device->reset_request)) {
- diff -u -p a/drivers/scsi/fcoe/fcoe_transport.c b/drivers/scsi/fcoe/fcoe_transport.c
- --- a/drivers/scsi/fcoe/fcoe_transport.c
- +++ b/drivers/scsi/fcoe/fcoe_transport.c
- @@ -847,7 +847,7 @@ static int fcoe_transport_create(const c
- int rc = -ENODEV;
- struct net_device *netdev = NULL;
- struct fcoe_transport *ft = NULL;
- - enum fip_state fip_mode = (enum fip_state)(long)kp->arg;
- + enum fip_state fip_mode = kp->arg;
- mutex_lock(&ft_mutex);
- diff -u -p a/drivers/firmware/efi/libstub/arm-stub.c b/drivers/firmware/efi/libstub/arm-stub.c
- --- a/drivers/firmware/efi/libstub/arm-stub.c
- +++ b/drivers/firmware/efi/libstub/arm-stub.c
- @@ -49,7 +49,7 @@ efi_status_t efi_open_volume(efi_system_
- efi_file_handle_t *fh;
- efi_guid_t fs_proto = EFI_FILE_SYSTEM_GUID;
- efi_status_t status;
- - void *handle = (void *)(unsigned long)image->device_handle;
- + void *handle = image->device_handle;
- status = sys_table_arg->boottime->handle_protocol(handle,
- &fs_proto, (void **)&io);
- diff -u -p a/arch/arm/kvm/coproc.c b/arch/arm/kvm/coproc.c
- --- a/arch/arm/kvm/coproc.c
- +++ b/arch/arm/kvm/coproc.c
- @@ -1010,7 +1010,7 @@ static int vfp_set_reg(struct kvm_vcpu *
- int kvm_arm_coproc_get_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)
- {
- const struct coproc_reg *r;
- - void __user *uaddr = (void __user *)(long)reg->addr;
- + void __user *uaddr = reg->addr;
- int ret;
- if ((reg->id & KVM_REG_ARM_COPROC_MASK) == KVM_REG_ARM_DEMUX)
- @@ -1039,7 +1039,7 @@ int kvm_arm_coproc_get_reg(struct kvm_vc
- int kvm_arm_coproc_set_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)
- {
- const struct coproc_reg *r;
- - void __user *uaddr = (void __user *)(long)reg->addr;
- + void __user *uaddr = reg->addr;
- int ret;
- if ((reg->id & KVM_REG_ARM_COPROC_MASK) == KVM_REG_ARM_DEMUX)
- diff -u -p a/arch/sparc/kernel/jump_label.c b/arch/sparc/kernel/jump_label.c
- --- a/arch/sparc/kernel/jump_label.c
- +++ b/arch/sparc/kernel/jump_label.c
- @@ -14,7 +14,7 @@ void arch_jump_label_transform(struct ju
- enum jump_label_type type)
- {
- u32 val;
- - u32 *insn = (u32 *) (unsigned long) entry->code;
- + u32 *insn = entry->code;
- if (type == JUMP_LABEL_ENABLE) {
- s32 off = (s32)entry->target - (s32)entry->code;
- diff -u -p a/arch/s390/hypfs/hypfs_sprp.c b/arch/s390/hypfs/hypfs_sprp.c
- --- a/arch/s390/hypfs/hypfs_sprp.c
- +++ b/arch/s390/hypfs/hypfs_sprp.c
- @@ -76,7 +76,7 @@ static int __hypfs_sprp_ioctl(void __use
- if (!data)
- return -ENOMEM;
- - udata = (void __user *)(unsigned long) diag304.data;
- + udata = diag304.data;
- if (diag304.args[1] == DIAG304_SET_WEIGHTS ||
- diag304.args[1] == DIAG304_SET_CAPPING)
- if (copy_from_user(data, udata, PAGE_SIZE)) {
- diff -u -p a/arch/s390/kernel/compat_signal.c b/arch/s390/kernel/compat_signal.c
- --- a/arch/s390/kernel/compat_signal.c
- +++ b/arch/s390/kernel/compat_signal.c
- @@ -408,7 +408,7 @@ static int setup_frame32(struct ksignal
- /* Create struct sigcontext32 on the signal stack */
- memcpy(&sc.oldmask, &set->sig, _SIGMASK_COPY_SIZE32);
- - sc.sregs = (__u32)(unsigned long __force) &frame->sregs;
- + sc.sregs = &frame->sregs;
- if (__copy_to_user(&frame->sc, &sc, sizeof(frame->sc)))
- return -EFAULT;
- diff -u -p a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
- --- a/arch/s390/kernel/smp.c
- +++ b/arch/s390/kernel/smp.c
- @@ -939,7 +939,7 @@ void __init smp_prepare_boot_cpu(void)
- pcpu->state = CPU_STATE_CONFIGURED;
- pcpu->address = stap();
- - pcpu->lowcore = (struct _lowcore *)(unsigned long) store_prefix();
- + pcpu->lowcore = store_prefix();
- S390_lowcore.percpu_offset = __per_cpu_offset[0];
- smp_cpu_set_polarization(0, POLARIZATION_UNKNOWN);
- set_cpu_present(0, true);
- @@ -1078,7 +1078,7 @@ static struct attribute_group cpu_online
- static int smp_cpu_notify(struct notifier_block *self, unsigned long action,
- void *hcpu)
- {
- - unsigned int cpu = (unsigned int)(long)hcpu;
- + unsigned int cpu = hcpu;
- struct device *s = &per_cpu(cpu_device, cpu)->dev;
- int err = 0;
- diff -u -p a/arch/mips/netlogic/xlr/platform.c b/arch/mips/netlogic/xlr/platform.c
- --- a/arch/mips/netlogic/xlr/platform.c
- +++ b/arch/mips/netlogic/xlr/platform.c
- @@ -29,7 +29,7 @@ static unsigned int nlm_xlr_uart_in(stru
- unsigned int value;
- /* sign extend to 64 bits, if needed */
- - uartbase = (uint64_t)(long)p->membase;
- + uartbase = p->membase;
- value = nlm_read_reg(uartbase, offset);
- /* See XLR/XLS errata */
- @@ -46,7 +46,7 @@ static void nlm_xlr_uart_out(struct uart
- uint64_t uartbase;
- /* sign extend to 64 bits, if needed */
- - uartbase = (uint64_t)(long)p->membase;
- + uartbase = p->membase;
- /* See XLR/XLS errata */
- if (offset == UART_MSR)
- diff -u -p a/arch/mips/cavium-octeon/smp.c b/arch/mips/cavium-octeon/smp.c
- --- a/arch/mips/cavium-octeon/smp.c
- +++ b/arch/mips/cavium-octeon/smp.c
- @@ -337,7 +337,7 @@ static int octeon_update_boot_vector(uns
- }
- boot_vect[coreid].app_start_func_addr =
- - (uint32_t) (unsigned long) start_after_reset;
- + start_after_reset;
- boot_vect[coreid].code_addr = octeon_bootloader_entry_addr;
- mb();
- diff -u -p a/arch/arm64/kernel/signal32.c b/arch/arm64/kernel/signal32.c
- --- a/arch/arm64/kernel/signal32.c
- +++ b/arch/arm64/kernel/signal32.c
- @@ -544,8 +544,8 @@ int compat_setup_rt_frame(int usig, stru
- if (err == 0) {
- compat_setup_return(regs, &ksig->ka, frame->sig.retcode, frame, usig);
- - regs->regs[1] = (compat_ulong_t)(unsigned long)&frame->info;
- - regs->regs[2] = (compat_ulong_t)(unsigned long)&frame->sig.uc;
- + regs->regs[1] = &frame->info;
- + regs->regs[2] = &frame->sig.uc;
- }
- return err;
- diff -u -p a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
- --- a/arch/x86/kernel/tboot.c
- +++ b/arch/x86/kernel/tboot.c
- @@ -243,7 +243,7 @@ void tboot_shutdown(u32 shutdown_type)
- switch_to_tboot_pt();
- - shutdown = (void(*)(void))(unsigned long)tboot->shutdown_entry;
- + shutdown = tboot->shutdown_entry;
- shutdown();
- /* should not reach here */
- diff -u -p a/arch/x86/boot/compressed/aslr.c b/arch/x86/boot/compressed/aslr.c
- --- a/arch/x86/boot/compressed/aslr.c
- +++ b/arch/x86/boot/compressed/aslr.c
- @@ -163,7 +163,7 @@ static void mem_avoid_init(unsigned long
- cmd_line = (u64)real_mode->ext_cmd_line_ptr << 32;
- cmd_line |= real_mode->hdr.cmd_line_ptr;
- /* Calculate size of cmd_line. */
- - ptr = (char *)(unsigned long)cmd_line;
- + ptr = cmd_line;
- for (cmd_line_size = 0; ptr[cmd_line_size++]; )
- ;
- mem_avoid[2].start = cmd_line;
- @@ -190,7 +190,7 @@ static bool mem_avoid_overlap(struct mem
- }
- /* Avoid all entries in the setup_data linked list. */
- - ptr = (struct setup_data *)(unsigned long)real_mode->hdr.setup_data;
- + ptr = real_mode->hdr.setup_data;
- while (ptr) {
- struct mem_vector avoid;
- @@ -200,7 +200,7 @@ static bool mem_avoid_overlap(struct mem
- if (mem_overlaps(img, &avoid))
- return true;
- - ptr = (struct setup_data *)(unsigned long)ptr->next;
- + ptr = ptr->next;
- }
- return false;
- diff -u -p a/arch/sh/kernel/signal_64.c b/arch/sh/kernel/signal_64.c
- --- a/arch/sh/kernel/signal_64.c
- +++ b/arch/sh/kernel/signal_64.c
- @@ -255,7 +255,7 @@ asmlinkage int sys_sigreturn(unsigned lo
- unsigned long r6, unsigned long r7,
- struct pt_regs * regs)
- {
- - struct sigframe __user *frame = (struct sigframe __user *) (long) REF_REG_SP;
- + struct sigframe __user *frame = REF_REG_SP;
- sigset_t set;
- long long ret;
- @@ -289,7 +289,7 @@ asmlinkage int sys_rt_sigreturn(unsigned
- unsigned long r6, unsigned long r7,
- struct pt_regs * regs)
- {
- - struct rt_sigframe __user *frame = (struct rt_sigframe __user *) (long) REF_REG_SP;
- + struct rt_sigframe __user *frame = REF_REG_SP;
- sigset_t set;
- long long ret;
- @@ -452,8 +452,8 @@ static int setup_frame(struct ksignal *k
- through both 2nd and 3rd arguments.
- */
- - regs->regs[REG_ARG2] = (unsigned long long)(unsigned long)(signed long)&frame->sc;
- - regs->regs[REG_ARG3] = (unsigned long long)(unsigned long)(signed long)&frame->sc;
- + regs->regs[REG_ARG2] = (signed long)&frame->sc;
- + regs->regs[REG_ARG3] = (signed long)&frame->sc;
- regs->pc = neff_sign_extend((unsigned long)ksig->ka.sa.sa_handler);
- @@ -543,8 +543,8 @@ static int setup_rt_frame(struct ksignal
- */
- regs->regs[REG_SP] = neff_sign_extend((unsigned long)frame);
- regs->regs[REG_ARG1] = signal; /* Arg for signal handler */
- - regs->regs[REG_ARG2] = (unsigned long long)(unsigned long)(signed long)&frame->info;
- - regs->regs[REG_ARG3] = (unsigned long long)(unsigned long)(signed long)&frame->uc.uc_mcontext;
- + regs->regs[REG_ARG2] = (signed long)&frame->info;
- + regs->regs[REG_ARG3] = (signed long)&frame->uc.uc_mcontext;
- regs->pc = neff_sign_extend((unsigned long)ksig->ka.sa.sa_handler);
- set_fs(USER_DS);
- diff -u -p a/arch/sh/kernel/traps_64.c b/arch/sh/kernel/traps_64.c
- --- a/arch/sh/kernel/traps_64.c
- +++ b/arch/sh/kernel/traps_64.c
- @@ -138,13 +138,13 @@ static void misaligned_kernel_word_load(
- {
- unsigned short x;
- unsigned char *p, *q;
- - p = (unsigned char *) (int) address;
- + p = address;
- q = (unsigned char *) &x;
- q[0] = p[0];
- q[1] = p[1];
- if (do_sign_extend) {
- - *result = (__u64)(__s64) *(short *) &x;
- + *result = *(short *) &x;
- } else {
- *result = (__u64) x;
- }
- @@ -154,7 +154,7 @@ static void misaligned_kernel_word_store
- {
- unsigned short x;
- unsigned char *p, *q;
- - p = (unsigned char *) (int) address;
- + p = address;
- q = (unsigned char *) &x;
- x = (__u16) value;
- @@ -192,13 +192,13 @@ static int misaligned_load(struct pt_reg
- switch (width_shift) {
- case 1:
- if (do_sign_extend) {
- - regs->regs[destreg] = (__u64)(__s64) *(__s16 *) &buffer;
- + regs->regs[destreg] = *(__s16 *) &buffer;
- } else {
- regs->regs[destreg] = (__u64) *(__u16 *) &buffer;
- }
- break;
- case 2:
- - regs->regs[destreg] = (__u64)(__s64) *(__s32 *) &buffer;
- + regs->regs[destreg] = *(__s32 *) &buffer;
- break;
- case 3:
- regs->regs[destreg] = buffer;
- diff -u -p a/net/sunrpc/xprtrdma/rpc_rdma.c b/net/sunrpc/xprtrdma/rpc_rdma.c
- --- a/net/sunrpc/xprtrdma/rpc_rdma.c
- +++ b/net/sunrpc/xprtrdma/rpc_rdma.c
- @@ -100,7 +100,7 @@ rpcrdma_convert_iovs(struct xdr_buf *xdr
- return -ENOMEM;
- }
- seg[n].mr_page = ppages[p];
- - seg[n].mr_offset = (void *)(unsigned long) page_base;
- + seg[n].mr_offset = page_base;
- seg[n].mr_len = min_t(u32, PAGE_SIZE - page_base, len);
- if (seg[n].mr_len > PAGE_SIZE)
- return -EIO;
- diff -u -p a/net/tipc/socket.c b/net/tipc/socket.c
- --- a/net/tipc/socket.c
- +++ b/net/tipc/socket.c
- @@ -1492,7 +1492,7 @@ restart:
- /* Capture message data (if valid) & compute return value (always) */
- if (!err) {
- - u32 offset = (u32)(unsigned long)(TIPC_SKB_CB(buf)->handle);
- + u32 offset = (TIPC_SKB_CB(buf)->handle);
- sz -= offset;
- needed = (buf_len - sz_copied);
- @@ -1508,7 +1508,7 @@ restart:
- if (sz_to_copy < sz) {
- if (!(flags & MSG_PEEK))
- TIPC_SKB_CB(buf)->handle =
- - (void *)(unsigned long)(offset + sz_to_copy);
- + (offset + sz_to_copy);
- goto exit;
- }
- } else {
- diff -u -p a/net/core/netclassid_cgroup.c b/net/core/netclassid_cgroup.c
- --- a/net/core/netclassid_cgroup.c
- +++ b/net/core/netclassid_cgroup.c
- @@ -61,7 +61,7 @@ static int update_classid(const void *v,
- struct socket *sock = sock_from_file(file, &err);
- if (sock)
- - sock->sk->sk_classid = (u32)(unsigned long)v;
- + sock->sk->sk_classid = v;
- return 0;
- }
- @@ -70,7 +70,7 @@ static void cgrp_attach(struct cgroup_su
- struct cgroup_taskset *tset)
- {
- struct cgroup_cls_state *cs = css_cls_state(css);
- - void *v = (void *)(unsigned long)cs->classid;
- + void *v = cs->classid;
- struct task_struct *p;
- cgroup_taskset_for_each(p, tset) {
- diff -u -p a/net/can/proc.c b/net/can/proc.c
- --- a/net/can/proc.c
- +++ b/net/can/proc.c
- @@ -351,7 +351,7 @@ static inline void can_rcvlist_proc_show
- static int can_rcvlist_proc_show(struct seq_file *m, void *v)
- {
- /* double cast to prevent GCC warning */
- - int idx = (int)(long)m->private;
- + int idx = m->private;
- struct net_device *dev;
- struct dev_rcv_lists *d;
- diff -u -p a/security/keys/big_key.c b/security/keys/big_key.c
- --- a/security/keys/big_key.c
- +++ b/security/keys/big_key.c
- @@ -60,7 +60,7 @@ int big_key_preparse(struct key_preparse
- /* Set an arbitrary quota */
- prep->quotalen = 16;
- - prep->type_data[1] = (void *)(unsigned long)datalen;
- + prep->type_data[1] = datalen;
- if (datalen > BIG_KEY_FILE_THRESHOLD) {
- /* Create a shmem file to store the data in. This will permit the data
- diff -u -p a/fs/dlm/plock.c b/fs/dlm/plock.c
- --- a/fs/dlm/plock.c
- +++ b/fs/dlm/plock.c
- @@ -95,7 +95,7 @@ static void do_unlock_close(struct dlm_l
- if (fl->fl_lmops && fl->fl_lmops->lm_grant)
- op->info.owner = (__u64) fl->fl_pid;
- else
- - op->info.owner = (__u64)(long) fl->fl_owner;
- + op->info.owner = fl->fl_owner;
- op->info.flags |= DLM_PLOCK_FL_CLOSE;
- send_op(op);
- @@ -138,7 +138,7 @@ int dlm_posix_lock(dlm_lockspace_t *lock
- xop->fl = fl;
- xop->file = file;
- } else {
- - op->info.owner = (__u64)(long) fl->fl_owner;
- + op->info.owner = fl->fl_owner;
- xop->callback = NULL;
- }
- @@ -281,7 +281,7 @@ int dlm_posix_unlock(dlm_lockspace_t *lo
- if (fl->fl_lmops && fl->fl_lmops->lm_grant)
- op->info.owner = (__u64) fl->fl_pid;
- else
- - op->info.owner = (__u64)(long) fl->fl_owner;
- + op->info.owner = fl->fl_owner;
- if (fl->fl_flags & FL_CLOSE) {
- op->info.flags |= DLM_PLOCK_FL_CLOSE;
- @@ -342,7 +342,7 @@ int dlm_posix_get(dlm_lockspace_t *locks
- if (fl->fl_lmops && fl->fl_lmops->lm_grant)
- op->info.owner = (__u64) fl->fl_pid;
- else
- - op->info.owner = (__u64)(long) fl->fl_owner;
- + op->info.owner = fl->fl_owner;
- send_op(op);
- wait_event(recv_wq, (op->done != 0));
- diff -u -p a/fs/affs/dir.c b/fs/affs/dir.c
- --- a/fs/affs/dir.c
- +++ b/fs/affs/dir.c
- @@ -78,7 +78,7 @@ affs_readdir(struct file *file, struct d
- /* If the directory hasn't changed since the last call to readdir(),
- * we can jump directly to where we left off.
- */
- - ino = (u32)(long)file->private_data;
- + ino = file->private_data;
- if (ino && file->f_version == inode->i_version) {
- pr_debug("readdir() left off=%d\n", ino);
- goto inside;
- @@ -130,7 +130,7 @@ inside:
- }
- done:
- file->f_version = inode->i_version;
- - file->private_data = (void *)(long)ino;
- + file->private_data = ino;
- affs_brelse(fh_bh);
- out_brelse_dir:
- diff -u -p a/fs/nilfs2/ioctl.c b/fs/nilfs2/ioctl.c
- --- a/fs/nilfs2/ioctl.c
- +++ b/fs/nilfs2/ioctl.c
- @@ -64,7 +64,7 @@ static int nilfs_ioctl_wrap_copy(struct
- void *, size_t, size_t))
- {
- void *buf;
- - void __user *base = (void __user *)(unsigned long)argv->v_base;
- + void __user *base = argv->v_base;
- size_t maxmembs, total, n;
- ssize_t nr;
- int ret, i;
- @@ -932,7 +932,7 @@ static int nilfs_ioctl_clean_segments(st
- goto out_free;
- len = argv[n].v_size * argv[n].v_nmembs;
- - base = (void __user *)(unsigned long)argv[n].v_base;
- + base = argv[n].v_base;
- if (len == 0) {
- kbufs[n] = NULL;
- continue;
- @@ -1265,7 +1265,7 @@ static int nilfs_ioctl_set_suinfo(struct
- goto out;
- }
- - base = (void __user *)(unsigned long)argv.v_base;
- + base = argv.v_base;
- kbuf = vmalloc(len);
- if (!kbuf) {
- ret = -ENOMEM;
- diff -u -p a/fs/btrfs/backref.c b/fs/btrfs/backref.c
- --- a/fs/btrfs/backref.c
- +++ b/fs/btrfs/backref.c
- @@ -441,8 +441,7 @@ static int __resolve_indirect_refs(struc
- }
- memcpy(new_ref, ref, sizeof(*ref));
- new_ref->parent = node->val;
- - new_ref->inode_list = (struct extent_inode_elem *)
- - (uintptr_t)node->aux;
- + new_ref->inode_list =node->aux;
- list_add(&new_ref->list, &ref->list);
- }
- ulist_reinit(parents);
- @@ -1096,7 +1095,7 @@ static void free_leaf_list(struct ulist
- while ((node = ulist_next(blocks, &uiter))) {
- if (!node->aux)
- continue;
- - eie = (struct extent_inode_elem *)(uintptr_t)node->aux;
- + eie = node->aux;
- free_inode_elem_list(eie);
- node->aux = 0;
- }
- @@ -1871,7 +1870,7 @@ static int inode_to_path(u64 inum, u32 n
- return PTR_ERR(fspath);
- if (fspath > fspath_min) {
- - ipath->fspath->val[i] = (u64)(unsigned long)fspath;
- + ipath->fspath->val[i] = fspath;
- ++ipath->fspath->elem_cnt;
- ipath->fspath->bytes_left = fspath - fspath_min;
- } else {
- diff -u -p a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c
- --- a/fs/hfsplus/dir.c
- +++ b/fs/hfsplus/dir.c
- @@ -22,7 +22,7 @@
- static inline void hfsplus_instantiate(struct dentry *dentry,
- struct inode *inode, u32 cnid)
- {
- - dentry->d_fsdata = (void *)(unsigned long)cnid;
- + dentry->d_fsdata = cnid;
- d_instantiate(dentry, inode);
- }
- @@ -66,7 +66,7 @@ again:
- goto fail;
- }
- cnid = be32_to_cpu(entry.folder.id);
- - dentry->d_fsdata = (void *)(unsigned long)cnid;
- + dentry->d_fsdata = cnid;
- } else if (type == HFSPLUS_FILE) {
- if (fd.entrylength < sizeof(struct hfsplus_cat_file)) {
- err = -EIO;
- @@ -95,7 +95,7 @@ again:
- cnid = (unsigned long)dentry->d_fsdata;
- linkid = 0;
- } else {
- - dentry->d_fsdata = (void *)(unsigned long)cnid;
- + dentry->d_fsdata = cnid;
- linkid =
- be32_to_cpu(entry.file.permissions.dev);
- str.len = sprintf(name, "iNode%d", linkid);
- @@ -108,7 +108,7 @@ again:
- goto again;
- }
- } else if (!dentry->d_fsdata)
- - dentry->d_fsdata = (void *)(unsigned long)cnid;
- + dentry->d_fsdata = cnid;
- } else {
- pr_err("invalid catalog entry type in lookup\n");
- err = -EIO;
- @@ -325,7 +325,7 @@ static int hfsplus_link(struct dentry *s
- }
- HFSPLUS_I(inode)->linkid = id;
- cnid = sbi->next_cnid++;
- - src_dentry->d_fsdata = (void *)(unsigned long)cnid;
- + src_dentry->d_fsdata = cnid;
- res = hfsplus_create_cat(cnid, src_dir,
- &src_dentry->d_name, inode);
- if (res)
- @@ -363,7 +363,7 @@ static int hfsplus_unlink(struct inode *
- return -EPERM;
- mutex_lock(&sbi->vh_mutex);
- - cnid = (u32)(unsigned long)dentry->d_fsdata;
- + cnid = dentry->d_fsdata;
- if (inode->i_ino == cnid &&
- atomic_read(&HFSPLUS_I(inode)->opencnt)) {
- str.name = name;
- diff -u -p a/fs/xfs/xfs_extfree_item.c b/fs/xfs/xfs_extfree_item.c
- --- a/fs/xfs/xfs_extfree_item.c
- +++ b/fs/xfs/xfs_extfree_item.c
- @@ -239,7 +239,7 @@ xfs_efi_init(
- xfs_log_item_init(mp, &efip->efi_item, XFS_LI_EFI, &xfs_efi_item_ops);
- efip->efi_format.efi_nextents = nextents;
- - efip->efi_format.efi_id = (__psint_t)(void*)efip;
- + efip->efi_format.efi_id = efip;
- atomic_set(&efip->efi_next_extent, 0);
- atomic_set(&efip->efi_refcount, 2);
- diff -u -p a/virt/kvm/vfio.c b/virt/kvm/vfio.c
- --- a/virt/kvm/vfio.c
- +++ b/virt/kvm/vfio.c
- @@ -115,7 +115,7 @@ static int kvm_vfio_set_group(struct kvm
- struct kvm_vfio *kv = dev->private;
- struct vfio_group *vfio_group;
- struct kvm_vfio_group *kvg;
- - int32_t __user *argp = (int32_t __user *)(unsigned long)arg;
- + int32_t __user *argp = arg;
- struct fd f;
- int32_t fd;
- int ret;
- diff -u -p a/kernel/sched/core.c b/kernel/sched/core.c
- --- a/kernel/sched/core.c
- +++ b/kernel/sched/core.c
- @@ -404,7 +404,7 @@ void hrtick_start(struct rq *rq, u64 del
- static int
- hotplug_hrtick(struct notifier_block *nfb, unsigned long action, void *hcpu)
- {
- - int cpu = (int)(long)hcpu;
- + int cpu = hcpu;
- switch (action) {
- case CPU_UP_CANCELED:
- @@ -5354,7 +5354,7 @@ static int sched_cpu_inactive(struct not
- static int __init migration_init(void)
- {
- - void *cpu = (void *)(long)smp_processor_id();
- + void *cpu = smp_processor_id();
- int err;
- /* Initialize migration for the boot CPU */
- diff -u -p a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c
- --- a/drivers/net/ethernet/neterion/s2io.c
- +++ b/drivers/net/ethernet/neterion/s2io.c
- @@ -2563,10 +2563,10 @@ static int fill_rx_buffers(struct s2io_n
- ba = &ring->ba[block_no][off];
- skb_reserve(skb, BUF0_LEN);
- - tmp = (u64)(unsigned long)skb->data;
- + tmp = skb->data;
- tmp += ALIGN_SIZE;
- tmp &= ~ALIGN_SIZE;
- - skb->data = (void *) (unsigned long)tmp;
- + skb->data = tmp;
- skb_reset_tail_pointer(skb);
- if (from_card_up) {
- diff -u -p a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
- --- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
- +++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
- @@ -1604,7 +1604,7 @@ static void iwl_mvm_configure_filter(str
- u64 multicast)
- {
- struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
- - struct iwl_mcast_filter_cmd *cmd = (void *)(unsigned long)multicast;
- + struct iwl_mcast_filter_cmd *cmd = multicast;
- mutex_lock(&mvm->mutex);
- diff -u -p a/drivers/net/wireless/ti/wl1251/main.c b/drivers/net/wireless/ti/wl1251/main.c
- --- a/drivers/net/wireless/ti/wl1251/main.c
- +++ b/drivers/net/wireless/ti/wl1251/main.c
- @@ -775,7 +775,7 @@ static void wl1251_op_configure_filter(s
- unsigned int changed,
- unsigned int *total, u64 multicast)
- {
- - struct wl1251_filter_params *fp = (void *)(unsigned long)multicast;
- + struct wl1251_filter_params *fp = multicast;
- struct wl1251 *wl = hw->priv;
- int ret;
- diff -u -p a/drivers/regulator/pfuze100-regulator.c b/drivers/regulator/pfuze100-regulator.c
- --- a/drivers/regulator/pfuze100-regulator.c
- +++ b/drivers/regulator/pfuze100-regulator.c
- @@ -535,7 +535,7 @@ static int pfuze100_regulator_probe(stru
- dev_err(&client->dev, "Error: No device match found\n");
- return -ENODEV;
- }
- - pfuze_chip->chip_id = (int)(long)match->data;
- + pfuze_chip->chip_id = match->data;
- } else if (id) {
- pfuze_chip->chip_id = id->driver_data;
- } else {
- diff -u -p a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
- --- a/drivers/vhost/vhost.c
- +++ b/drivers/vhost/vhost.c
- @@ -747,10 +747,10 @@ long vhost_vring_ioctl(struct vhost_dev
- }
- vq->log_used = !!(a.flags & (0x1 << VHOST_VRING_F_LOG));
- - vq->desc = (void __user *)(unsigned long)a.desc_user_addr;
- - vq->avail = (void __user *)(unsigned long)a.avail_user_addr;
- + vq->desc = a.desc_user_addr;
- + vq->avail = a.avail_user_addr;
- vq->log_addr = a.log_guest_addr;
- - vq->used = (void __user *)(unsigned long)a.used_user_addr;
- + vq->used = a.used_user_addr;
- break;
- case VHOST_SET_VRING_KICK:
- if (copy_from_user(&f, argp, sizeof f)) {
- @@ -864,7 +864,7 @@ long vhost_dev_ioctl(struct vhost_dev *d
- }
- for (i = 0; i < d->nvqs; ++i) {
- struct vhost_virtqueue *vq;
- - void __user *base = (void __user *)(unsigned long)p;
- + void __user *base = p;
- vq = d->vqs[i];
- mutex_lock(&vq->mutex);
- /* If ring is inactive, will check when it's enabled. */
- @@ -961,7 +961,7 @@ static int log_write(void __user *log_ba
- return 0;
- write_length += write_address % VHOST_PAGE_SIZE;
- for (;;) {
- - u64 base = (u64)(unsigned long)log_base;
- + u64 base = log_base;
- u64 log = base + write_page / 8;
- int bit = write_page % 8;
- if ((u64)(unsigned long)log != log)
- @@ -1085,7 +1085,7 @@ static int translate_desc(struct vhost_v
- _iov = iov + ret;
- size = reg->memory_size - addr + reg->guest_phys_addr;
- _iov->iov_len = min((u64)len - s, size);
- - _iov->iov_base = (void __user *)(unsigned long)
- + _iov->iov_base =
- (reg->userspace_addr + addr - reg->guest_phys_addr);
- s += size;
- addr += size;
- diff -u -p a/drivers/gpu/drm/drm_context.c b/drivers/gpu/drm/drm_context.c
- --- a/drivers/gpu/drm/drm_context.c
- +++ b/drivers/gpu/drm/drm_context.c
- @@ -173,7 +173,7 @@ int drm_legacy_getsareactx(struct drm_de
- list_for_each_entry(_entry, &dev->maplist, head) {
- if (_entry->map == map) {
- request->handle =
- - (void *)(unsigned long)_entry->user_token;
- + _entry->user_token;
- break;
- }
- }
- diff -u -p a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
- --- a/drivers/gpu/drm/nouveau/nouveau_gem.c
- +++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
- @@ -422,7 +422,7 @@ retry:
- }
- }
- - b->user_priv = (uint64_t)(unsigned long)nvbo;
- + b->user_priv = nvbo;
- nvbo->reserved_by = file_priv;
- nvbo->pbbo_index = i;
- if ((b->valid_domains & NOUVEAU_GEM_DOMAIN_VRAM) &&
- @@ -462,7 +462,7 @@ validate_list(struct nouveau_channel *ch
- {
- struct nouveau_drm *drm = chan->drm;
- struct drm_nouveau_gem_pushbuf_bo __user *upbbo =
- - (void __force __user *)(uintptr_t)user_pbbo_ptr;
- + user_pbbo_ptr;
- struct nouveau_bo *nvbo;
- int ret, relocs = 0;
- @@ -562,7 +562,7 @@ static inline void *
- u_memcpya(uint64_t user, unsigned nmemb, unsigned size)
- {
- void *mem;
- - void __user *userptr = (void __force __user *)(uintptr_t)user;
- + void __user *userptr = user;
- size *= nmemb;
- @@ -614,7 +614,7 @@ nouveau_gem_pushbuf_reloc_apply(struct n
- ret = -EINVAL;
- break;
- }
- - nvbo = (void *)(unsigned long)bo[r->reloc_bo_index].user_priv;
- + nvbo = bo[r->reloc_bo_index].user_priv;
- if (unlikely(r->reloc_bo_offset + 4 >
- nvbo->bo.mem.num_pages << PAGE_SHIFT)) {
- @@ -758,7 +758,7 @@ nouveau_gem_ioctl_pushbuf(struct drm_dev
- }
- for (i = 0; i < req->nr_push; i++) {
- - struct nouveau_bo *nvbo = (void *)(unsigned long)
- + struct nouveau_bo *nvbo =
- bo[push[i].bo_index].user_priv;
- nv50_dma_push(chan, nvbo, push[i].offset,
- @@ -773,7 +773,7 @@ nouveau_gem_ioctl_pushbuf(struct drm_dev
- }
- for (i = 0; i < req->nr_push; i++) {
- - struct nouveau_bo *nvbo = (void *)(unsigned long)
- + struct nouveau_bo *nvbo =
- bo[push[i].bo_index].user_priv;
- OUT_RING(chan, (nvbo->bo.offset + push[i].offset) | 2);
- @@ -787,7 +787,7 @@ nouveau_gem_ioctl_pushbuf(struct drm_dev
- }
- for (i = 0; i < req->nr_push; i++) {
- - struct nouveau_bo *nvbo = (void *)(unsigned long)
- + struct nouveau_bo *nvbo =
- bo[push[i].bo_index].user_priv;
- uint32_t cmd;
- diff -u -p a/drivers/gpu/drm/nouveau/nouveau_usif.c b/drivers/gpu/drm/nouveau/nouveau_usif.c
- --- a/drivers/gpu/drm/nouveau/nouveau_usif.c
- +++ b/drivers/gpu/drm/nouveau/nouveau_usif.c
- @@ -80,7 +80,7 @@ usif_notify(const void *header, u32 leng
- unsigned long flags;
- if (length == sizeof(rep->v0) && rep->v0.version == 0) {
- - if (WARN_ON(!(ntfy = (void *)(unsigned long)rep->v0.token)))
- + if (WARN_ON(!(ntfy = rep->v0.token)))
- return NVIF_NOTIFY_DROP;
- BUG_ON(rep->v0.route != NVDRM_NOTIFY_USIF);
- } else
- @@ -147,7 +147,7 @@ usif_notify_new(struct drm_file *f, void
- ntfy->route = req->v0.route;
- ntfy->token = req->v0.token;
- req->v0.route = NVDRM_NOTIFY_USIF;
- - req->v0.token = (unsigned long)(void *)ntfy;
- + req->v0.token = ntfy;
- ret = nvif_client_ioctl(client, argv, argc);
- req->v0.token = ntfy->token;
- req->v0.route = ntfy->route;
- @@ -279,7 +279,7 @@ usif_object_new(struct drm_file *f, void
- object->route = args->v0.route;
- object->token = args->v0.token;
- args->v0.route = NVDRM_OBJECT_USIF;
- - args->v0.token = (unsigned long)(void *)object;
- + args->v0.token = object;
- ret = nvif_client_ioctl(client, argv, argc);
- args->v0.token = object->token;
- args->v0.route = object->route;
- @@ -340,7 +340,7 @@ usif_ioctl(struct drm_file *filp, void _
- break;
- }
- if (argv->v0.route == NVDRM_OBJECT_USIF) {
- - object = (void *)(unsigned long)argv->v0.token;
- + object = argv->v0.token;
- argv->v0.route = object->route;
- argv->v0.token = object->token;
- if (ret == 0 && argv->v0.type == NVIF_IOCTL_V0_DEL) {
- diff -u -p a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
- --- a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
- +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
- @@ -768,7 +768,7 @@ int vmw_surface_define_ioctl(struct drm_
- goto out_no_offsets;
- }
- - user_sizes = (struct drm_vmw_size __user *)(unsigned long)
- + user_sizes =
- req->size_addr;
- ret = copy_from_user(srf->sizes, user_sizes,
- @@ -990,7 +990,7 @@ int vmw_surface_reference_ioctl(struct d
- rep->flags = srf->flags;
- rep->format = srf->format;
- memcpy(rep->mip_levels, srf->mip_levels, sizeof(srf->mip_levels));
- - user_sizes = (struct drm_vmw_size __user *)(unsigned long)
- + user_sizes =
- rep->size_addr;
- if (user_sizes)
- diff -u -p a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
- --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
- +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
- @@ -235,7 +235,7 @@ int vmw_present_ioctl(struct drm_device
- int ret;
- num_clips = arg->num_clips;
- - clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
- + clips_ptr = arg->clips_ptr;
- if (unlikely(num_clips == 0))
- return 0;
- @@ -308,8 +308,7 @@ int vmw_present_readback_ioctl(struct dr
- struct drm_vmw_present_readback_arg *arg =
- (struct drm_vmw_present_readback_arg *)data;
- struct drm_vmw_fence_rep __user *user_fence_rep =
- - (struct drm_vmw_fence_rep __user *)
- - (unsigned long)arg->fence_rep;
- + arg->fence_rep;
- struct drm_vmw_rect __user *clips_ptr;
- struct drm_vmw_rect *clips = NULL;
- struct drm_framebuffer *fb;
- @@ -318,7 +317,7 @@ int vmw_present_readback_ioctl(struct dr
- int ret;
- num_clips = arg->num_clips;
- - clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
- + clips_ptr = arg->clips_ptr;
- if (unlikely(num_clips == 0))
- return 0;
- diff -u -p a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
- --- a/drivers/gpu/drm/r128/r128_cce.c
- +++ b/drivers/gpu/drm/r128/r128_cce.c
- @@ -522,11 +522,11 @@ static int r128_do_init_cce(struct drm_d
- #endif
- {
- dev_priv->cce_ring->handle =
- - (void *)(unsigned long)dev_priv->cce_ring->offset;
- + dev_priv->cce_ring->offset;
- dev_priv->ring_rptr->handle =
- - (void *)(unsigned long)dev_priv->ring_rptr->offset;
- + dev_priv->ring_rptr->offset;
- dev->agp_buffer_map->handle =
- - (void *)(unsigned long)dev->agp_buffer_map->offset;
- + dev->agp_buffer_map->offset;
- }
- #if __OS_HAS_AGP
- diff -u -p a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
- --- a/drivers/gpu/drm/drm_atomic.c
- +++ b/drivers/gpu/drm/drm_atomic.c
- @@ -1183,10 +1183,10 @@ int drm_mode_atomic_ioctl(struct drm_dev
- void *data, struct drm_file *file_priv)
- {
- struct drm_mode_atomic *arg = data;
- - uint32_t __user *objs_ptr = (uint32_t __user *)(unsigned long)(arg->objs_ptr);
- - uint32_t __user *count_props_ptr = (uint32_t __user *)(unsigned long)(arg->count_props_ptr);
- - uint32_t __user *props_ptr = (uint32_t __user *)(unsigned long)(arg->props_ptr);
- - uint64_t __user *prop_values_ptr = (uint64_t __user *)(unsigned long)(arg->prop_values_ptr);
- + uint32_t __user *objs_ptr = (arg->objs_ptr);
- + uint32_t __user *count_props_ptr = (arg->count_props_ptr);
- + uint32_t __user *props_ptr = (arg->props_ptr);
- + uint64_t __user *prop_values_ptr = (arg->prop_values_ptr);
- unsigned int copied_objs, copied_props;
- struct drm_atomic_state *state;
- struct drm_modeset_acquire_ctx ctx;
- diff -u -p a/drivers/android/binder.c b/drivers/android/binder.c
- --- a/drivers/android/binder.c
- +++ b/drivers/android/binder.c
- @@ -1758,7 +1758,7 @@ static int binder_thread_write(struct bi
- binder_size_t *consumed)
- {
- uint32_t cmd;
- - void __user *buffer = (void __user *)(uintptr_t)binder_buffer;
- + void __user *buffer = binder_buffer;
- void __user *ptr = buffer + *consumed;
- void __user *end = buffer + size;
- @@ -2144,7 +2144,7 @@ static int binder_thread_read(struct bin
- binder_uintptr_t binder_buffer, size_t size,
- binder_size_t *consumed, int non_block)
- {
- - void __user *buffer = (void __user *)(uintptr_t)binder_buffer;
- + void __user *buffer = binder_buffer;
- void __user *ptr = buffer + *consumed;
- void __user *end = buffer + size;
- diff -u -p a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
- --- a/drivers/s390/net/qeth_core_main.c
- +++ b/drivers/s390/net/qeth_core_main.c
- @@ -4751,7 +4751,7 @@ int qeth_query_oat_command(struct qeth_c
- if (is_compat_task())
- tmp = compat_ptr(oat_data.ptr);
- else
- - tmp = (void __user *)(unsigned long)oat_data.ptr;
- + tmp = oat_data.ptr;
- if (copy_to_user(tmp, priv.buffer,
- priv.response_len)) {
- diff -u -p a/drivers/s390/char/vmur.c b/drivers/s390/char/vmur.c
- --- a/drivers/s390/char/vmur.c
- +++ b/drivers/s390/char/vmur.c
- @@ -255,7 +255,7 @@ static struct ccw1 *alloc_chan_prog(cons
- free_chan_prog(cpa);
- return ERR_PTR(-ENOMEM);
- }
- - cpa[i].cda = (u32)(addr_t) kbuf;
- + cpa[i].cda = kbuf;
- if (copy_from_user(kbuf, ubuf, reclen)) {
- free_chan_prog(cpa);
- return ERR_PTR(-EFAULT);
- diff -u -p a/drivers/s390/kvm/virtio_ccw.c b/drivers/s390/kvm/virtio_ccw.c
- --- a/drivers/s390/kvm/virtio_ccw.c
- +++ b/drivers/s390/kvm/virtio_ccw.c
- @@ -338,7 +338,7 @@ static void virtio_ccw_drop_indicator(st
- thinint_area->isc = VIRTIO_AIRQ_ISC;
- ccw->cmd_code = CCW_CMD_SET_IND_ADAPTER;
- ccw->count = sizeof(*thinint_area);
- - ccw->cda = (__u32)(unsigned long) thinint_area;
- + ccw->cda = thinint_area;
- } else {
- indicatorp = kmalloc(sizeof(&vcdev->indicators),
- GFP_DMA | GFP_KERNEL);
- @@ -347,7 +347,7 @@ static void virtio_ccw_drop_indicator(st
- *indicatorp = 0;
- ccw->cmd_code = CCW_CMD_SET_IND;
- ccw->count = sizeof(vcdev->indicators);
- - ccw->cda = (__u32)(unsigned long) indicatorp;
- + ccw->cda = indicatorp;
- }
- /* Deregister indicators from host. */
- vcdev->indicators = 0;
- @@ -403,7 +403,7 @@ static int virtio_ccw_read_vq_conf(struc
- ccw->cmd_code = CCW_CMD_READ_VQ_CONF;
- ccw->flags = 0;
- ccw->count = sizeof(struct vq_config_block);
- - ccw->cda = (__u32)(unsigned long)(vcdev->config_block);
- + ccw->cda = (vcdev->config_block);
- ccw_io_helper(vcdev, ccw, VIRTIO_CCW_DOING_READ_VQ_CONF);
- return vcdev->config_block->num;
- }
- @@ -439,7 +439,7 @@ static void virtio_ccw_del_vq(struct vir
- }
- ccw->cmd_code = CCW_CMD_SET_VQ;
- ccw->flags = 0;
- - ccw->cda = (__u32)(unsigned long)(info->info_block);
- + ccw->cda = (info->info_block);
- ret = ccw_io_helper(vcdev, ccw,
- VIRTIO_CCW_DOING_SET_VQ | index);
- /*
- @@ -537,7 +537,7 @@ static struct virtqueue *virtio_ccw_setu
- }
- ccw->cmd_code = CCW_CMD_SET_VQ;
- ccw->flags = 0;
- - ccw->cda = (__u32)(unsigned long)(info->info_block);
- + ccw->cda = (info->info_block);
- err = ccw_io_helper(vcdev, ccw, VIRTIO_CCW_DOING_SET_VQ | i);
- if (err) {
- dev_warn(&vcdev->cdev->dev, "SET_VQ failed\n");
- @@ -594,7 +594,7 @@ static int virtio_ccw_register_adapter_i
- ccw->cmd_code = CCW_CMD_SET_IND_ADAPTER;
- ccw->flags = CCW_FLAG_SLI;
- ccw->count = sizeof(*thinint_area);
- - ccw->cda = (__u32)(unsigned long)thinint_area;
- + ccw->cda = thinint_area;
- ret = ccw_io_helper(vcdev, ccw, VIRTIO_CCW_DOING_SET_IND_ADAPTER);
- if (ret) {
- if (ret == -EOPNOTSUPP) {
- @@ -655,7 +655,7 @@ static int virtio_ccw_find_vqs(struct vi
- ccw->cmd_code = CCW_CMD_SET_IND;
- ccw->flags = 0;
- ccw->count = sizeof(vcdev->indicators);
- - ccw->cda = (__u32)(unsigned long) indicatorp;
- + ccw->cda = indicatorp;
- ret = ccw_io_helper(vcdev, ccw, VIRTIO_CCW_DOING_SET_IND);
- if (ret)
- goto out;
- @@ -666,7 +666,7 @@ static int virtio_ccw_find_vqs(struct vi
- ccw->cmd_code = CCW_CMD_SET_CONF_IND;
- ccw->flags = 0;
- ccw->count = sizeof(vcdev->indicators2);
- - ccw->cda = (__u32)(unsigned long) indicatorp;
- + ccw->cda = indicatorp;
- ret = ccw_io_helper(vcdev, ccw, VIRTIO_CCW_DOING_SET_CONF_IND);
- if (ret)
- goto out;
- @@ -724,7 +724,7 @@ static u64 virtio_ccw_get_features(struc
- ccw->cmd_code = CCW_CMD_READ_FEAT;
- ccw->flags = 0;
- ccw->count = sizeof(*features);
- - ccw->cda = (__u32)(unsigned long)features;
- + ccw->cda = features;
- ret = ccw_io_helper(vcdev, ccw, VIRTIO_CCW_DOING_READ_FEAT);
- if (ret) {
- rc = 0;
- @@ -741,7 +741,7 @@ static u64 virtio_ccw_get_features(struc
- ccw->cmd_code = CCW_CMD_READ_FEAT;
- ccw->flags = 0;
- ccw->count = sizeof(*features);
- - ccw->cda = (__u32)(unsigned long)features;
- + ccw->cda = features;
- ret = ccw_io_helper(vcdev, ccw, VIRTIO_CCW_DOING_READ_FEAT);
- if (ret == 0)
- rc |= (u64)le32_to_cpu(features->features) << 32;
- @@ -784,7 +784,7 @@ static int virtio_ccw_finalize_features(
- ccw->cmd_code = CCW_CMD_WRITE_FEAT;
- ccw->flags = 0;
- ccw->count = sizeof(*features);
- - ccw->cda = (__u32)(unsigned long)features;
- + ccw->cda = features;
- ret = ccw_io_helper(vcdev, ccw, VIRTIO_CCW_DOING_WRITE_FEAT);
- if (ret)
- goto out_free;
- @@ -798,7 +798,7 @@ static int virtio_ccw_finalize_features(
- ccw->cmd_code = CCW_CMD_WRITE_FEAT;
- ccw->flags = 0;
- ccw->count = sizeof(*features);
- - ccw->cda = (__u32)(unsigned long)features;
- + ccw->cda = features;
- ret = ccw_io_helper(vcdev, ccw, VIRTIO_CCW_DOING_WRITE_FEAT);
- out_free:
- @@ -828,7 +828,7 @@ static void virtio_ccw_get_config(struct
- ccw->cmd_code = CCW_CMD_READ_CONF;
- ccw->flags = 0;
- ccw->count = offset + len;
- - ccw->cda = (__u32)(unsigned long)config_area;
- + ccw->cda = config_area;
- ret = ccw_io_helper(vcdev, ccw, VIRTIO_CCW_DOING_READ_CONFIG);
- if (ret)
- goto out_free;
- @@ -863,7 +863,7 @@ static void virtio_ccw_set_config(struct
- ccw->cmd_code = CCW_CMD_WRITE_CONF;
- ccw->flags = 0;
- ccw->count = offset + len;
- - ccw->cda = (__u32)(unsigned long)config_area;
- + ccw->cda = config_area;
- ccw_io_helper(vcdev, ccw, VIRTIO_CCW_DOING_WRITE_CONFIG);
- out_free:
- @@ -894,7 +894,7 @@ static void virtio_ccw_set_status(struct
- ccw->cmd_code = CCW_CMD_WRITE_STATUS;
- ccw->flags = 0;
- ccw->count = sizeof(status);
- - ccw->cda = (__u32)(unsigned long)vcdev->status;
- + ccw->cda = vcdev->status;
- ret = ccw_io_helper(vcdev, ccw, VIRTIO_CCW_DOING_WRITE_STATUS);
- /* Write failed? We assume status is unchanged. */
- if (ret)
- @@ -1134,7 +1134,7 @@ static int virtio_ccw_set_transport_rev(
- ccw->cmd_code = CCW_CMD_SET_VIRTIO_REV;
- ccw->flags = 0;
- ccw->count = sizeof(*rev);
- - ccw->cda = (__u32)(unsigned long)rev;
- + ccw->cda = rev;
- vcdev->revision = VIRTIO_CCW_REV_MAX;
- do {
- diff -u -p a/drivers/virt/fsl_hypervisor.c b/drivers/virt/fsl_hypervisor.c
- --- a/drivers/virt/fsl_hypervisor.c
- +++ b/drivers/virt/fsl_hypervisor.c
- @@ -343,9 +343,9 @@ static long ioctl_dtprop(struct fsl_hv_i
- if (copy_from_user(¶m, p, sizeof(struct fsl_hv_ioctl_prop)))
- return -EFAULT;
- - upath = (char __user *)(uintptr_t)param.path;
- - upropname = (char __user *)(uintptr_t)param.propname;
- - upropval = (void __user *)(uintptr_t)param.propval;
- + upath = param.path;
- + upropname = param.propname;
- + upropval = param.propval;
- path = strndup_user(upath, FH_DTPROP_MAX_PATHLEN);
- if (IS_ERR(path)) {
- diff -u -p a/drivers/infiniband/hw/qib/qib_srq.c b/drivers/infiniband/hw/qib/qib_srq.c
- --- a/drivers/infiniband/hw/qib/qib_srq.c
- +++ b/drivers/infiniband/hw/qib/qib_srq.c
- @@ -248,7 +248,7 @@ int qib_modify_srq(struct ib_srq *ibsrq,
- if (ret)
- goto bail_free;
- udata->outbuf =
- - (void __user *) (unsigned long) offset_addr;
- + offset_addr;
- ret = ib_copy_to_udata(udata, &offset,
- sizeof(offset));
- if (ret)
- diff -u -p a/drivers/infiniband/hw/amso1100/c2_qp.c b/drivers/infiniband/hw/amso1100/c2_qp.c
- --- a/drivers/infiniband/hw/amso1100/c2_qp.c
- +++ b/drivers/infiniband/hw/amso1100/c2_qp.c
- @@ -214,7 +214,7 @@ int c2_qp_modify(struct c2_dev *c2dev, s
- if (err)
- goto bail0;
- - reply = (struct c2wr_qp_modify_rep *) (unsigned long) vq_req->reply_msg;
- + reply = vq_req->reply_msg;
- if (!reply) {
- err = -ENOMEM;
- goto bail0;
- @@ -285,7 +285,7 @@ int c2_qp_set_read_limits(struct c2_dev
- if (err)
- goto bail0;
- - reply = (struct c2wr_qp_modify_rep *) (unsigned long)
- + reply =
- vq_req->reply_msg;
- if (!reply) {
- err = -ENOMEM;
- @@ -359,7 +359,7 @@ static int destroy_qp(struct c2_dev *c2d
- /*
- * Process reply
- */
- - reply = (struct c2wr_qp_destroy_rep *) (unsigned long) (vq_req->reply_msg);
- + reply = (vq_req->reply_msg);
- if (!reply) {
- err = -ENOMEM;
- goto bail0;
- @@ -492,7 +492,7 @@ int c2_alloc_qp(struct c2_dev *c2dev,
- }
- /* Process the reply */
- - reply = (struct c2wr_qp_create_rep *) (unsigned long) (vq_req->reply_msg);
- + reply = (vq_req->reply_msg);
- if (!reply) {
- err = -ENOMEM;
- goto bail3;
- diff -u -p a/drivers/infiniband/hw/amso1100/c2_mm.c b/drivers/infiniband/hw/amso1100/c2_mm.c
- --- a/drivers/infiniband/hw/amso1100/c2_mm.c
- +++ b/drivers/infiniband/hw/amso1100/c2_mm.c
- @@ -155,7 +155,7 @@ send_pbl_messages(struct c2_dev *c2dev,
- /*
- * Process reply
- */
- - reply = (struct c2wr_nsmr_pbl_rep *) (unsigned long) vq_req->reply_msg;
- + reply = vq_req->reply_msg;
- if (!reply) {
- err = -ENOMEM;
- goto bail0;
- @@ -268,7 +268,7 @@ c2_nsmr_register_phys_kern(struct c2_dev
- * process reply
- */
- reply =
- - (struct c2wr_nsmr_register_rep *) (unsigned long) (vq_req->reply_msg);
- + (vq_req->reply_msg);
- if (!reply) {
- err = -ENOMEM;
- goto bail1;
- @@ -333,7 +333,7 @@ int c2_stag_dealloc(struct c2_dev *c2dev
- * Build the WR
- */
- c2_wr_set_id(&wr, CCWR_STAG_DEALLOC);
- - wr.hdr.context = (u64) (unsigned long) vq_req;
- + wr.hdr.context = vq_req;
- wr.rnic_handle = c2dev->adapter_handle;
- wr.stag_index = cpu_to_be32(stag_index);
- @@ -362,7 +362,7 @@ int c2_stag_dealloc(struct c2_dev *c2dev
- /*
- * Process reply
- */
- - reply = (struct c2wr_stag_dealloc_rep *) (unsigned long) vq_req->reply_msg;
- + reply = vq_req->reply_msg;
- if (!reply) {
- err = -ENOMEM;
- goto bail0;
- diff -u -p a/drivers/infiniband/hw/cxgb4/qp.c b/drivers/infiniband/hw/cxgb4/qp.c
- --- a/drivers/infiniband/hw/cxgb4/qp.c
- +++ b/drivers/infiniband/hw/cxgb4/qp.c
- @@ -373,7 +373,7 @@ static int build_immd(struct t4_sq *sq,
- for (i = 0; i < wr->num_sge; i++) {
- if ((plen + wr->sg_list[i].length) > max)
- return -EMSGSIZE;
- - srcp = (u8 *)(unsigned long)wr->sg_list[i].addr;
- + srcp = wr->sg_list[i].addr;
- plen += wr->sg_list[i].length;
- rem = wr->sg_list[i].length;
- while (rem) {
- diff -u -p a/drivers/infiniband/hw/mlx5/cq.c b/drivers/infiniband/hw/mlx5/cq.c
- --- a/drivers/infiniband/hw/mlx5/cq.c
- +++ b/drivers/infiniband/hw/mlx5/cq.c
- @@ -316,7 +316,7 @@ static void *mlx5_get_atomic_laddr(struc
- dpseg = mlx5_get_send_wqe(qp, idx) + sizeof(struct mlx5_wqe_ctrl_seg) +
- sizeof(struct mlx5_wqe_raddr_seg) +
- sizeof(struct mlx5_wqe_atomic_seg);
- - addr = (void *)(unsigned long)be64_to_cpu(dpseg->addr);
- + addr = be64_to_cpu(dpseg->addr);
- return addr;
- }
- diff -u -p a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
- --- a/drivers/infiniband/hw/nes/nes_verbs.c
- +++ b/drivers/infiniband/hw/nes/nes_verbs.c
- @@ -1176,7 +1176,7 @@ static struct ib_qp *nes_create_qp(struc
- u64nesqp += ((u64)NES_SW_CONTEXT_ALIGN) - 1;
- u64temp = ((u64)NES_SW_CONTEXT_ALIGN) - 1;
- u64nesqp &= ~u64temp;
- - nesqp = (struct nes_qp *)(unsigned long)u64nesqp;
- + nesqp = u64nesqp;
- /* nes_debug(NES_DBG_QP, "nesqp=%p, allocated buffer=%p. Rounded to closest %u\n",
- nesqp, mem, NES_SW_CONTEXT_ALIGN); */
- nesqp->allocated_buffer = mem;
- @@ -1729,7 +1729,7 @@ static struct ib_cq *nes_create_cq(struc
- }
- set_wqe_64bit_value(cqp_wqe->wqe_words, NES_CQP_CQ_WQE_PBL_LOW_IDX, u64temp);
- cqp_wqe->wqe_words[NES_CQP_CQ_WQE_CQ_CONTEXT_HIGH_IDX] = 0;
- - u64temp = (u64)(unsigned long)&nescq->hw_cq;
- + u64temp = &nescq->hw_cq;
- cqp_wqe->wqe_words[NES_CQP_CQ_WQE_CQ_CONTEXT_LOW_IDX] =
- cpu_to_le32((u32)(u64temp >> 1));
- cqp_wqe->wqe_words[NES_CQP_CQ_WQE_CQ_CONTEXT_HIGH_IDX] =
- @@ -3675,7 +3675,7 @@ static int nes_poll_cq(struct ib_cq *ibc
- ((u64)u32temp);
- if (u64temp) {
- - nesqp = (struct nes_qp *)(unsigned long)u64temp;
- + nesqp = u64temp;
- memset(entry, 0, sizeof *entry);
- if (cqe.cqe_words[NES_CQE_ERROR_CODE_IDX] == 0) {
- entry->status = IB_WC_SUCCESS;
- diff -u -p a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
- --- a/drivers/infiniband/core/mad.c
- +++ b/drivers/infiniband/core/mad.c
- @@ -1955,7 +1955,7 @@ static void ib_mad_recv_done_handler(str
- int port_num;
- int ret = IB_MAD_RESULT_SUCCESS;
- - mad_list = (struct ib_mad_list_head *)(unsigned long)wc->wr_id;
- + mad_list = wc->wr_id;
- qp_info = mad_list->mad_queue->qp_info;
- dequeue_mad(mad_list);
- @@ -2209,7 +2209,7 @@ static void ib_mad_send_done_handler(str
- unsigned long flags;
- int ret;
- - mad_list = (struct ib_mad_list_head *)(unsigned long)wc->wr_id;
- + mad_list = wc->wr_id;
- mad_send_wr = container_of(mad_list, struct ib_mad_send_wr_private,
- mad_list);
- send_queue = mad_list->mad_queue;
- @@ -2283,7 +2283,7 @@ static void mad_error_handler(struct ib_
- int ret;
- /* Determine if failure was a send or receive */
- - mad_list = (struct ib_mad_list_head *)(unsigned long)wc->wr_id;
- + mad_list = wc->wr_id;
- qp_info = mad_list->mad_queue->qp_info;
- if (mad_list->mad_queue == &qp_info->recv_queue)
- /*
- diff -u -p a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c
- --- a/drivers/infiniband/ulp/isert/ib_isert.c
- +++ b/drivers/infiniband/ulp/isert/ib_isert.c
- @@ -1994,7 +1994,7 @@ isert_cq_comp_err(struct isert_conn *ise
- struct isert_cmd *isert_cmd;
- struct iser_tx_desc *desc;
- - desc = (struct iser_tx_desc *)(uintptr_t)wc->wr_id;
- + desc = wc->wr_id;
- isert_cmd = desc->isert_cmd;
- if (!isert_cmd)
- isert_unmap_tx_desc(desc, ib_dev);
- @@ -2017,10 +2017,10 @@ isert_handle_wc(struct ib_wc *wc)
- isert_conn = wc->qp->qp_context;
- if (likely(wc->status == IB_WC_SUCCESS)) {
- if (wc->opcode == IB_WC_RECV) {
- - rx_desc = (struct iser_rx_desc *)(uintptr_t)wc->wr_id;
- + rx_desc = wc->wr_id;
- isert_rx_completion(rx_desc, isert_conn, wc->byte_len);
- } else {
- - tx_desc = (struct iser_tx_desc *)(uintptr_t)wc->wr_id;
- + tx_desc = wc->wr_id;
- isert_send_completion(tx_desc, isert_conn);
- }
- } else {
- diff -u -p a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c
- --- a/drivers/sbus/char/jsflash.c
- +++ b/drivers/sbus/char/jsflash.c
- @@ -371,7 +371,7 @@ static int jsf_ioctl_program(void __user
- togo = abuf.size;
- if ((togo & 3) || (p & 3)) return -EINVAL;
- - uptr = (char __user *) (unsigned long) abuf.data;
- + uptr = abuf.data;
- while (togo != 0) {
- togo -= 4;
- if (copy_from_user(&b.s[0], uptr, 4))
- diff -u -p a/drivers/isdn/hardware/eicon/message.c b/drivers/isdn/hardware/eicon/message.c
- --- a/drivers/isdn/hardware/eicon/message.c
- +++ b/drivers/isdn/hardware/eicon/message.c
- @@ -532,7 +532,7 @@ word api_put(APPL *appl, CAPI_MSG *msg)
- if (m->header.command == _DATA_B3_R)
- {
- - m->info.data_b3_req.Data = (dword)(long)(TransmitBufferSet(appl, m->info.data_b3_req.Data));
- + m->info.data_b3_req.Data = (TransmitBufferSet(appl, m->info.data_b3_req.Data));
- }
- @@ -3130,7 +3130,7 @@ static byte data_b3_req(dword Id, word N
- && (((byte *)(parms[0].info)) < ((byte *)(plci->msg_in_queue)) + sizeof(plci->msg_in_queue)))
- {
- - data->P = (byte *)(long)(*((dword *)(parms[0].info)));
- + data->P = (*((dword *)(parms[0].info)));
- }
- else
- diff -u -p a/drivers/video/fbdev/arkfb.c b/drivers/video/fbdev/arkfb.c
- --- a/drivers/video/fbdev/arkfb.c
- +++ b/drivers/video/fbdev/arkfb.c
- @@ -1016,7 +1016,7 @@ static int ark_pci_probe(struct pci_dev
- pcibios_bus_to_resource(dev->bus, &vga_res, &bus_reg);
- - par->state.vgabase = (void __iomem *) (unsigned long) vga_res.start;
- + par->state.vgabase = vga_res.start;
- /* FIXME get memsize */
- regval = vga_rseq(par->state.vgabase, 0x10);
- diff -u -p a/drivers/video/fbdev/vt8623fb.c b/drivers/video/fbdev/vt8623fb.c
- --- a/drivers/video/fbdev/vt8623fb.c
- +++ b/drivers/video/fbdev/vt8623fb.c
- @@ -731,7 +731,7 @@ static int vt8623_pci_probe(struct pci_d
- pcibios_bus_to_resource(dev->bus, &vga_res, &bus_reg);
- - par->state.vgabase = (void __iomem *) (unsigned long) vga_res.start;
- + par->state.vgabase = vga_res.start;
- /* Find how many physical memory there is on card */
- memsize1 = (vga_rseq(par->state.vgabase, 0x34) + 1) >> 1;
- diff -u -p a/drivers/block/floppy.c b/drivers/block/floppy.c
- --- a/drivers/block/floppy.c
- +++ b/drivers/block/floppy.c
- @@ -4338,7 +4338,7 @@ static int __init do_floppy_init(void)
- goto out_remove_drives;
- /* to be cleaned up... */
- - disks[drive]->private_data = (void *)(long)drive;
- + disks[drive]->private_data = drive;
- disks[drive]->flags |= GENHD_FL_REMOVABLE;
- disks[drive]->driverfs_dev = &floppy_device[drive].dev;
- add_disk(disks[drive]);
- diff -u -p a/drivers/misc/sgi-xp/xpc_sn2.c b/drivers/misc/sgi-xp/xpc_sn2.c
- --- a/drivers/misc/sgi-xp/xpc_sn2.c
- +++ b/drivers/misc/sgi-xp/xpc_sn2.c
- @@ -304,7 +304,7 @@ xpc_check_for_sent_chctl_flags_sn2(struc
- static irqreturn_t
- xpc_handle_notify_IRQ_sn2(int irq, void *dev_id)
- {
- - short partid = (short)(u64)dev_id;
- + short partid = dev_id;
- struct xpc_partition *part = &xpc_partitions[partid];
- DBUG_ON(partid < 0 || partid >= XP_MAX_NPARTITIONS_SN2);
- diff -u -p a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
- --- a/drivers/atm/solos-pci.c
- +++ b/drivers/atm/solos-pci.c
- @@ -1375,7 +1375,7 @@ static int atm_init(struct solos_card *c
- card->atmdev[i]->ci_range.vpi_bits = 8;
- card->atmdev[i]->ci_range.vci_bits = 16;
- card->atmdev[i]->dev_data = card;
- - card->atmdev[i]->phy_data = (void *)(unsigned long)i;
- + card->atmdev[i]->phy_data = i;
- atm_dev_signal_change(card->atmdev[i], ATM_PHY_SIG_FOUND);
- skb = alloc_skb(sizeof(*header), GFP_KERNEL);
- diff -u -p a/drivers/gpio/gpio-mcp23s08.c b/drivers/gpio/gpio-mcp23s08.c
- --- a/drivers/gpio/gpio-mcp23s08.c
- +++ b/drivers/gpio/gpio-mcp23s08.c
- @@ -894,7 +894,7 @@ static int mcp23s08_probe(struct spi_dev
- match = of_match_device(of_match_ptr(mcp23s08_spi_of_match), &spi->dev);
- if (match) {
- - type = (int)(uintptr_t)match->data;
- + type = match->data;
- status = of_property_read_u32(spi->dev.of_node,
- "microchip,spi-present-mask", &spi_present_mask);
- if (status) {
- diff -u -p a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
- --- a/drivers/scsi/qla1280.c
- +++ b/drivers/scsi/qla1280.c
- @@ -2847,7 +2847,7 @@ qla1280_64bit_start_scsi(struct scsi_qla
- ha->outstanding_cmds[cnt] = sp;
- ha->req_q_cnt -= req_cnt;
- - CMD_HANDLE(sp->cmd) = (unsigned char *)(unsigned long)(cnt + 1);
- + CMD_HANDLE(sp->cmd) = (cnt + 1);
- dprintk(2, "start: cmd=%p sp=%p CDB=%xm, handle %lx\n", cmd, sp,
- cmd->cmnd[0], (long)CMD_HANDLE(sp->cmd));
- @@ -3120,7 +3120,7 @@ qla1280_32bit_start_scsi(struct scsi_qla
- goto out;
- }
- - CMD_HANDLE(sp->cmd) = (unsigned char *) (unsigned long)(cnt + 1);
- + CMD_HANDLE(sp->cmd) = (cnt + 1);
- ha->outstanding_cmds[cnt] = sp;
- ha->req_q_cnt -= req_cnt;
- diff -u -p a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c
- --- a/drivers/scsi/ibmvscsi/ibmvfc.c
- +++ b/drivers/scsi/ibmvscsi/ibmvfc.c
- @@ -2841,7 +2841,7 @@ static int ibmvfc_slave_alloc(struct scs
- return -ENXIO;
- spin_lock_irqsave(shost->host_lock, flags);
- - sdev->hostdata = (void *)(unsigned long)vhost->task_set++;
- + sdev->hostdata = vhost->task_set++;
- spin_unlock_irqrestore(shost->host_lock, flags);
- return 0;
- }
- @@ -2863,7 +2863,7 @@ static int ibmvfc_target_alloc(struct sc
- unsigned long flags = 0;
- spin_lock_irqsave(shost->host_lock, flags);
- - starget->hostdata = (void *)(unsigned long)vhost->task_set++;
- + starget->hostdata = vhost->task_set++;
- spin_unlock_irqrestore(shost->host_lock, flags);
- return 0;
- }
- diff -u -p a/drivers/ata/pata_hpt3x2n.c b/drivers/ata/pata_hpt3x2n.c
- --- a/drivers/ata/pata_hpt3x2n.c
- +++ b/drivers/ata/pata_hpt3x2n.c
- @@ -334,7 +334,7 @@ static unsigned int hpt3x2n_qc_issue(str
- if ((flags & USE_DPLL) != dpll) {
- flags &= ~USE_DPLL;
- flags |= dpll;
- - ap->host->private_data = (void *)(long)flags;
- + ap->host->private_data = flags;
- hpt3x2n_set_clock(ap, dpll ? 0x21 : 0x23);
- }
- diff -u -p a/drivers/ata/libahci_platform.c b/drivers/ata/libahci_platform.c
- --- a/drivers/ata/libahci_platform.c
- +++ b/drivers/ata/libahci_platform.c
- @@ -519,7 +519,7 @@ int ahci_platform_init_host(struct platf
- }
- /* prepare host */
- - pi.private_data = (void *)(unsigned long)hpriv->flags;
- + pi.private_data = hpriv->flags;
- ahci_save_initial_config(dev, hpriv);
- diff -u -p a/drivers/i2c/busses/i2c-opal.c b/drivers/i2c/busses/i2c-opal.c
- --- a/drivers/i2c/busses/i2c-opal.c
- +++ b/drivers/i2c/busses/i2c-opal.c
- @@ -231,7 +231,7 @@ static int i2c_opal_probe(struct platfor
- return -ENOMEM;
- adapter->algo = &i2c_opal_algo;
- - adapter->algo_data = (void *)(unsigned long)opal_id;
- + adapter->algo_data = opal_id;
- adapter->dev.parent = &pdev->dev;
- adapter->dev.of_node = of_node_get(pdev->dev.of_node);
- pname = of_get_property(pdev->dev.of_node, "ibm,port-name", NULL);
- diff -u -p a/block/bsg.c b/block/bsg.c
- --- a/block/bsg.c
- +++ b/block/bsg.c
- @@ -257,7 +257,7 @@ bsg_map_hdr(struct bsg_device *bd, struc
- rq->next_rq = next_rq;
- next_rq->cmd_type = rq->cmd_type;
- - dxferp = (void __user *)(unsigned long)hdr->din_xferp;
- + dxferp = hdr->din_xferp;
- ret = blk_rq_map_user(q, next_rq, NULL, dxferp,
- hdr->din_xfer_len, GFP_KERNEL);
- if (ret)
- @@ -266,10 +266,10 @@ bsg_map_hdr(struct bsg_device *bd, struc
- if (hdr->dout_xfer_len) {
- dxfer_len = hdr->dout_xfer_len;
- - dxferp = (void __user *)(unsigned long)hdr->dout_xferp;
- + dxferp = hdr->dout_xferp;
- } else if (hdr->din_xfer_len) {
- dxfer_len = hdr->din_xfer_len;
- - dxferp = (void __user *)(unsigned long)hdr->din_xferp;
- + dxferp = hdr->din_xferp;
- } else
- dxfer_len = 0;
- diff -u -p a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
- --- a/arch/arm/kernel/process.c
- +++ b/arch/arm/kernel/process.c
- @@ -88,7 +88,7 @@ static void __soft_restart(void *addr)
- flush_cache_all();
- /* Switch to the identity mapping. */
- - phys_reset = (phys_reset_t)(unsigned long)virt_to_phys(cpu_reset);
- + phys_reset = virt_to_phys(cpu_reset);
- phys_reset((unsigned long)addr);
- /* Should never get here. */
- diff -u -p a/arch/sparc/kernel/prom_irqtrans.c b/arch/sparc/kernel/prom_irqtrans.c
- --- a/arch/sparc/kernel/prom_irqtrans.c
- +++ b/arch/sparc/kernel/prom_irqtrans.c
- @@ -112,7 +112,7 @@ struct sabre_irq_data {
- */
- static void sabre_wsync_handler(unsigned int ino, void *_arg1, void *_arg2)
- {
- - unsigned int phys_hi = (unsigned int) (unsigned long) _arg1;
- + unsigned int phys_hi = _arg1;
- struct sabre_irq_data *irq_data = _arg2;
- unsigned long controller_regs = irq_data->controller_regs;
- unsigned long sync_reg = controller_regs + SABRE_WRSYNC;
- @@ -459,7 +459,7 @@ static unsigned int pci_sun4v_irq_build(
- unsigned int devino,
- void *_data)
- {
- - u32 devhandle = (u32) (unsigned long) _data;
- + u32 devhandle = _data;
- return sun4v_build_irq(devhandle, devino);
- }
- @@ -472,7 +472,7 @@ static void __init pci_sun4v_irq_trans_i
- dp->irq_trans->irq_build = pci_sun4v_irq_build;
- regs = of_get_property(dp, "reg", NULL);
- - dp->irq_trans->data = (void *) (unsigned long)
- + dp->irq_trans->data =
- ((regs->phys_addr >> 32UL) & 0x0fffffff);
- }
- @@ -709,7 +709,7 @@ static void __init sbus_irq_trans_init(s
- dp->irq_trans->irq_build = sbus_of_build_irq;
- regs = of_get_property(dp, "reg", NULL);
- - dp->irq_trans->data = (void *) (unsigned long) regs->phys_addr;
- + dp->irq_trans->data = regs->phys_addr;
- }
- #endif /* CONFIG_SBUS */
- @@ -783,7 +783,7 @@ static unsigned int sun4v_vdev_irq_build
- unsigned int devino,
- void *_data)
- {
- - u32 devhandle = (u32) (unsigned long) _data;
- + u32 devhandle = _data;
- return sun4v_build_irq(devhandle, devino);
- }
- @@ -796,7 +796,7 @@ static void __init sun4v_vdev_irq_trans_
- dp->irq_trans->irq_build = sun4v_vdev_irq_build;
- regs = of_get_property(dp, "reg", NULL);
- - dp->irq_trans->data = (void *) (unsigned long)
- + dp->irq_trans->data =
- ((regs->phys_addr >> 32UL) & 0x0fffffff);
- }
- diff -u -p a/arch/sparc/kernel/sun4m_irq.c b/arch/sparc/kernel/sun4m_irq.c
- --- a/arch/sparc/kernel/sun4m_irq.c
- +++ b/arch/sparc/kernel/sun4m_irq.c
- @@ -373,11 +373,9 @@ static void __init sun4m_init_timers(voi
- num_cpu_timers = (len / sizeof(u32)) - 1;
- for (i = 0; i < num_cpu_timers; i++) {
- - timers_percpu[i] = (void __iomem *)
- - (unsigned long) addr[i];
- + timers_percpu[i] = addr[i];
- }
- - timers_global = (void __iomem *)
- - (unsigned long) addr[num_cpu_timers];
- + timers_global = addr[num_cpu_timers];
- /* Every per-cpu timer works in timer mode */
- sbus_writel(0x00000000, &timers_global->timer_config);
- @@ -449,11 +447,9 @@ void __init sun4m_init_IRQ(void)
- num_cpu_iregs = (len / sizeof(u32)) - 1;
- for (i = 0; i < num_cpu_iregs; i++) {
- - sun4m_irq_percpu[i] = (void __iomem *)
- - (unsigned long) addr[i];
- + sun4m_irq_percpu[i] = addr[i];
- }
- - sun4m_irq_global = (void __iomem *)
- - (unsigned long) addr[num_cpu_iregs];
- + sun4m_irq_global = addr[num_cpu_iregs];
- local_irq_disable();
- diff -u -p a/arch/tile/kernel/unaligned.c b/arch/tile/kernel/unaligned.c
- --- a/arch/tile/kernel/unaligned.c
- +++ b/arch/tile/kernel/unaligned.c
- @@ -917,7 +917,7 @@ void jit_bundle_gen(struct pt_regs *regs
- /* Sign-extend 4-byte loads. */
- if (load_store_size == 4)
- - x = (long)(int)x;
- + x = x;
- /* Set register rd. */
- regs->regs[rd] = x;
- diff -u -p a/arch/s390/kernel/vdso.c b/arch/s390/kernel/vdso.c
- --- a/arch/s390/kernel/vdso.c
- +++ b/arch/s390/kernel/vdso.c
- @@ -124,12 +124,12 @@ int vdso_alloc_per_cpu(struct _lowcore *
- for (i = 4; i < 32; i += 4)
- psal[i] = 0x80000000;
- - lowcore->paste[4] = (u32)(addr_t) psal;
- + lowcore->paste[4] = psal;
- psal[0] = 0x02000000;
- - psal[2] = (u32)(addr_t) aste;
- + psal[2] = aste;
- *(unsigned long *) (aste + 2) = segment_table +
- _ASCE_TABLE_LENGTH + _ASCE_USER_BITS + _ASCE_TYPE_SEGMENT;
- - aste[4] = (u32)(addr_t) psal;
- + aste[4] = psal;
- lowcore->vdso_per_cpu_data = page_frame;
- return 0;
- @@ -149,8 +149,8 @@ void vdso_free_per_cpu(struct _lowcore *
- if (!vdso_enabled)
- return;
- - psal = (u32 *)(addr_t) lowcore->paste[4];
- - aste = (u32 *)(addr_t) psal[2];
- + psal = lowcore->paste[4];
- + aste = psal[2];
- segment_table = *(unsigned long *)(aste + 2) & PAGE_MASK;
- page_table = *(unsigned long *) segment_table;
- page_frame = *(unsigned long *) page_table;
- diff -u -p a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
- --- a/arch/s390/kernel/ipl.c
- +++ b/arch/s390/kernel/ipl.c
- @@ -2033,7 +2033,7 @@ void __init ipl_save_parameters(void)
- if (!iplinfo.is_qdio)
- return;
- ipl_flags |= IPL_PARMBLOCK_VALID;
- - src = (void *)(unsigned long)S390_lowcore.ipl_parmblock_ptr;
- + src = S390_lowcore.ipl_parmblock_ptr;
- dst = (void *)IPL_PARMBLOCK_ORIGIN;
- memmove(dst, src, PAGE_SIZE);
- S390_lowcore.ipl_parmblock_ptr = IPL_PARMBLOCK_ORIGIN;
- @@ -2079,13 +2079,13 @@ void s390_reset_system(void (*fn_pre)(vo
- {
- struct _lowcore *lc;
- - lc = (struct _lowcore *)(unsigned long) store_prefix();
- + lc = store_prefix();
- /* Stack for interrupt/machine check handler */
- lc->panic_stack = S390_lowcore.panic_stack;
- /* Save prefix page address for dump case */
- - dump_prefix_page = (u32)(unsigned long) lc;
- + dump_prefix_page = lc;
- /* Disable prefixing */
- set_prefix(0);
- diff -u -p a/arch/mips/fw/arc/identify.c b/arch/mips/fw/arc/identify.c
- --- a/arch/mips/fw/arc/identify.c
- +++ b/arch/mips/fw/arc/identify.c
- @@ -106,7 +106,7 @@ void __init prom_identify_arch(void)
- iname = "Unknown";
- #endif
- } else
- - iname = (char *) (long) p->iname;
- + iname = p->iname;
- printk("ARCH: %s\n", iname);
- mach = string_to_mach(iname);
- diff -u -p a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
- --- a/arch/mips/kernel/traps.c
- +++ b/arch/mips/kernel/traps.c
- @@ -112,7 +112,7 @@ static void show_raw_backtrace(unsigned
- #endif
- while (!kstack_end(sp)) {
- unsigned long __user *p =
- - (unsigned long __user *)(unsigned long)sp++;
- + sp++;
- if (__get_user(addr, p)) {
- printk(" (Bad stack address)");
- break;
- diff -u -p a/arch/mips/kernel/perf_event_mipsxx.c b/arch/mips/kernel/perf_event_mipsxx.c
- --- a/arch/mips/kernel/perf_event_mipsxx.c
- +++ b/arch/mips/kernel/perf_event_mipsxx.c
- @@ -787,7 +787,7 @@ static int n_counters(void)
- static void reset_counters(void *arg)
- {
- - int counters = (int)(long)arg;
- + int counters = arg;
- switch (counters) {
- case 4:
- mipsxx_pmu_write_control(3, 0);
- diff -u -p a/arch/mips/oprofile/op_model_mipsxx.c b/arch/mips/oprofile/op_model_mipsxx.c
- --- a/arch/mips/oprofile/op_model_mipsxx.c
- +++ b/arch/mips/oprofile/op_model_mipsxx.c
- @@ -308,7 +308,7 @@ static inline int n_counters(void)
- static void reset_counters(void *arg)
- {
- - int counters = (int)(long)arg;
- + int counters = arg;
- switch (counters) {
- case 4:
- w_c0_perfctrl3(0);
- diff -u -p a/arch/mips/pci/ops-tx4927.c b/arch/mips/pci/ops-tx4927.c
- --- a/arch/mips/pci/ops-tx4927.c
- +++ b/arch/mips/pci/ops-tx4927.c
- @@ -473,7 +473,7 @@ irqreturn_t tx4927_pcierr_interrupt(int
- {
- struct pt_regs *regs = get_irq_regs();
- struct tx4927_pcic_reg __iomem *pcicptr =
- - (struct tx4927_pcic_reg __iomem *)(unsigned long)dev_id;
- + dev_id;
- if (txx9_pci_err_action != TXX9_PCI_ERR_IGNORE) {
- printk(KERN_WARNING "PCIERR interrupt at 0x%0*lx\n",
- diff -u -p a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
- --- a/arch/mips/kvm/mips.c
- +++ b/arch/mips/kvm/mips.c
- @@ -604,11 +604,11 @@ static int kvm_mips_get_reg(struct kvm_v
- return -EINVAL;
- }
- if ((reg->id & KVM_REG_SIZE_MASK) == KVM_REG_SIZE_U64) {
- - u64 __user *uaddr64 = (u64 __user *)(long)reg->addr;
- + u64 __user *uaddr64 = reg->addr;
- return put_user(v, uaddr64);
- } else if ((reg->id & KVM_REG_SIZE_MASK) == KVM_REG_SIZE_U32) {
- - u32 __user *uaddr32 = (u32 __user *)(long)reg->addr;
- + u32 __user *uaddr32 = reg->addr;
- u32 v32 = (u32)v;
- return put_user(v32, uaddr32);
- @@ -624,12 +624,12 @@ static int kvm_mips_set_reg(struct kvm_v
- u64 v;
- if ((reg->id & KVM_REG_SIZE_MASK) == KVM_REG_SIZE_U64) {
- - u64 __user *uaddr64 = (u64 __user *)(long)reg->addr;
- + u64 __user *uaddr64 = reg->addr;
- if (get_user(v, uaddr64) != 0)
- return -EFAULT;
- } else if ((reg->id & KVM_REG_SIZE_MASK) == KVM_REG_SIZE_U32) {
- - u32 __user *uaddr32 = (u32 __user *)(long)reg->addr;
- + u32 __user *uaddr32 = reg->addr;
- s32 v32;
- if (get_user(v32, uaddr32) != 0)
- diff -u -p a/arch/mips/dec/prom/init.c b/arch/mips/dec/prom/init.c
- --- a/arch/mips/dec/prom/init.c
- +++ b/arch/mips/dec/prom/init.c
- @@ -52,25 +52,25 @@ void __init which_prom(s32 magic, s32 *p
- * Set up prom abstraction structure with REX entry points.
- */
- __rex_bootinit =
- - (void *)(long)*(prom_vec + REX_PROM_BOOTINIT);
- + *(prom_vec + REX_PROM_BOOTINIT);
- __rex_bootread =
- - (void *)(long)*(prom_vec + REX_PROM_BOOTREAD);
- + *(prom_vec + REX_PROM_BOOTREAD);
- __rex_getbitmap =
- - (void *)(long)*(prom_vec + REX_PROM_GETBITMAP);
- + *(prom_vec + REX_PROM_GETBITMAP);
- __prom_getchar =
- - (void *)(long)*(prom_vec + REX_PROM_GETCHAR);
- + *(prom_vec + REX_PROM_GETCHAR);
- __prom_getenv =
- - (void *)(long)*(prom_vec + REX_PROM_GETENV);
- + *(prom_vec + REX_PROM_GETENV);
- __rex_getsysid =
- - (void *)(long)*(prom_vec + REX_PROM_GETSYSID);
- + *(prom_vec + REX_PROM_GETSYSID);
- __rex_gettcinfo =
- - (void *)(long)*(prom_vec + REX_PROM_GETTCINFO);
- + *(prom_vec + REX_PROM_GETTCINFO);
- __prom_printf =
- - (void *)(long)*(prom_vec + REX_PROM_PRINTF);
- + *(prom_vec + REX_PROM_PRINTF);
- __rex_slot_address =
- - (void *)(long)*(prom_vec + REX_PROM_SLOTADDR);
- + *(prom_vec + REX_PROM_SLOTADDR);
- __rex_clear_cache =
- - (void *)(long)*(prom_vec + REX_PROM_CLEARCACHE);
- + *(prom_vec + REX_PROM_CLEARCACHE);
- } else {
- /*
- * Set up prom abstraction structure with non-REX entry points.
- diff -u -p a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
- --- a/arch/x86/platform/efi/efi.c
- +++ b/arch/x86/platform/efi/efi.c
- @@ -263,7 +263,7 @@ static int __init efi_systab_init(void *
- (void *)(unsigned long)data->runtime :
- (void *)(unsigned long)systab64->runtime;
- tmp |= data ? data->runtime : systab64->runtime;
- - efi_systab.boottime = (void *)(unsigned long)systab64->boottime;
- + efi_systab.boottime = systab64->boottime;
- tmp |= systab64->boottime;
- efi_systab.nr_tables = systab64->nr_tables;
- efi_systab.tables = data ? (unsigned long)data->tables :
- @@ -298,8 +298,8 @@ static int __init efi_systab_init(void *
- efi_systab.con_out = systab32->con_out;
- efi_systab.stderr_handle = systab32->stderr_handle;
- efi_systab.stderr = systab32->stderr;
- - efi_systab.runtime = (void *)(unsigned long)systab32->runtime;
- - efi_systab.boottime = (void *)(unsigned long)systab32->boottime;
- + efi_systab.runtime = systab32->runtime;
- + efi_systab.boottime = systab32->boottime;
- efi_systab.nr_tables = systab32->nr_tables;
- efi_systab.tables = systab32->tables;
- @@ -342,8 +342,7 @@ static int __init efi_runtime_init32(voi
- * via the virtual mapping.
- */
- efi_phys.set_virtual_address_map =
- - (efi_set_virtual_address_map_t *)
- - (unsigned long)runtime->set_virtual_address_map;
- + runtime->set_virtual_address_map;
- early_memunmap(runtime, sizeof(efi_runtime_services_32_t));
- return 0;
- @@ -366,8 +365,7 @@ static int __init efi_runtime_init64(voi
- * via the virtual mapping.
- */
- efi_phys.set_virtual_address_map =
- - (efi_set_virtual_address_map_t *)
- - (unsigned long)runtime->set_virtual_address_map;
- + runtime->set_virtual_address_map;
- early_memunmap(runtime, sizeof(efi_runtime_services_64_t));
- return 0;
- @@ -560,7 +558,7 @@ void __init old_map_region(efi_memory_de
- va = efi_ioremap(md->phys_addr, size,
- md->type, md->attribute);
- - md->virt_addr = (u64) (unsigned long) va;
- + md->virt_addr = va;
- if (!va)
- pr_err("ioremap of 0x%llX failed!\n",
- (unsigned long long)md->phys_addr);
- @@ -606,10 +604,10 @@ static void __init get_systab_virt_addr(
- size = md->num_pages << EFI_PAGE_SHIFT;
- end = md->phys_addr + size;
- - systab = (u64)(unsigned long)efi_phys.systab;
- + systab = efi_phys.systab;
- if (md->phys_addr <= systab && systab < end) {
- systab += md->virt_addr - md->phys_addr;
- - efi.systab = (efi_system_table_t *)(unsigned long)systab;
- + efi.systab = systab;
- }
- }
- diff -u -p a/arch/x86/kernel/cpu/perf_event_intel_ds.c b/arch/x86/kernel/cpu/perf_event_intel_ds.c
- --- a/arch/x86/kernel/cpu/perf_event_intel_ds.c
- +++ b/arch/x86/kernel/cpu/perf_event_intel_ds.c
- @@ -275,7 +275,7 @@ static int alloc_pebs_buffer(int cpu)
- max = PEBS_BUFFER_SIZE / x86_pmu.pebs_record_size;
- - ds->pebs_buffer_base = (u64)(unsigned long)buffer;
- + ds->pebs_buffer_base = buffer;
- ds->pebs_index = ds->pebs_buffer_base;
- ds->pebs_absolute_maximum = ds->pebs_buffer_base +
- max * x86_pmu.pebs_record_size;
- @@ -319,7 +319,7 @@ static int alloc_bts_buffer(int cpu)
- max = BTS_BUFFER_SIZE / BTS_RECORD_SIZE;
- thresh = max / 16;
- - ds->bts_buffer_base = (u64)(unsigned long)buffer;
- + ds->bts_buffer_base = buffer;
- ds->bts_index = ds->bts_buffer_base;
- ds->bts_absolute_maximum = ds->bts_buffer_base +
- max * BTS_RECORD_SIZE;
- @@ -511,8 +511,8 @@ int intel_pmu_drain_bts_buffer(void)
- if (!x86_pmu.bts_active)
- return 0;
- - at = (struct bts_record *)(unsigned long)ds->bts_buffer_base;
- - top = (struct bts_record *)(unsigned long)ds->bts_index;
- + at = ds->bts_buffer_base;
- + top = ds->bts_index;
- if (top <= at)
- return 0;
- @@ -959,8 +959,8 @@ static void intel_pmu_drain_pebs_core(st
- if (!x86_pmu.pebs_active)
- return;
- - at = (struct pebs_record_core *)(unsigned long)ds->pebs_buffer_base;
- - top = (struct pebs_record_core *)(unsigned long)ds->pebs_index;
- + at = ds->pebs_buffer_base;
- + top = ds->pebs_index;
- /*
- * Whatever else happens, drain the thing
- @@ -1001,8 +1001,8 @@ static void intel_pmu_drain_pebs_nhm(str
- if (!x86_pmu.pebs_active)
- return;
- - at = (struct pebs_record_nhm *)(unsigned long)ds->pebs_buffer_base;
- - top = (struct pebs_record_nhm *)(unsigned long)ds->pebs_index;
- + at = ds->pebs_buffer_base;
- + top = ds->pebs_index;
- ds->pebs_index = ds->pebs_buffer_base;
- diff -u -p a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
- --- a/arch/x86/boot/compressed/eboot.c
- +++ b/arch/x86/boot/compressed/eboot.c
- @@ -204,7 +204,7 @@ static inline efi_status_t __open_volume
- efi_file_handle_32_t *fh;
- efi_guid_t fs_proto = EFI_FILE_SYSTEM_GUID;
- efi_status_t status;
- - void *handle = (void *)(unsigned long)image->device_handle;
- + void *handle = image->device_handle;
- unsigned long func;
- status = efi_call_early(handle_protocol, handle,
- @@ -230,7 +230,7 @@ static inline efi_status_t __open_volume
- efi_file_handle_64_t *fh;
- efi_guid_t fs_proto = EFI_FILE_SYSTEM_GUID;
- efi_status_t status;
- - void *handle = (void *)(unsigned long)image->device_handle;
- + void *handle = image->device_handle;
- unsigned long func;
- status = efi_call_early(handle_protocol, handle,
- @@ -269,7 +269,7 @@ void efi_char16_printk(efi_system_table_
- offset = offsetof(typeof(*out), output_string);
- output_string = efi_early->text_output + offset;
- - out = (typeof(out))(unsigned long)efi_early->text_output;
- + out = efi_early->text_output;
- func = (u64 *)output_string;
- efi_early->call(*func, out, str);
- @@ -279,7 +279,7 @@ void efi_char16_printk(efi_system_table_
- offset = offsetof(typeof(*out), output_string);
- output_string = efi_early->text_output + offset;
- - out = (typeof(out))(unsigned long)efi_early->text_output;
- + out = efi_early->text_output;
- func = (u32 *)output_string;
- efi_early->call(*func, out, str);
- @@ -378,16 +378,16 @@ setup_efi_pci32(struct boot_params *para
- {
- efi_pci_io_protocol_32 *pci = NULL;
- efi_guid_t pci_proto = EFI_PCI_IO_PROTOCOL_GUID;
- - u32 *handles = (u32 *)(unsigned long)pci_handle;
- + u32 *handles = pci_handle;
- efi_status_t status;
- unsigned long nr_pci;
- struct setup_data *data;
- int i;
- - data = (struct setup_data *)(unsigned long)params->hdr.setup_data;
- + data = params->hdr.setup_data;
- while (data && data->next)
- - data = (struct setup_data *)(unsigned long)data->next;
- + data = data->next;
- nr_pci = size / sizeof(u32);
- for (i = 0; i < nr_pci; i++) {
- @@ -485,16 +485,16 @@ setup_efi_pci64(struct boot_params *para
- {
- efi_pci_io_protocol_64 *pci = NULL;
- efi_guid_t pci_proto = EFI_PCI_IO_PROTOCOL_GUID;
- - u64 *handles = (u64 *)(unsigned long)pci_handle;
- + u64 *handles = pci_handle;
- efi_status_t status;
- unsigned long nr_pci;
- struct setup_data *data;
- int i;
- - data = (struct setup_data *)(unsigned long)params->hdr.setup_data;
- + data = params->hdr.setup_data;
- while (data && data->next)
- - data = (struct setup_data *)(unsigned long)data->next;
- + data = data->next;
- nr_pci = size / sizeof(u64);
- for (i = 0; i < nr_pci; i++) {
- @@ -654,7 +654,7 @@ setup_gop32(struct screen_info *si, efi_
- struct efi_pixel_bitmask pixel_info;
- int pixel_format;
- efi_status_t status;
- - u32 *handles = (u32 *)(unsigned long)gop_handle;
- + u32 *handles = gop_handle;
- int i;
- first_gop = NULL;
- @@ -757,7 +757,7 @@ setup_gop64(struct screen_info *si, efi_
- struct efi_pixel_bitmask pixel_info;
- int pixel_format;
- efi_status_t status;
- - u64 *handles = (u64 *)(unsigned long)gop_handle;
- + u64 *handles = gop_handle;
- int i;
- first_gop = NULL;
- @@ -1058,8 +1058,8 @@ struct boot_params *make_boot_params(str
- unsigned long ramdisk_size;
- efi_early = c;
- - sys_table = (efi_system_table_t *)(unsigned long)efi_early->table;
- - handle = (void *)(unsigned long)efi_early->image_handle;
- + sys_table = efi_early->table;
- + handle = efi_early->image_handle;
- /* Check if we were booted by the EFI firmware */
- if (sys_table->hdr.signature != EFI_SYSTEM_TABLE_SIGNATURE)
- @@ -1162,10 +1162,10 @@ static void add_e820ext(struct boot_para
- e820ext->len = nr_entries * sizeof(struct e820entry);
- e820ext->next = 0;
- - data = (struct setup_data *)(unsigned long)params->hdr.setup_data;
- + data = params->hdr.setup_data;
- while (data && data->next)
- - data = (struct setup_data *)(unsigned long)data->next;
- + data = data->next;
- if (data)
- data->next = (unsigned long)e820ext;
- @@ -1391,8 +1391,8 @@ struct boot_params *efi_main(struct efi_
- efi_early = c;
- - _table = (efi_system_table_t *)(unsigned long)efi_early->table;
- - handle = (void *)(unsigned long)efi_early->image_handle;
- + _table = efi_early->table;
- + handle = efi_early->image_handle;
- is64 = efi_early->is64;
- sys_table = _table;
- diff -u -p a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
- --- a/arch/powerpc/kernel/signal_32.c
- +++ b/arch/powerpc/kernel/signal_32.c
- @@ -1084,7 +1084,7 @@ static int do_setcontext(struct ucontext
- if (__get_user(cmcp, &ucp->uc_regs))
- return -EFAULT;
- - mcp = (struct mcontext __user *)(u64)cmcp;
- + mcp = cmcp;
- /* no need to check access_ok(mcp), since mcp < 4GB */
- }
- #else
- @@ -1117,8 +1117,8 @@ static int do_setcontext_tm(struct ucont
- if (__get_user(cmcp, &ucp->uc_regs) ||
- __get_user(tm_cmcp, &tm_ucp->uc_regs))
- return -EFAULT;
- - mcp = (struct mcontext __user *)(u64)cmcp;
- - tm_mcp = (struct mcontext __user *)(u64)tm_cmcp;
- + mcp = cmcp;
- + tm_mcp = tm_cmcp;
- /* no need to check access_ok(mcp), since mcp < 4GB */
- set_current_blocked(&set);
- @@ -1150,7 +1150,7 @@ long sys_swapcontext(struct ucontext __u
- */
- if (__get_user(cmcp, &new_ctx->uc_regs))
- return -EFAULT;
- - mcp = (struct mcontext __user *)(u64)cmcp;
- + mcp = cmcp;
- if (__get_user(new_msr, &mcp->mc_gregs[PT_MSR]))
- return -EFAULT;
- }
- @@ -1240,14 +1240,14 @@ long sys_rt_sigreturn(int r3, int r4, in
- #ifdef CONFIG_PPC_TRANSACTIONAL_MEM
- if (__get_user(tmp, &rt_sf->uc.uc_link))
- goto bad;
- - uc_transact = (struct ucontext __user *)(uintptr_t)tmp;
- + uc_transact = tmp;
- if (uc_transact) {
- u32 cmcp;
- struct mcontext __user *mcp;
- if (__get_user(cmcp, &uc_transact->uc_regs))
- return -EFAULT;
- - mcp = (struct mcontext __user *)(u64)cmcp;
- + mcp = cmcp;
- /* The top 32 bits of the MSR are stashed in the transactional
- * ucontext. */
- if (__get_user(msr_hi, &mcp->mc_gregs[PT_MSR]))
- @@ -1470,7 +1470,7 @@ int handle_signal32(struct ksignal *ksig
- regs->gpr[1] = newsp;
- regs->gpr[3] = ksig->sig;
- regs->gpr[4] = (unsigned long) sc;
- - regs->nip = (unsigned long) (unsigned long)ksig->ka.sa.sa_handler;
- + regs->nip = ksig->ka.sa.sa_handler;
- /* enter the signal handler in big-endian mode */
- regs->msr &= ~MSR_LE;
- return 0;
- diff -u -p a/arch/powerpc/perf/callchain.c b/arch/powerpc/perf/callchain.c
- --- a/arch/powerpc/perf/callchain.c
- +++ b/arch/powerpc/perf/callchain.c
- @@ -386,7 +386,7 @@ static int sane_signal_32_frame(unsigned
- struct signal_frame_32 __user *sf;
- unsigned int regs;
- - sf = (struct signal_frame_32 __user *) (unsigned long) sp;
- + sf = sp;
- if (read_user_stack_32((unsigned int __user *) &sf->sctx.regs, ®s))
- return 0;
- return regs == (unsigned long) &sf->mctx;
- @@ -397,7 +397,7 @@ static int sane_rt_signal_32_frame(unsig
- struct rt_signal_frame_32 __user *sf;
- unsigned int regs;
- - sf = (struct rt_signal_frame_32 __user *) (unsigned long) sp;
- + sf = sp;
- if (read_user_stack_32((unsigned int __user *) &sf->uc.uc_regs, ®s))
- return 0;
- return regs == (unsigned long) &sf->uc.uc_mcontext;
- @@ -419,14 +419,14 @@ static unsigned int __user *signal_frame
- if (next_sp - sp >= sizeof(struct signal_frame_32) &&
- is_sigreturn_32_address(next_ip, sp) &&
- sane_signal_32_frame(sp)) {
- - sf = (struct signal_frame_32 __user *) (unsigned long) sp;
- + sf = sp;
- mctx = &sf->mctx;
- }
- if (!mctx && next_sp - sp >= sizeof(struct rt_signal_frame_32) &&
- is_rt_sigreturn_32_address(next_ip, sp) &&
- sane_rt_signal_32_frame(sp)) {
- - rt_sf = (struct rt_signal_frame_32 __user *) (unsigned long) sp;
- + rt_sf = sp;
- mctx = &rt_sf->uc.uc_mcontext;
- }
- @@ -450,7 +450,7 @@ static void perf_callchain_user_32(struc
- perf_callchain_store(entry, next_ip);
- while (entry->nr < PERF_MAX_STACK_DEPTH) {
- - fp = (unsigned int __user *) (unsigned long) sp;
- + fp = sp;
- if (!valid_user_sp(sp, 0) || read_user_stack_32(fp, &next_sp))
- return;
- if (level > 0 && read_user_stack_32(&fp[1], &next_ip))
- diff -u -p a/arch/powerpc/mm/mmu_context_nohash.c b/arch/powerpc/mm/mmu_context_nohash.c
- --- a/arch/powerpc/mm/mmu_context_nohash.c
- +++ b/arch/powerpc/mm/mmu_context_nohash.c
- @@ -373,7 +373,7 @@ void destroy_context(struct mm_struct *m
- static int mmu_context_cpu_notify(struct notifier_block *self,
- unsigned long action, void *hcpu)
- {
- - unsigned int cpu = (unsigned int)(long)hcpu;
- + unsigned int cpu = hcpu;
- /* We don't touch CPU 0 map, it's allocated at aboot and kept
- * around forever
- diff -u -p a/arch/powerpc/platforms/powermac/low_i2c.c b/arch/powerpc/platforms/powermac/low_i2c.c
- --- a/arch/powerpc/platforms/powermac/low_i2c.c
- +++ b/arch/powerpc/platforms/powermac/low_i2c.c
- @@ -1259,7 +1259,7 @@ static void* pmac_i2c_do_begin(struct pm
- }
- inst->bus = bus;
- inst->addr = pmac_i2c_get_dev_addr(func->node);
- - inst->quirks = (int)(long)func->driver_data;
- + inst->quirks = func->driver_data;
- return inst;
- }
- diff -u -p a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
- --- a/arch/powerpc/kvm/powerpc.c
- +++ b/arch/powerpc/kvm/powerpc.c
- @@ -740,14 +740,14 @@ static void kvmppc_complete_mmio_load(st
- switch (run->mmio.len) {
- #ifdef CONFIG_PPC64
- case 4:
- - gpr = (s64)(s32)gpr;
- + gpr = gpr;
- break;
- #endif
- case 2:
- - gpr = (s64)(s16)gpr;
- + gpr = gpr;
- break;
- case 1:
- - gpr = (s64)(s8)gpr;
- + gpr = gpr;
- break;
- }
- }
- @@ -1079,7 +1079,7 @@ static int kvm_vcpu_ioctl_enable_cap(str
- #if defined(CONFIG_KVM_E500V2) || defined(CONFIG_KVM_E500MC)
- case KVM_CAP_SW_TLB: {
- struct kvm_config_tlb cfg;
- - void __user *user_ptr = (void __user *)(uintptr_t)cap->args[0];
- + void __user *user_ptr = cap->args[0];
- r = -EFAULT;
- if (copy_from_user(&cfg, user_ptr, sizeof(cfg)))
- diff -u -p a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
- --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
- +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
- @@ -297,7 +297,7 @@ static void rq_cq_reap(struct svcxprt_rd
- atomic_inc(&rdma_stat_rq_poll);
- while ((ret = ib_poll_cq(xprt->sc_rq_cq, 1, &wc)) > 0) {
- - ctxt = (struct svc_rdma_op_ctxt *)(unsigned long)wc.wr_id;
- + ctxt = wc.wr_id;
- ctxt->wc_status = wc.status;
- ctxt->byte_len = wc.byte_len;
- svc_rdma_unmap_dma(ctxt);
- @@ -413,8 +413,7 @@ static void sq_cq_reap(struct svcxprt_rd
- atomic_dec(&xprt->sc_sq_count);
- wake_up(&xprt->sc_send_wait);
- - ctxt = (struct svc_rdma_op_ctxt *)
- - (unsigned long)wc->wr_id;
- + ctxt =wc->wr_id;
- if (ctxt)
- process_context(xprt, ctxt);
- @@ -537,7 +536,7 @@ int svc_rdma_post_recv(struct svcxprt_rd
- recv_wr.next = NULL;
- recv_wr.sg_list = &ctxt->sge[0];
- recv_wr.num_sge = ctxt->count;
- - recv_wr.wr_id = (u64)(unsigned long)ctxt;
- + recv_wr.wr_id = ctxt;
- svc_xprt_get(&xprt->sc_xprt);
- ret = ib_post_recv(xprt->sc_qp, &recv_wr, &bad_recv_wr);
- diff -u -p a/net/rds/rdma.c b/net/rds/rdma.c
- --- a/net/rds/rdma.c
- +++ b/net/rds/rdma.c
- @@ -514,7 +514,7 @@ int rds_rdma_extra_size(struct rds_rdma_
- unsigned int nr_pages;
- unsigned int i;
- - local_vec = (struct rds_iovec __user *)(unsigned long) args->local_vec_addr;
- + local_vec = args->local_vec_addr;
- /* figure out the number of pages in the vector */
- for (i = 0; i < args->nr_local; i++) {
- diff -u -p a/net/iucv/iucv.c b/net/iucv/iucv.c
- --- a/net/iucv/iucv.c
- +++ b/net/iucv/iucv.c
- @@ -1184,7 +1184,7 @@ int __iucv_message_receive(struct iucv_p
- }
- parm = iucv_param[smp_processor_id()];
- memset(parm, 0, sizeof(union iucv_param));
- - parm->db.ipbfadr1 = (u32)(addr_t) buffer;
- + parm->db.ipbfadr1 = buffer;
- parm->db.ipbfln1f = (u32) size;
- parm->db.ipmsgid = msg->id;
- parm->db.ippathid = path->pathid;
- @@ -1303,7 +1303,7 @@ int iucv_message_reply(struct iucv_path
- parm->dpl.iptrgcls = msg->class;
- memcpy(parm->dpl.iprmmsg, reply, min_t(size_t, size, 8));
- } else {
- - parm->db.ipbfadr1 = (u32)(addr_t) reply;
- + parm->db.ipbfadr1 = reply;
- parm->db.ipbfln1f = (u32) size;
- parm->db.ippathid = path->pathid;
- parm->db.ipflags1 = flags;
- @@ -1355,7 +1355,7 @@ int __iucv_message_send(struct iucv_path
- parm->dpl.ipmsgtag = msg->tag;
- memcpy(parm->dpl.iprmmsg, buffer, 8);
- } else {
- - parm->db.ipbfadr1 = (u32)(addr_t) buffer;
- + parm->db.ipbfadr1 = buffer;
- parm->db.ipbfln1f = (u32) size;
- parm->db.ippathid = path->pathid;
- parm->db.ipflags1 = flags | IUCV_IPNORPY;
- @@ -1439,7 +1439,7 @@ int iucv_message_send2way(struct iucv_pa
- parm->dpl.iptrgcls = msg->class;
- parm->dpl.ipsrccls = srccls;
- parm->dpl.ipmsgtag = msg->tag;
- - parm->dpl.ipbfadr2 = (u32)(addr_t) answer;
- + parm->dpl.ipbfadr2 = answer;
- parm->dpl.ipbfln2f = (u32) asize;
- memcpy(parm->dpl.iprmmsg, buffer, 8);
- } else {
- @@ -1448,9 +1448,9 @@ int iucv_message_send2way(struct iucv_pa
- parm->db.iptrgcls = msg->class;
- parm->db.ipsrccls = srccls;
- parm->db.ipmsgtag = msg->tag;
- - parm->db.ipbfadr1 = (u32)(addr_t) buffer;
- + parm->db.ipbfadr1 = buffer;
- parm->db.ipbfln1f = (u32) size;
- - parm->db.ipbfadr2 = (u32)(addr_t) answer;
- + parm->db.ipbfadr2 = answer;
- parm->db.ipbfln2f = (u32) asize;
- }
- rc = iucv_call_b2f0(IUCV_SEND, parm);
- diff -u -p a/net/core/filter.c b/net/core/filter.c
- --- a/net/core/filter.c
- +++ b/net/core/filter.c
- @@ -95,7 +95,7 @@ static u64 __skb_get_pay_offset(u64 ctx,
- static u64 __skb_get_nlattr(u64 ctx, u64 a, u64 x, u64 r4, u64 r5)
- {
- - struct sk_buff *skb = (struct sk_buff *)(unsigned long) ctx;
- + struct sk_buff *skb = ctx;
- struct nlattr *nla;
- if (skb_is_nonlinear(skb))
- @@ -116,7 +116,7 @@ static u64 __skb_get_nlattr(u64 ctx, u64
- static u64 __skb_get_nlattr_nest(u64 ctx, u64 a, u64 x, u64 r4, u64 r5)
- {
- - struct sk_buff *skb = (struct sk_buff *)(unsigned long) ctx;
- + struct sk_buff *skb = ctx;
- struct nlattr *nla;
- if (skb_is_nonlinear(skb))
- diff -u -p a/net/core/netprio_cgroup.c b/net/core/netprio_cgroup.c
- --- a/net/core/netprio_cgroup.c
- +++ b/net/core/netprio_cgroup.c
- @@ -214,7 +214,7 @@ static int update_netprio(const void *v,
- int err;
- struct socket *sock = sock_from_file(file, &err);
- if (sock)
- - sock->sk->sk_cgrp_prioidx = (u32)(unsigned long)v;
- + sock->sk->sk_cgrp_prioidx = v;
- return 0;
- }
- @@ -222,7 +222,7 @@ static void net_prio_attach(struct cgrou
- struct cgroup_taskset *tset)
- {
- struct task_struct *p;
- - void *v = (void *)(unsigned long)css->cgroup->id;
- + void *v = css->cgroup->id;
- cgroup_taskset_for_each(p, tset) {
- task_lock(p);
- diff -u -p a/tools/perf/util/trace-event-info.c b/tools/perf/util/trace-event-info.c
- --- a/tools/perf/util/trace-event-info.c
- +++ b/tools/perf/util/trace-event-info.c
- @@ -52,7 +52,7 @@ int bigendian(void)
- unsigned char str[] = { 0x1, 0x2, 0x3, 0x4, 0x0, 0x0, 0x0, 0x0};
- unsigned int *ptr;
- - ptr = (unsigned int *)(void *)str;
- + ptr = str;
- return *ptr == 0x01020304;
- }
- diff -u -p a/tools/lib/traceevent/plugin_cfg80211.c b/tools/lib/traceevent/plugin_cfg80211.c
- --- a/tools/lib/traceevent/plugin_cfg80211.c
- +++ b/tools/lib/traceevent/plugin_cfg80211.c
- @@ -7,7 +7,7 @@
- static unsigned long long
- process___le16_to_cpup(struct trace_seq *s, unsigned long long *args)
- {
- - uint16_t *val = (uint16_t *) (unsigned long) args[0];
- + uint16_t *val = args[0];
- return val ? (long long) le16toh(*val) : 0;
- }
- diff -u -p a/fs/affs/amigaffs.c b/fs/affs/amigaffs.c
- --- a/fs/affs/amigaffs.c
- +++ b/fs/affs/amigaffs.c
- @@ -150,7 +150,7 @@ affs_remove_link(struct dentry *dentry)
- if (!bh)
- goto done;
- - link_ino = (u32)(long)dentry->d_fsdata;
- + link_ino = dentry->d_fsdata;
- if (inode->i_ino == link_ino) {
- /* we can't remove the head of the link, as its blocknr is still used as ino,
- * so we remove the block of the first link instead.
- diff -u -p a/fs/affs/inode.c b/fs/affs/inode.c
- --- a/fs/affs/inode.c
- +++ b/fs/affs/inode.c
- @@ -391,7 +391,7 @@ affs_add_entry(struct inode *dir, struct
- }
- affs_fix_checksum(sb, bh);
- mark_buffer_dirty_inode(bh, inode);
- - dentry->d_fsdata = (void *)(long)bh->b_blocknr;
- + dentry->d_fsdata = bh->b_blocknr;
- affs_lock_dir(dir);
- retval = affs_insert_hash(dir, bh);
- diff -u -p a/fs/jfs/jfs_imap.c b/fs/jfs/jfs_imap.c
- --- a/fs/jfs/jfs_imap.c
- +++ b/fs/jfs/jfs_imap.c
- @@ -1274,8 +1274,8 @@ int diFree(struct inode *ip)
- *
- * It's not pretty, but it works.
- */
- - iplist[1] = (struct inode *) (size_t)iagno;
- - iplist[2] = (struct inode *) (size_t)extno;
- + iplist[1] = iagno;
- + iplist[2] = extno;
- rc = txCommit(tid, 1, &iplist[0], COMMIT_FORCE);
- diff -u -p a/fs/ext4/inode.c b/fs/ext4/inode.c
- --- a/fs/ext4/inode.c
- +++ b/fs/ext4/inode.c
- @@ -708,7 +708,7 @@ static int _ext4_get_block(struct inode
- bh->b_state = (bh->b_state & ~EXT4_MAP_FLAGS) | map.m_flags;
- if (IS_DAX(inode) && buffer_unwritten(bh) && !io_end) {
- bh->b_assoc_map = inode->i_mapping;
- - bh->b_private = (void *)(unsigned long)iblock;
- + bh->b_private = iblock;
- bh->b_end_io = ext4_end_io_unwritten;
- }
- if (io_end && io_end->flag & EXT4_IO_END_UNWRITTEN)
- @@ -2633,7 +2633,7 @@ static int ext4_da_write_end(struct file
- handle_t *handle = ext4_journal_current_handle();
- loff_t new_i_size;
- unsigned long start, end;
- - int write_mode = (int)(unsigned long)fsdata;
- + int write_mode = fsdata;
- if (write_mode == FALL_BACK_TO_NONDELALLOC)
- return ext4_write_end(file, mapping, pos,
- diff -u -p a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c
- --- a/scripts/kconfig/nconf.c
- +++ b/scripts/kconfig/nconf.c
- @@ -1169,7 +1169,7 @@ static void conf(struct menu *menu)
- case 'm':
- if (single_menu_mode)
- submenu->data =
- - (void *) (long) !submenu->data;
- + !submenu->data;
- else
- conf(submenu);
- break;
- diff -u -p a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c
- --- a/kernel/trace/trace_probe.c
- +++ b/kernel/trace/trace_probe.c
- @@ -376,7 +376,7 @@ static int parse_probe_arg(char *arg, co
- ret = regs_query_register_offset(arg + 1);
- if (ret >= 0) {
- f->fn = t->fetch[FETCH_MTD_reg];
- - f->data = (void *)(unsigned long)ret;
- + f->data = ret;
- ret = 0;
- }
- break;
- diff -u -p a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
- --- a/kernel/bpf/verifier.c
- +++ b/kernel/bpf/verifier.c
- @@ -1807,7 +1807,7 @@ static int replace_map_fd_with_map_ptr(s
- }
- /* store map pointer inside BPF_LD_IMM64 instruction */
- - insn[0].imm = (u32) (unsigned long) map;
- + insn[0].imm = map;
- insn[1].imm = ((u64) (unsigned long) map) >> 32;
- /* check whether we recorded this map already */
- @@ -1915,7 +1915,7 @@ int bpf_check(struct bpf_prog *prog, uni
- * and supplied buffer to store the verification trace
- */
- log_level = attr->log_level;
- - log_ubuf = (char __user *) (unsigned long) attr->log_buf;
- + log_ubuf = attr->log_buf;
- log_size = attr->log_size;
- log_len = 0;
- diff -u -p a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
- --- a/drivers/net/hyperv/netvsc.c
- +++ b/drivers/net/hyperv/netvsc.c
- @@ -625,7 +625,7 @@ static void netvsc_send_completion(struc
- int queue_sends;
- /* Get the send context */
- - nvsc_packet = (struct hv_netvsc_packet *)(unsigned long)
- + nvsc_packet =
- packet->trans_id;
- /* Notify the layer above us */
- @@ -742,8 +742,7 @@ int netvsc_send(struct hv_device *device
- msg_size = netvsc_copy_to_send_buf(net_device,
- section_index,
- packet);
- - skb = (struct sk_buff *)
- - (unsigned long)packet->send_completion_tid;
- + skb =packet->send_completion_tid;
- packet->page_buf_cnt = 0;
- }
- }
- diff -u -p a/drivers/net/ethernet/neterion/vxge/vxge-traffic.c b/drivers/net/ethernet/neterion/vxge/vxge-traffic.c
- --- a/drivers/net/ethernet/neterion/vxge/vxge-traffic.c
- +++ b/drivers/net/ethernet/neterion/vxge/vxge-traffic.c
- @@ -1477,7 +1477,7 @@ enum vxge_hw_status vxge_hw_fifo_txdl_re
- priv->alloc_frags = fifo->config->max_frags;
- priv->next_txdl_priv = NULL;
- - *txdl_priv = (void *)(size_t)txdp->host_control;
- + *txdl_priv = txdp->host_control;
- for (i = 0; i < fifo->config->max_frags; i++) {
- txdp = ((struct vxge_hw_fifo_txd *)*txdlh) + i;
- diff -u -p a/drivers/regulator/tps62360-regulator.c b/drivers/regulator/tps62360-regulator.c
- --- a/drivers/regulator/tps62360-regulator.c
- +++ b/drivers/regulator/tps62360-regulator.c
- @@ -371,7 +371,7 @@ static int tps62360_probe(struct i2c_cli
- dev_err(&client->dev, "Error: No device match found\n");
- return -ENODEV;
- }
- - chip_id = (int)(long)match->data;
- + chip_id = match->data;
- if (!pdata)
- pdata = of_get_tps62360_platform_data(&client->dev,
- &tps->desc);
- diff -u -p a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c
- --- a/drivers/vhost/vringh.c
- +++ b/drivers/vhost/vringh.c
- @@ -310,7 +310,7 @@ __vringh_iov(struct vringh *vrh, u16 i,
- slowrange = range;
- }
- - addr = (void *)(long)(a + range.offset);
- + addr = (a + range.offset);
- err = move_to_indirect(vrh, &up_next, &i, addr, &desc,
- &descs, &desc_max);
- if (err)
- @@ -351,7 +351,7 @@ __vringh_iov(struct vringh *vrh, u16 i,
- err = -EINVAL;
- goto fail;
- }
- - addr = (void *)(unsigned long)(vringh64_to_cpu(vrh, desc.addr) +
- + addr = (vringh64_to_cpu(vrh, desc.addr) +
- range.offset);
- if (unlikely(iov->used == (iov->max_num & ~VRINGH_IOV_ALLOCATED))) {
- diff -u -p a/drivers/staging/unisys/virthba/virthba.c b/drivers/staging/unisys/virthba/virthba.c
- --- a/drivers/staging/unisys/virthba/virthba.c
- +++ b/drivers/staging/unisys/virthba/virthba.c
- @@ -718,7 +718,6 @@ forward_vdiskmgmt_command(enum vdisk_mgm
- cmdrsp->vdiskmgmt.vdest.id = vdest->id;
- cmdrsp->vdiskmgmt.vdest.lun = vdest->lun;
- cmdrsp->vdiskmgmt.scsicmd =
- - (void *)(uintptr_t)
- add_scsipending_entry_with_wait(virthbainfo, CMD_VDISKMGMT_TYPE,
- (void *)cmdrsp);
- @@ -779,7 +778,6 @@ forward_taskmgmt_command(enum task_mgmt_
- cmdrsp->scsitaskmgmt.vdest.id = scsidev->id;
- cmdrsp->scsitaskmgmt.vdest.lun = scsidev->lun;
- cmdrsp->scsitaskmgmt.scsicmd =
- - (void *)(uintptr_t)
- add_scsipending_entry_with_wait(virthbainfo,
- CMD_SCSITASKMGMT_TYPE,
- (void *)cmdrsp);
- @@ -945,7 +943,7 @@ virthba_queue_command_lck(struct scsi_cm
- insert_location =
- add_scsipending_entry(virthbainfo, CMD_SCSI_TYPE, (void *)scsicmd);
- if (insert_location != -1) {
- - cmdrsp->scsi.scsicmd = (void *)(uintptr_t)insert_location;
- + cmdrsp->scsi.scsicmd = insert_location;
- } else {
- LOGERR("Queue is full. Returning busy.\n");
- kfree(cmdrsp);
- diff -u -p a/drivers/staging/comedi/drivers/ni_65xx.c b/drivers/staging/comedi/drivers/ni_65xx.c
- --- a/drivers/staging/comedi/drivers/ni_65xx.c
- +++ b/drivers/staging/comedi/drivers/ni_65xx.c
- @@ -708,7 +708,7 @@ static int ni_65xx_auto_attach(struct co
- s->insn_bits = ni_65xx_dio_insn_bits;
- /* the output ports always start after the input ports */
- - s->private = (void *)(unsigned long)board->num_di_ports;
- + s->private = board->num_di_ports;
- /*
- * Use the io_bits to handle the inverted outputs. Inverted
- diff -u -p a/drivers/staging/lustre/lustre/obdclass/cl_object.c b/drivers/staging/lustre/lustre/obdclass/cl_object.c
- --- a/drivers/staging/lustre/lustre/obdclass/cl_object.c
- +++ b/drivers/staging/lustre/lustre/obdclass/cl_object.c
- @@ -635,7 +635,7 @@ static inline void cl_env_attach(struct
- int rc;
- LASSERT(cle->ce_owner == NULL);
- - cle->ce_owner = (void *) (long) current->pid;
- + cle->ce_owner = current->pid;
- rc = cfs_hash_add_unique(cl_env_hash, cle->ce_owner,
- &cle->ce_node);
- LASSERT(rc == 0);
- diff -u -p a/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c b/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
- --- a/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
- +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
- @@ -1349,7 +1349,7 @@ static int ldlm_res_hash_dump(struct cfs
- struct hlist_node *hnode, void *arg)
- {
- struct ldlm_resource *res = cfs_hash_object(hs, hnode);
- - int level = (int)(unsigned long)arg;
- + int level = arg;
- lock_res(res);
- ldlm_resource_dump(level, res);
- diff -u -p a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
- --- a/drivers/platform/x86/hp-wmi.c
- +++ b/drivers/platform/x86/hp-wmi.c
- @@ -372,7 +372,7 @@ static bool hp_wmi_get_hw_state(enum hp_
- static int hp_wmi_rfkill2_set_block(void *data, bool blocked)
- {
- - int rfkill_id = (int)(long)data;
- + int rfkill_id = data;
- char buffer[4] = { 0x01, 0x00, rfkill_id, !blocked };
- if (hp_wmi_perform_query(HPWMI_WIRELESS2_QUERY, 1,
- diff -u -p a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
- --- a/drivers/gpu/drm/drm_ioc32.c
- +++ b/drivers/gpu/drm/drm_ioc32.c
- @@ -446,7 +446,7 @@ static int compat_drm_infobufs(struct fi
- return -EFAULT;
- count = req32.count;
- - to = (drm_buf_desc32_t __user *) (unsigned long)req32.list;
- + to = req32.list;
- if (count < 0)
- count = 0;
- if (count > 0
- @@ -510,7 +510,7 @@ static int compat_drm_mapbufs(struct fil
- if (copy_from_user(&req32, argp, sizeof(req32)))
- return -EFAULT;
- count = req32.count;
- - list32 = (void __user *)(unsigned long)req32.list;
- + list32 = req32.list;
- if (count < 0)
- return -EINVAL;
- diff -u -p a/drivers/gpu/drm/nouveau/nvif/object.c b/drivers/gpu/drm/nouveau/nvif/object.c
- --- a/drivers/gpu/drm/nouveau/nvif/object.c
- +++ b/drivers/gpu/drm/nouveau/nvif/object.c
- @@ -247,7 +247,7 @@ nvif_object_init(struct nvif_object *par
- ctor->ioctl.type = NVIF_IOCTL_V0_NEW;
- ctor->new.version = 0;
- ctor->new.route = NVIF_IOCTL_V0_ROUTE_NVIF;
- - ctor->new.token = (unsigned long)(void *)object;
- + ctor->new.token = object;
- ctor->new.handle = handle;
- ctor->new.oclass = oclass;
- diff -u -p a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
- --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
- +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
- @@ -2045,7 +2045,7 @@ int vmw_kms_update_layout_ioctl(struct d
- if (unlikely(!rects))
- return -ENOMEM;
- - user_rects = (void __user *)(unsigned long)arg->rects;
- + user_rects = arg->rects;
- ret = copy_from_user(rects, user_rects, rects_size);
- if (unlikely(ret != 0)) {
- DRM_ERROR("Failed to get rects.\n");
- diff -u -p a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
- --- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c
- +++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
- @@ -419,7 +419,7 @@ int vidi_connection_ioctl(struct drm_dev
- }
- if (vidi->connection) {
- - struct edid *raw_edid = (struct edid *)(uint32_t)vidi->edid;
- + struct edid *raw_edid = vidi->edid;
- if (!drm_edid_is_valid(raw_edid)) {
- DRM_DEBUG_KMS("edid data is invalid.\n");
- return -EINVAL;
- diff -u -p a/drivers/gpu/drm/exynos/exynos_drm_g2d.c b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
- --- a/drivers/gpu/drm/exynos/exynos_drm_g2d.c
- +++ b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
- @@ -1175,7 +1175,7 @@ int exynos_g2d_set_cmdlist_ioctl(struct
- goto err_free_event;
- }
- - cmd = (struct drm_exynos_g2d_cmd *)(uint32_t)req->cmd;
- + cmd = req->cmd;
- if (copy_from_user(cmdlist->data + cmdlist->last,
- (void __user *)cmd,
- @@ -1193,7 +1193,7 @@ int exynos_g2d_set_cmdlist_ioctl(struct
- if (req->cmd_buf_nr) {
- struct drm_exynos_g2d_cmd *cmd_buf;
- - cmd_buf = (struct drm_exynos_g2d_cmd *)(uint32_t)req->cmd_buf;
- + cmd_buf = req->cmd_buf;
- if (copy_from_user(cmdlist->data + cmdlist->last,
- (void __user *)cmd_buf,
- diff -u -p a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
- --- a/drivers/gpu/drm/tegra/drm.c
- +++ b/drivers/gpu/drm/tegra/drm.c
- @@ -320,11 +320,11 @@ int tegra_drm_submit(struct tegra_drm_co
- unsigned int num_relocs = args->num_relocs;
- unsigned int num_waitchks = args->num_waitchks;
- struct drm_tegra_cmdbuf __user *cmdbufs =
- - (void __user *)(uintptr_t)args->cmdbufs;
- + args->cmdbufs;
- struct drm_tegra_reloc __user *relocs =
- - (void __user *)(uintptr_t)args->relocs;
- + args->relocs;
- struct drm_tegra_waitchk __user *waitchks =
- - (void __user *)(uintptr_t)args->waitchks;
- + args->waitchks;
- struct drm_tegra_syncpt syncpt;
- struct host1x_job *job;
- int err;
- diff -u -p a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c
- --- a/drivers/gpu/drm/radeon/radeon_cp.c
- +++ b/drivers/gpu/drm/radeon/radeon_cp.c
- @@ -1351,11 +1351,11 @@ static int radeon_do_init_cp(struct drm_
- #endif
- {
- dev_priv->cp_ring->handle =
- - (void *)(unsigned long)dev_priv->cp_ring->offset;
- + dev_priv->cp_ring->offset;
- dev_priv->ring_rptr->handle =
- - (void *)(unsigned long)dev_priv->ring_rptr->offset;
- + dev_priv->ring_rptr->offset;
- dev->agp_buffer_map->handle =
- - (void *)(unsigned long)dev->agp_buffer_map->offset;
- + dev->agp_buffer_map->offset;
- DRM_DEBUG("dev_priv->cp_ring->handle %p\n",
- dev_priv->cp_ring->handle);
- diff -u -p a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
- --- a/drivers/gpu/drm/radeon/radeon_cs.c
- +++ b/drivers/gpu/drm/radeon/radeon_cs.c
- @@ -274,7 +274,7 @@ int radeon_cs_parser_init(struct radeon_
- if (p->chunks_array == NULL) {
- return -ENOMEM;
- }
- - chunk_array_ptr = (uint64_t *)(unsigned long)(cs->chunks);
- + chunk_array_ptr = (cs->chunks);
- if (copy_from_user(p->chunks_array, chunk_array_ptr,
- sizeof(uint64_t)*cs->num_chunks)) {
- return -EFAULT;
- @@ -290,7 +290,7 @@ int radeon_cs_parser_init(struct radeon_
- struct drm_radeon_cs_chunk user_chunk;
- uint32_t __user *cdata;
- - chunk_ptr = (void __user*)(unsigned long)p->chunks_array[i];
- + chunk_ptr = p->chunks_array[i];
- if (copy_from_user(&user_chunk, chunk_ptr,
- sizeof(struct drm_radeon_cs_chunk))) {
- return -EFAULT;
- @@ -319,7 +319,7 @@ int radeon_cs_parser_init(struct radeon_
- }
- size = p->chunks[i].length_dw;
- - cdata = (void __user *)(unsigned long)user_chunk.chunk_data;
- + cdata = user_chunk.chunk_data;
- p->chunks[i].user_ptr = cdata;
- if (user_chunk.chunk_id == RADEON_CHUNK_ID_CONST_IB)
- continue;
- diff -u -p a/drivers/gpu/drm/radeon/r300_cmdbuf.c b/drivers/gpu/drm/radeon/r300_cmdbuf.c
- --- a/drivers/gpu/drm/radeon/r300_cmdbuf.c
- +++ b/drivers/gpu/drm/radeon/r300_cmdbuf.c
- @@ -922,7 +922,7 @@ static int r300_scratch(drm_radeon_priva
- ptr_addr = drm_buffer_read_object(cmdbuf->buffer,
- sizeof(stack_ptr_addr), &stack_ptr_addr);
- - ref_age_base = (u32 *)(unsigned long)get_unaligned(ptr_addr);
- + ref_age_base = get_unaligned(ptr_addr);
- for (i=0; i < header.scratch.n_bufs; i++) {
- buf_idx = drm_buffer_pointer_to_dword(cmdbuf->buffer, 0);
- diff -u -p a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
- --- a/drivers/s390/cio/cio.c
- +++ b/drivers/s390/cio/cio.c
- @@ -136,7 +136,7 @@ cio_start_key (struct subchannel *sch, /
- memset(orb, 0, sizeof(union orb));
- /* sch is always under 2G. */
- - orb->cmd.intparm = (u32)(addr_t)sch;
- + orb->cmd.intparm = sch;
- orb->cmd.fmt = 1;
- orb->cmd.pfch = priv->options.prefetch == 0;
- @@ -564,7 +564,7 @@ static irqreturn_t do_cio_interrupt(int
- set_cpu_flag(CIF_NOHZ_DELAY);
- tpi_info = (struct tpi_info *) &get_irq_regs()->int_code;
- irb = this_cpu_ptr(&cio_irb);
- - sch = (struct subchannel *)(unsigned long) tpi_info->intparm;
- + sch = tpi_info->intparm;
- if (!sch) {
- /* Clear pending interrupt condition. */
- inc_irq_stat(IRQIO_CIO);
- @@ -690,7 +690,7 @@ struct subchannel *cio_probe_console(voi
- lockdep_set_class(sch->lock, &console_sch_key);
- isc_register(CONSOLE_ISC);
- sch->config.isc = CONSOLE_ISC;
- - sch->config.intparm = (u32)(addr_t)sch;
- + sch->config.intparm = sch;
- ret = cio_commit_config(sch);
- if (ret) {
- isc_unregister(CONSOLE_ISC);
- @@ -979,11 +979,11 @@ int cio_tm_start_key(struct subchannel *
- union orb *orb = &to_io_private(sch)->orb;
- memset(orb, 0, sizeof(union orb));
- - orb->tm.intparm = (u32) (addr_t) sch;
- + orb->tm.intparm = sch;
- orb->tm.key = key >> 4;
- orb->tm.b = 1;
- orb->tm.lpm = lpm ? lpm : sch->lpm;
- - orb->tm.tcw = (u32) (addr_t) tcw;
- + orb->tm.tcw = tcw;
- cc = ssch(sch->schid, orb);
- switch (cc) {
- case 0:
- diff -u -p a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
- --- a/drivers/s390/block/dasd.c
- +++ b/drivers/s390/block/dasd.c
- @@ -3738,11 +3738,11 @@ static struct dasd_ccw_req *dasd_generic
- ccw->cmd_code = CCW_CMD_RDC;
- if (idal_is_needed(rdc_buffer, rdc_buffer_size)) {
- idaw = (unsigned long *) (cqr->data);
- - ccw->cda = (__u32)(addr_t) idaw;
- + ccw->cda = idaw;
- ccw->flags = CCW_FLAG_IDA;
- idaw = idal_create_words(idaw, rdc_buffer, rdc_buffer_size);
- } else {
- - ccw->cda = (__u32)(addr_t) rdc_buffer;
- + ccw->cda = rdc_buffer;
- ccw->flags = 0;
- }
- diff -u -p a/drivers/infiniband/hw/cxgb3/iwch_provider.c b/drivers/infiniband/hw/cxgb3/iwch_provider.c
- --- a/drivers/infiniband/hw/cxgb3/iwch_provider.c
- +++ b/drivers/infiniband/hw/cxgb3/iwch_provider.c
- @@ -163,7 +163,7 @@ static struct ib_cq *iwch_create_cq(stru
- kfree(chp);
- return ERR_PTR(-EFAULT);
- }
- - chp->user_rptr_addr = (u32 __user *)(unsigned long)ureq.user_rptr_addr;
- + chp->user_rptr_addr = ureq.user_rptr_addr;
- }
- }
- diff -u -p a/drivers/infiniband/hw/amso1100/c2_rnic.c b/drivers/infiniband/hw/amso1100/c2_rnic.c
- --- a/drivers/infiniband/hw/amso1100/c2_rnic.c
- +++ b/drivers/infiniband/hw/amso1100/c2_rnic.c
- @@ -148,7 +148,7 @@ static int c2_rnic_query(struct c2_dev *
- goto bail1;
- reply =
- - (struct c2wr_rnic_query_rep *) (unsigned long) (vq_req->reply_msg);
- + (vq_req->reply_msg);
- if (!reply)
- err = -ENOMEM;
- else
- @@ -252,7 +252,7 @@ int c2_add_addr(struct c2_dev *c2dev, __
- goto bail1;
- reply =
- - (struct c2wr_rnic_setconfig_rep *) (unsigned long) (vq_req->reply_msg);
- + (vq_req->reply_msg);
- if (!reply) {
- err = -ENOMEM;
- goto bail1;
- @@ -314,7 +314,7 @@ int c2_del_addr(struct c2_dev *c2dev, __
- goto bail1;
- reply =
- - (struct c2wr_rnic_setconfig_rep *) (unsigned long) (vq_req->reply_msg);
- + (vq_req->reply_msg);
- if (!reply) {
- err = -ENOMEM;
- goto bail1;
- @@ -366,7 +366,7 @@ static int c2_rnic_open(struct c2_dev *c
- goto bail0;
- }
- - reply = (struct c2wr_rnic_open_rep *) (unsigned long) (vq_req->reply_msg);
- + reply = (vq_req->reply_msg);
- if (!reply) {
- err = -ENOMEM;
- goto bail0;
- @@ -418,7 +418,7 @@ static int c2_rnic_close(struct c2_dev *
- goto bail0;
- }
- - reply = (struct c2wr_rnic_close_rep *) (unsigned long) (vq_req->reply_msg);
- + reply = (vq_req->reply_msg);
- if (!reply) {
- err = -ENOMEM;
- goto bail0;
- diff -u -p a/drivers/infiniband/hw/amso1100/c2_intr.c b/drivers/infiniband/hw/amso1100/c2_intr.c
- --- a/drivers/infiniband/hw/amso1100/c2_intr.c
- +++ b/drivers/infiniband/hw/amso1100/c2_intr.c
- @@ -163,7 +163,7 @@ static void handle_vq(struct c2_dev *c2d
- /*
- * wakeup the waiter.
- */
- - req = (struct c2_vq_req *) (unsigned long) host_msg->context;
- + req = host_msg->context;
- if (req == NULL) {
- /*
- * We should never get here, as the adapter should
- @@ -207,7 +207,7 @@ static void handle_vq(struct c2_dev *c2d
- break;
- }
- - req->reply_msg = (u64) (unsigned long) (reply_msg);
- + req->reply_msg = (reply_msg);
- atomic_set(&req->reply_ready, 1);
- wake_up(&req->wait_object);
- diff -u -p a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c
- --- a/drivers/infiniband/hw/cxgb4/cm.c
- +++ b/drivers/infiniband/hw/cxgb4/cm.c
- @@ -3422,7 +3422,7 @@ static void passive_ofld_conn_reply(stru
- struct cpl_pass_accept_req *cpl;
- int ret;
- - rpl_skb = (struct sk_buff *)(unsigned long)req->cookie;
- + rpl_skb = req->cookie;
- BUG_ON(!rpl_skb);
- if (req->retval) {
- PDBG("%s passive open failure %d\n", __func__, req->retval);
- @@ -3897,7 +3897,7 @@ static int fw6_msg(struct c4iw_dev *dev,
- switch (rpl->type) {
- case FW6_TYPE_WR_RPL:
- ret = (int)((be64_to_cpu(rpl->data[0]) >> 8) & 0xff);
- - wr_waitp = (struct c4iw_wr_wait *)(__force unsigned long) rpl->data[1];
- + wr_waitp = rpl->data[1];
- PDBG("%s wr_waitp %p ret %u\n", __func__, wr_waitp, ret);
- if (wr_waitp)
- c4iw_wake_up(wr_waitp, ret ? -ret : 0);
- diff -u -p a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/mr.c
- --- a/drivers/infiniband/hw/mlx5/mr.c
- +++ b/drivers/infiniband/hw/mlx5/mr.c
- @@ -741,7 +741,7 @@ void mlx5_umr_cq_handler(struct ib_cq *c
- if (err == 0)
- break;
- - context = (struct mlx5_ib_umr_context *) (unsigned long) wc.wr_id;
- + context = wc.wr_id;
- context->status = wc.status;
- complete(&context->done);
- }
- @@ -803,7 +803,7 @@ static struct mlx5_ib_mr *reg_umr(struct
- }
- memset(&wr, 0, sizeof(wr));
- - wr.wr_id = (u64)(unsigned long)&umr_context;
- + wr.wr_id = &umr_context;
- prep_umr_reg_wqe(pd, &wr, &sg, dma, npages, mr->mmr.key, page_shift,
- virt_addr, len, access_flags);
- @@ -921,7 +921,7 @@ int mlx5_ib_update_mtt(struct mlx5_ib_mr
- dma_sync_single_for_device(ddev, dma, size, DMA_TO_DEVICE);
- memset(&wr, 0, sizeof(wr));
- - wr.wr_id = (u64)(unsigned long)&umr_context;
- + wr.wr_id = &umr_context;
- sg.addr = dma;
- sg.length = ALIGN(npages * sizeof(u64),
- @@ -1143,7 +1143,7 @@ static int unreg_umr(struct mlx5_ib_dev
- int err;
- memset(&wr, 0, sizeof(wr));
- - wr.wr_id = (u64)(unsigned long)&umr_context;
- + wr.wr_id = &umr_context;
- prep_umr_unreg_wqe(dev, &wr, mr->mmr.key);
- mlx5_ib_init_umr_context(&umr_context);
- diff -u -p a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c
- --- a/drivers/infiniband/hw/nes/nes_hw.c
- +++ b/drivers/infiniband/hw/nes/nes_hw.c
- @@ -3052,7 +3052,7 @@ static void nes_cqp_ce_handler(struct ne
- ((u64)(le32_to_cpu(cq->cq_vbase[head].
- cqe_words[NES_CQE_COMP_COMP_CTX_LOW_IDX])));
- - cqp_request = (struct nes_cqp_request *)(unsigned long)u64temp;
- + cqp_request = u64temp;
- if (cqp_request) {
- if (cqp_request->waiting) {
- /* nes_debug(NES_DBG_CQP, "%s: Waking up requestor\n"); */
- @@ -3392,7 +3392,7 @@ static void nes_terminate_connection(str
- return;
- }
- - nesqp = (struct nes_qp *)(unsigned long)context;
- + nesqp = context;
- spin_lock_irqsave(&nesqp->lock, flags);
- nesqp->hw_iwarp_state = iwarp_state;
- nesqp->hw_tcp_state = tcp_state;
- @@ -3521,7 +3521,7 @@ static void nes_terminate_received(struc
- /* Timeout routine in case terminate fails to complete */
- void nes_terminate_timeout(unsigned long context)
- {
- - struct nes_qp *nesqp = (struct nes_qp *)(unsigned long)context;
- + struct nes_qp *nesqp = context;
- nes_terminate_done(nesqp, 1);
- }
- @@ -3565,7 +3565,7 @@ static void nes_process_iwarp_aeqe(struc
- }
- /* context is nesqp unless async_event_id == CQ ERROR */
- - nesqp = (struct nes_qp *)(unsigned long)context;
- + nesqp = context;
- async_event_id = (u16)aeq_info;
- tcp_state = (aeq_info & NES_AEQE_TCP_STATE_MASK) >> NES_AEQE_TCP_STATE_SHIFT;
- iwarp_state = (aeq_info & NES_AEQE_IWARP_STATE_MASK) >> NES_AEQE_IWARP_STATE_SHIFT;
- @@ -3728,7 +3728,7 @@ static void nes_process_iwarp_aeqe(struc
- if (resource_allocated) {
- printk(KERN_ERR PFX "%s: Processing an NES_AEQE_AEID_CQ_OPERATION_ERROR event on CQ%u\n",
- __func__, le32_to_cpu(aeqe->aeqe_words[NES_AEQE_COMP_QP_CQ_ID_IDX]));
- - hw_cq = (struct nes_hw_cq *)(unsigned long)context;
- + hw_cq = context;
- if (hw_cq) {
- nescq = container_of(hw_cq, struct nes_cq, hw_cq);
- if (nescq->ibcq.event_handler) {
- diff -u -p a/drivers/infiniband/core/sa_query.c b/drivers/infiniband/core/sa_query.c
- --- a/drivers/infiniband/core/sa_query.c
- +++ b/drivers/infiniband/core/sa_query.c
- @@ -1133,7 +1133,7 @@ static void recv_handler(struct ib_mad_a
- struct ib_sa_query *query;
- struct ib_mad_send_buf *mad_buf;
- - mad_buf = (void *) (unsigned long) mad_recv_wc->wc->wr_id;
- + mad_buf = mad_recv_wc->wc->wr_id;
- query = mad_buf->context[0];
- if (query->callback) {
- diff -u -p a/drivers/infiniband/ulp/iser/iser_verbs.c b/drivers/infiniband/ulp/iser/iser_verbs.c
- --- a/drivers/infiniband/ulp/iser/iser_verbs.c
- +++ b/drivers/infiniband/ulp/iser/iser_verbs.c
- @@ -1201,7 +1201,7 @@ static void
- iser_handle_comp_error(struct ib_conn *ib_conn,
- struct ib_wc *wc)
- {
- - void *wr_id = (void *)(uintptr_t)wc->wr_id;
- + void *wr_id = wc->wr_id;
- struct iser_conn *iser_conn = container_of(ib_conn, struct iser_conn,
- ib_conn);
- @@ -1237,12 +1237,12 @@ static void iser_handle_wc(struct ib_wc
- ib_conn = wc->qp->qp_context;
- if (likely(wc->status == IB_WC_SUCCESS)) {
- if (wc->opcode == IB_WC_RECV) {
- - rx_desc = (struct iser_rx_desc *)(uintptr_t)wc->wr_id;
- + rx_desc = wc->wr_id;
- iser_rcv_completion(rx_desc, wc->byte_len,
- ib_conn);
- } else
- if (wc->opcode == IB_WC_SEND) {
- - tx_desc = (struct iser_tx_desc *)(uintptr_t)wc->wr_id;
- + tx_desc = wc->wr_id;
- iser_snd_completion(tx_desc, ib_conn);
- } else {
- iser_err("Unknown wc opcode %d\n", wc->opcode);
- diff -u -p a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c
- --- a/drivers/sbus/char/envctrl.c
- +++ b/drivers/sbus/char/envctrl.c
- @@ -665,7 +665,7 @@ envctrl_ioctl(struct file *file, unsigne
- case ENVCTRL_RD_ETHERNET_TEMPERATURE:
- case ENVCTRL_RD_SCSI_TEMPERATURE:
- case ENVCTRL_RD_GLOBALADDRESS:
- - file->private_data = (void *)(long)cmd;
- + file->private_data = cmd;
- break;
- case ENVCTRL_RD_CPU_TEMPERATURE:
- @@ -681,7 +681,7 @@ envctrl_ioctl(struct file *file, unsigne
- }
- /* Save the command for use when reading. */
- - file->private_data = (void *)(long)cmd;
- + file->private_data = cmd;
- break;
- default:
- diff -u -p a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c
- --- a/drivers/message/fusion/mptctl.c
- +++ b/drivers/message/fusion/mptctl.c
- @@ -2897,10 +2897,10 @@ compat_mpt_command(struct file *filp, un
- karg.maxSenseBytes = karg32.maxSenseBytes;
- karg.dataSgeOffset = karg32.dataSgeOffset;
- - karg.replyFrameBufPtr = (char __user *)(unsigned long)karg32.replyFrameBufPtr;
- - karg.dataInBufPtr = (char __user *)(unsigned long)karg32.dataInBufPtr;
- - karg.dataOutBufPtr = (char __user *)(unsigned long)karg32.dataOutBufPtr;
- - karg.senseDataPtr = (char __user *)(unsigned long)karg32.senseDataPtr;
- + karg.replyFrameBufPtr = karg32.replyFrameBufPtr;
- + karg.dataInBufPtr = karg32.dataInBufPtr;
- + karg.dataOutBufPtr = karg32.dataOutBufPtr;
- + karg.senseDataPtr = karg32.senseDataPtr;
- /* Pass new structure to do_mpt_command
- */
- diff -u -p a/drivers/isdn/hardware/eicon/os_bri.c b/drivers/isdn/hardware/eicon/os_bri.c
- --- a/drivers/isdn/hardware/eicon/os_bri.c
- +++ b/drivers/isdn/hardware/eicon/os_bri.c
- @@ -383,7 +383,7 @@ static int diva_bri_reregister_io(diva_o
- return (-1);
- }
- a->resources.pci.addr[i] =
- - (void *) (unsigned long) a->resources.pci.bar[i];
- + a->resources.pci.bar[i];
- }
- return (0);
- diff -u -p a/drivers/video/fbdev/s3fb.c b/drivers/video/fbdev/s3fb.c
- --- a/drivers/video/fbdev/s3fb.c
- +++ b/drivers/video/fbdev/s3fb.c
- @@ -1182,7 +1182,7 @@ static int s3_pci_probe(struct pci_dev *
- pcibios_bus_to_resource(dev->bus, &vga_res, &bus_reg);
- - par->state.vgabase = (void __iomem *) (unsigned long) vga_res.start;
- + par->state.vgabase = vga_res.start;
- /* Unlock regs */
- cr38 = vga_rcrt(par->state.vgabase, 0x38);
- diff -u -p a/drivers/media/dvb-frontends/stb0899_drv.c b/drivers/media/dvb-frontends/stb0899_drv.c
- --- a/drivers/media/dvb-frontends/stb0899_drv.c
- +++ b/drivers/media/dvb-frontends/stb0899_drv.c
- @@ -978,7 +978,7 @@ static int stb0899_read_signal_strength(
- if (STB0899_GETFIELD(VSTATUS_LOCKEDVIT, reg)) {
- reg = stb0899_read_reg(state, STB0899_AGCIQIN);
- - val = (s32)(s8)STB0899_GETFIELD(AGCIQVALUE, reg);
- + val = STB0899_GETFIELD(AGCIQVALUE, reg);
- *strength = stb0899_table_lookup(stb0899_dvbsrf_tab, ARRAY_SIZE(stb0899_dvbsrf_tab) - 1, val);
- *strength += 750;
- diff -u -p a/drivers/crypto/qat/qat_common/qat_algs.c b/drivers/crypto/qat/qat_common/qat_algs.c
- --- a/drivers/crypto/qat/qat_common/qat_algs.c
- +++ b/drivers/crypto/qat/qat_common/qat_algs.c
- @@ -828,7 +828,7 @@ void qat_alg_callback(void *resp)
- {
- struct icp_qat_fw_la_resp *qat_resp = resp;
- struct qat_crypto_request *qat_req =
- - (void *)(__force long)qat_resp->opaque_data;
- + qat_resp->opaque_data;
- qat_req->cb(qat_resp, qat_req);
- }
- @@ -855,7 +855,7 @@ static int qat_alg_aead_dec(struct aead_
- qat_req->aead_ctx = ctx;
- qat_req->aead_req = areq;
- qat_req->cb = qat_aead_alg_callback;
- - qat_req->req.comn_mid.opaque_data = (uint64_t)(__force long)qat_req;
- + qat_req->req.comn_mid.opaque_data = qat_req;
- qat_req->req.comn_mid.src_data_addr = qat_req->buf.blp;
- qat_req->req.comn_mid.dest_data_addr = qat_req->buf.bloutp;
- cipher_param = (void *)&qat_req->req.serv_specif_rqpars;
- @@ -899,7 +899,7 @@ static int qat_alg_aead_enc_internal(str
- qat_req->aead_ctx = ctx;
- qat_req->aead_req = areq;
- qat_req->cb = qat_aead_alg_callback;
- - qat_req->req.comn_mid.opaque_data = (uint64_t)(__force long)qat_req;
- + qat_req->req.comn_mid.opaque_data = qat_req;
- qat_req->req.comn_mid.src_data_addr = qat_req->buf.blp;
- qat_req->req.comn_mid.dest_data_addr = qat_req->buf.bloutp;
- cipher_param = (void *)&qat_req->req.serv_specif_rqpars;
- @@ -1027,7 +1027,7 @@ static int qat_alg_ablkcipher_encrypt(st
- qat_req->ablkcipher_ctx = ctx;
- qat_req->ablkcipher_req = req;
- qat_req->cb = qat_ablkcipher_alg_callback;
- - qat_req->req.comn_mid.opaque_data = (uint64_t)(__force long)qat_req;
- + qat_req->req.comn_mid.opaque_data = qat_req;
- qat_req->req.comn_mid.src_data_addr = qat_req->buf.blp;
- qat_req->req.comn_mid.dest_data_addr = qat_req->buf.bloutp;
- cipher_param = (void *)&qat_req->req.serv_specif_rqpars;
- @@ -1065,7 +1065,7 @@ static int qat_alg_ablkcipher_decrypt(st
- qat_req->ablkcipher_ctx = ctx;
- qat_req->ablkcipher_req = req;
- qat_req->cb = qat_ablkcipher_alg_callback;
- - qat_req->req.comn_mid.opaque_data = (uint64_t)(__force long)qat_req;
- + qat_req->req.comn_mid.opaque_data = qat_req;
- qat_req->req.comn_mid.src_data_addr = qat_req->buf.blp;
- qat_req->req.comn_mid.dest_data_addr = qat_req->buf.bloutp;
- cipher_param = (void *)&qat_req->req.serv_specif_rqpars;
- diff -u -p a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
- --- a/drivers/block/drbd/drbd_receiver.c
- +++ b/drivers/block/drbd/drbd_receiver.c
- @@ -1825,7 +1825,7 @@ find_request(struct drbd_device *device,
- struct drbd_request *req;
- /* Request object according to our peer */
- - req = (struct drbd_request *)(unsigned long)id;
- + req = id;
- if (drbd_contains_interval(root, sector, &req->i) && req->i.local)
- return req;
- if (!missing_ok) {
- diff -u -p a/drivers/block/aoe/aoechr.c b/drivers/block/aoe/aoechr.c
- --- a/drivers/block/aoe/aoechr.c
- +++ b/drivers/block/aoe/aoechr.c
- @@ -192,7 +192,7 @@ aoechr_open(struct inode *inode, struct
- mutex_lock(&aoechr_mutex);
- n = iminor(inode);
- - filp->private_data = (void *) (unsigned long) n;
- + filp->private_data = n;
- for (i = 0; i < ARRAY_SIZE(chardevs); ++i)
- if (chardevs[i].minor == n) {
- diff -u -p a/drivers/char/agp/uninorth-agp.c b/drivers/char/agp/uninorth-agp.c
- --- a/drivers/char/agp/uninorth-agp.c
- +++ b/drivers/char/agp/uninorth-agp.c
- @@ -329,7 +329,7 @@ static int agp_uninorth_suspend(struct p
- /* turn off AGP on the bridge */
- agp = pci_find_capability(pdev, PCI_CAP_ID_AGP);
- pci_read_config_dword(pdev, agp + PCI_AGP_COMMAND, &cmd);
- - bridge->dev_private_data = (void *)(long)cmd;
- + bridge->dev_private_data = cmd;
- if (cmd & PCI_AGP_COMMAND_AGP) {
- dev_info(&pdev->dev, "disabling AGP on bridge\n");
- cmd &= ~PCI_AGP_COMMAND_AGP;
- diff -u -p a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c
- --- a/drivers/usb/serial/visor.c
- +++ b/drivers/usb/serial/visor.c
- @@ -468,7 +468,7 @@ static int visor_probe(struct usb_serial
- static int visor_calc_num_ports(struct usb_serial *serial)
- {
- - int num_ports = (int)(long)(usb_get_serial_data(serial));
- + int num_ports = (usb_get_serial_data(serial));
- if (num_ports)
- usb_set_serial_data(serial, NULL);
- diff -u -p a/drivers/scsi/qla2xxx/qla_mr.c b/drivers/scsi/qla2xxx/qla_mr.c
- --- a/drivers/scsi/qla2xxx/qla_mr.c
- +++ b/drivers/scsi/qla2xxx/qla_mr.c
- @@ -3138,7 +3138,7 @@ qlafx00_start_scsi(srb_t *sp)
- req->current_outstanding_cmd = handle;
- req->outstanding_cmds[handle] = sp;
- sp->handle = handle;
- - cmd->host_scribble = (unsigned char *)(unsigned long)handle;
- + cmd->host_scribble = handle;
- req->cnt -= req_cnt;
- cmd_pkt = (struct cmd_type_7_fx00 *)req->ring_ptr;
- diff -u -p a/drivers/scsi/scsi_transport_sas.c b/drivers/scsi/scsi_transport_sas.c
- --- a/drivers/scsi/scsi_transport_sas.c
- +++ b/drivers/scsi/scsi_transport_sas.c
- @@ -331,7 +331,7 @@ static int sas_host_match(struct attribu
- static int do_sas_phy_delete(struct device *dev, void *data)
- {
- - int pass = (int)(unsigned long)data;
- + int pass = data;
- if (pass == 0 && scsi_is_sas_port(dev))
- sas_port_delete(dev_to_sas_port(dev));
- diff -u -p a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
- --- a/drivers/scsi/qla4xxx/ql4_os.c
- +++ b/drivers/scsi/qla4xxx/ql4_os.c
- @@ -9089,7 +9089,7 @@ struct srb *qla4xxx_del_from_active_arra
- ha->iocb_cnt -= srb->iocb_cnt;
- if (srb->cmd)
- srb->cmd->host_scribble =
- - (unsigned char *)(unsigned long) MAX_SRBS;
- + MAX_SRBS;
- }
- return srb;
- }
- diff -u -p a/arch/arm/kvm/guest.c b/arch/arm/kvm/guest.c
- --- a/arch/arm/kvm/guest.c
- +++ b/arch/arm/kvm/guest.c
- @@ -48,7 +48,7 @@ static u64 core_reg_offset_from_id(u64 i
- static int get_core_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)
- {
- - u32 __user *uaddr = (u32 __user *)(long)reg->addr;
- + u32 __user *uaddr = reg->addr;
- struct kvm_regs *regs = &vcpu->arch.regs;
- u64 off;
- @@ -65,7 +65,7 @@ static int get_core_reg(struct kvm_vcpu
- static int set_core_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)
- {
- - u32 __user *uaddr = (u32 __user *)(long)reg->addr;
- + u32 __user *uaddr = reg->addr;
- struct kvm_regs *regs = &vcpu->arch.regs;
- u64 off, val;
- @@ -156,7 +156,7 @@ static int copy_timer_indices(struct kvm
- static int set_timer_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)
- {
- - void __user *uaddr = (void __user *)(long)reg->addr;
- + void __user *uaddr = reg->addr;
- u64 val;
- int ret;
- @@ -169,7 +169,7 @@ static int set_timer_reg(struct kvm_vcpu
- static int get_timer_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)
- {
- - void __user *uaddr = (void __user *)(long)reg->addr;
- + void __user *uaddr = reg->addr;
- u64 val;
- val = kvm_arm_timer_get_reg(vcpu, reg->id);
- diff -u -p a/arch/sparc/kernel/sysfs.c b/arch/sparc/kernel/sysfs.c
- --- a/arch/sparc/kernel/sysfs.c
- +++ b/arch/sparc/kernel/sysfs.c
- @@ -249,7 +249,7 @@ static void unregister_cpu_online(unsign
- static int sysfs_cpu_notify(struct notifier_block *self,
- unsigned long action, void *hcpu)
- {
- - unsigned int cpu = (unsigned int)(long)hcpu;
- + unsigned int cpu = hcpu;
- switch (action) {
- case CPU_ONLINE:
- diff -u -p a/arch/s390/kernel/crash_dump.c b/arch/s390/kernel/crash_dump.c
- --- a/arch/s390/kernel/crash_dump.c
- +++ b/arch/s390/kernel/crash_dump.c
- @@ -659,7 +659,7 @@ void elfcorehdr_free(unsigned long long
- */
- ssize_t elfcorehdr_read(char *buf, size_t count, u64 *ppos)
- {
- - void *src = (void *)(unsigned long)*ppos;
- + void *src = *ppos;
- src = elfcorehdr_newmem ? src : src - OLDMEM_BASE;
- memcpy(buf, src, count);
- @@ -672,7 +672,7 @@ ssize_t elfcorehdr_read(char *buf, size_
- */
- ssize_t elfcorehdr_read_notes(char *buf, size_t count, u64 *ppos)
- {
- - void *src = (void *)(unsigned long)*ppos;
- + void *src = *ppos;
- int rc;
- if (elfcorehdr_newmem) {
- diff -u -p a/arch/s390/kernel/machine_kexec.c b/arch/s390/kernel/machine_kexec.c
- --- a/arch/s390/kernel/machine_kexec.c
- +++ b/arch/s390/kernel/machine_kexec.c
- @@ -58,7 +58,7 @@ static void setup_regs(void)
- int cpu, this_cpu;
- /* Get lowcore pointer from store status of this CPU (absolute zero) */
- - lc = (struct _lowcore *)(unsigned long)S390_lowcore.prefixreg_save_area;
- + lc = S390_lowcore.prefixreg_save_area;
- this_cpu = smp_find_processor_id(stap());
- add_elf_notes(this_cpu);
- for_each_online_cpu(cpu) {
- diff -u -p a/arch/s390/kernel/os_info.c b/arch/s390/kernel/os_info.c
- --- a/arch/s390/kernel/os_info.c
- +++ b/arch/s390/kernel/os_info.c
- @@ -34,8 +34,8 @@ u32 os_info_csum(struct os_info *os_info
- */
- void os_info_crashkernel_add(unsigned long base, unsigned long size)
- {
- - os_info.crashkernel_addr = (u64)(unsigned long)base;
- - os_info.crashkernel_size = (u64)(unsigned long)size;
- + os_info.crashkernel_addr = base;
- + os_info.crashkernel_size = size;
- os_info.csum = os_info_csum(&os_info);
- }
- @@ -44,7 +44,7 @@ void os_info_crashkernel_add(unsigned lo
- */
- void os_info_entry_add(int nr, void *ptr, u64 size)
- {
- - os_info.entry[nr].addr = (u64)(unsigned long)ptr;
- + os_info.entry[nr].addr = ptr;
- os_info.entry[nr].size = size;
- os_info.entry[nr].csum = csum_partial(ptr, size, 0);
- os_info.csum = os_info_csum(&os_info);
- @@ -98,7 +98,7 @@ static void os_info_old_alloc(int nr, in
- msg = "checksum failed";
- goto fail_free;
- }
- - os_info_old->entry[nr].addr = (u64)(unsigned long)buf_align;
- + os_info_old->entry[nr].addr = buf_align;
- msg = "copied";
- goto out;
- fail_free:
- diff -u -p a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
- --- a/arch/s390/kvm/kvm-s390.c
- +++ b/arch/s390/kvm/kvm-s390.c
- @@ -815,7 +815,7 @@ static int kvm_s390_apxa_installed(void)
- static void kvm_s390_set_crycb_format(struct kvm *kvm)
- {
- - kvm->arch.crypto.crycbd = (__u32)(unsigned long) kvm->arch.crypto.crycb;
- + kvm->arch.crypto.crycbd = kvm->arch.crypto.crycb;
- if (kvm_s390_apxa_installed())
- kvm->arch.crypto.crycbd |= CRYCB_FORMAT2;
- @@ -1202,10 +1202,10 @@ struct kvm_vcpu *kvm_arch_vcpu_create(st
- (__u64) vcpu->arch.sie_block;
- vcpu->arch.sie_block->scaoh =
- (__u32)(((__u64)kvm->arch.sca) >> 32);
- - vcpu->arch.sie_block->scaol = (__u32)(__u64)kvm->arch.sca;
- + vcpu->arch.sie_block->scaol = kvm->arch.sca;
- set_bit(63 - id, (unsigned long *) &kvm->arch.sca->mcn);
- }
- - vcpu->arch.sie_block->fac = (int) (long) kvm->arch.model.fac->list;
- + vcpu->arch.sie_block->fac = kvm->arch.model.fac->list;
- spin_lock_init(&vcpu->arch.local_int.lock);
- vcpu->arch.local_int.float_int = &kvm->arch.float_int;
- diff -u -p a/arch/mips/netlogic/xlr/setup.c b/arch/mips/netlogic/xlr/setup.c
- --- a/arch/mips/netlogic/xlr/setup.c
- +++ b/arch/mips/netlogic/xlr/setup.c
- @@ -107,7 +107,7 @@ static void __init build_arcs_cmdline(in
- remain = sizeof(arcs_cmdline) - 1;
- arcs_cmdline[0] = '\0';
- for (i = 0; argv[i] != 0; i++) {
- - arg = (char *)(long)argv[i];
- + arg = argv[i];
- len = strlen(arg);
- if (len + 1 > remain)
- break;
- @@ -147,7 +147,7 @@ static void prom_add_memory(void)
- u64 pref_backup = 512; /* avoid pref walking beyond end */
- int i;
- - bootm = (void *)(long)nlm_prom_info.psb_mem_map;
- + bootm = nlm_prom_info.psb_mem_map;
- for (i = 0; i < bootm->nr_map; i++) {
- if (bootm->map[i].type != BOOT_MEM_RAM)
- continue;
- @@ -182,9 +182,9 @@ void __init prom_init(void)
- #endif
- /* truncate to 32 bit and sign extend all args */
- - argv = (int *)(long)(int)fw_arg1;
- - envp = (int *)(long)(int)fw_arg2;
- - prom_infop = (struct psb_info *)(long)(int)fw_arg3;
- + argv = (int)fw_arg1;
- + envp = (int)fw_arg2;
- + prom_infop = (int)fw_arg3;
- nlm_prom_info = *prom_infop;
- nlm_init_node();
- diff -u -p a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
- --- a/arch/arm64/kvm/sys_regs.c
- +++ b/arch/arm64/kvm/sys_regs.c
- @@ -1291,7 +1291,7 @@ static int demux_c15_set(u64 id, void __
- int kvm_arm_sys_reg_get_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)
- {
- const struct sys_reg_desc *r;
- - void __user *uaddr = (void __user *)(unsigned long)reg->addr;
- + void __user *uaddr = reg->addr;
- if ((reg->id & KVM_REG_ARM_COPROC_MASK) == KVM_REG_ARM_DEMUX)
- return demux_c15_get(reg->id, uaddr);
- @@ -1309,7 +1309,7 @@ int kvm_arm_sys_reg_get_reg(struct kvm_v
- int kvm_arm_sys_reg_set_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)
- {
- const struct sys_reg_desc *r;
- - void __user *uaddr = (void __user *)(unsigned long)reg->addr;
- + void __user *uaddr = reg->addr;
- if ((reg->id & KVM_REG_ARM_COPROC_MASK) == KVM_REG_ARM_DEMUX)
- return demux_c15_set(reg->id, uaddr);
- diff -u -p a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
- --- a/arch/x86/platform/efi/efi_64.c
- +++ b/arch/x86/platform/efi/efi_64.c
- @@ -148,7 +148,7 @@ int __init efi_setup_page_tables(unsigne
- if (efi_enabled(EFI_OLD_MEMMAP))
- return 0;
- - efi_scratch.efi_pgt = (pgd_t *)(unsigned long)real_mode_header->trampoline_pgd;
- + efi_scratch.efi_pgt = real_mode_header->trampoline_pgd;
- pgd = __va(efi_scratch.efi_pgt);
- /*
- @@ -377,7 +377,7 @@ efi_status_t efi_thunk_set_virtual_addre
- write_cr3((unsigned long)efi_scratch.efi_pgt);
- __flush_tlb_all();
- - func = (u32)(unsigned long)phys_set_virtual_address_map;
- + func = phys_set_virtual_address_map;
- status = efi64_thunk(func, memory_map_size, descriptor_size,
- descriptor_version, virtual_map);
- diff -u -p a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c
- --- a/arch/x86/kernel/devicetree.c
- +++ b/arch/x86/kernel/devicetree.c
- @@ -214,7 +214,7 @@ static int ioapic_xlate(struct irq_domai
- it = &of_ioapic_type[intspec[1]];
- - idx = (u32)(long)domain->host_data;
- + idx = domain->host_data;
- gsi = mp_pin_to_gsi(idx, line);
- if (mp_set_gsi_attr(gsi, it->trigger, it->polarity, cpu_to_node(0)))
- return -EBUSY;
- diff -u -p a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
- --- a/arch/x86/kernel/apic/io_apic.c
- +++ b/arch/x86/kernel/apic/io_apic.c
- @@ -941,7 +941,7 @@ static int irq_trigger(int idx)
- static int alloc_irq_from_domain(struct irq_domain *domain, u32 gsi, int pin)
- {
- int irq = -1;
- - int ioapic = (int)(long)domain->host_data;
- + int ioapic = domain->host_data;
- int type = ioapics[ioapic].irqdomain_cfg.type;
- switch (type) {
- @@ -1086,7 +1086,7 @@ void mp_unmap_irq(int irq)
- if (!data || !data->domain)
- return;
- - ioapic = (int)(long)data->domain->host_data;
- + ioapic = data->domain->host_data;
- pin = (int)data->hwirq;
- info = mp_pin_info(ioapic, pin);
- @@ -3019,7 +3019,7 @@ static inline void set_io_apic_irq_attr(
- int mp_irqdomain_map(struct irq_domain *domain, unsigned int virq,
- irq_hw_number_t hwirq)
- {
- - int ioapic = (int)(long)domain->host_data;
- + int ioapic = domain->host_data;
- struct mp_pin_info *info = mp_pin_info(ioapic, hwirq);
- struct io_apic_irq_attr attr;
- @@ -3057,7 +3057,7 @@ void mp_irqdomain_unmap(struct irq_domai
- {
- struct irq_data *data = irq_get_irq_data(virq);
- struct irq_cfg *cfg = irq_cfg(virq);
- - int ioapic = (int)(long)domain->host_data;
- + int ioapic = domain->host_data;
- int pin = (int)data->hwirq;
- ioapic_mask_entry(ioapic, pin);
- diff -u -p a/arch/x86/kvm/pmu.c b/arch/x86/kvm/pmu.c
- --- a/arch/x86/kvm/pmu.c
- +++ b/arch/x86/kvm/pmu.c
- @@ -414,7 +414,7 @@ int kvm_pmu_set_msr(struct kvm_vcpu *vcp
- if ((pmc = get_gp_pmc(pmu, index, MSR_IA32_PERFCTR0)) ||
- (pmc = get_fixed_pmc(pmu, index))) {
- if (!msr_info->host_initiated)
- - data = (s64)(s32)data;
- + data = data;
- pmc->counter += data - read_pmc(pmc);
- return 0;
- } else if ((pmc = get_gp_pmc(pmu, index, MSR_P6_EVNTSEL0))) {
- diff -u -p a/arch/sh/kernel/cpu/sh4a/smp-shx3.c b/arch/sh/kernel/cpu/sh4a/smp-shx3.c
- --- a/arch/sh/kernel/cpu/sh4a/smp-shx3.c
- +++ b/arch/sh/kernel/cpu/sh4a/smp-shx3.c
- @@ -29,7 +29,7 @@
- static irqreturn_t ipi_interrupt_handler(int irq, void *arg)
- {
- - unsigned int message = (unsigned int)(long)arg;
- + unsigned int message = arg;
- unsigned int cpu = hard_smp_processor_id();
- unsigned int offs = 4 * cpu;
- unsigned int x;
- diff -u -p a/arch/sh/mm/cache-sh5.c b/arch/sh/mm/cache-sh5.c
- --- a/arch/sh/mm/cache-sh5.c
- +++ b/arch/sh/mm/cache-sh5.c
- @@ -74,9 +74,9 @@ static void sh64_icache_inv_kernel_range
- * the addresses lie in the kernel superpage. */
- unsigned long long ullend, addr, aligned_start;
- - aligned_start = (unsigned long long)(signed long long)(signed long) start;
- + aligned_start = (signed long) start;
- addr = L1_CACHE_ALIGN(aligned_start);
- - ullend = (unsigned long long) (signed long long) (signed long) end;
- + ullend = (signed long) end;
- while (addr <= ullend) {
- __asm__ __volatile__ ("icbi %0, 0" : : "r" (addr));
- diff -u -p a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c
- --- a/arch/powerpc/kernel/sysfs.c
- +++ b/arch/powerpc/kernel/sysfs.c
- @@ -850,7 +850,7 @@ ssize_t arch_cpu_release(const char *buf
- static int sysfs_cpu_notify(struct notifier_block *self,
- unsigned long action, void *hcpu)
- {
- - unsigned int cpu = (unsigned int)(long)hcpu;
- + unsigned int cpu = hcpu;
- switch (action) {
- case CPU_ONLINE:
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement