diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2008-10-28 21:49:02 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2008-10-28 21:49:02 +0000 |
| commit | cb2fd65e3da7a68ef11d458e9ca99463f90b32a0 (patch) | |
| tree | 8acd0b016433ced01fd64876a031381c822c30aa /drivers/dahdi/wct4xxp/base.c | |
| parent | 8b0e06e5f588d24af0666b1d605084a83c7c8c25 (diff) | |
fix a large number of warnings found by sparse, the kernel code sanity checking tool. some of these fixes are non-optimal (casting 'unsigned long' to '__user void *'), but are unavoidable in many cases. started from tzafrir's patch, did most of the work myself.
(closes issue #13763)
Reported by: tzafrir
Patches:
sparse_fixes_1.diff uploaded by tzafrir (license 46)
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@5162 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/wct4xxp/base.c')
| -rw-r--r-- | drivers/dahdi/wct4xxp/base.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/drivers/dahdi/wct4xxp/base.c b/drivers/dahdi/wct4xxp/base.c index d3d2577..83dd28d 100644 --- a/drivers/dahdi/wct4xxp/base.c +++ b/drivers/dahdi/wct4xxp/base.c @@ -327,7 +327,7 @@ struct t4 { dma_addr_t writedma; unsigned long memaddr; /* Base address of card */ unsigned long memlen; - volatile unsigned int *membase; /* Base address of card */ + __iomem volatile unsigned int *membase; /* Base address of card */ /* Add this for our softlockup protector */ unsigned int oct_rw_count; @@ -1155,12 +1155,12 @@ static int t4_ioctl(struct dahdi_chan *chan, unsigned int cmd, unsigned long dat regs.pci[x] = t4_pci_in(wc, x); for (x=0;x<NUM_REGS;x++) regs.regs[x] = t4_framer_in(wc, chan->span->offset, x); - if (copy_to_user((struct t4_regs *)data, ®s, sizeof(regs))) + if (copy_to_user((__user void *) data, ®s, sizeof(regs))) return -EFAULT; break; #ifdef VPM_SUPPORT case DAHDI_TONEDETECT: - if (get_user(j, (int *)data)) + if (get_user(j, (__user int *) data)) return -EFAULT; if (!wc->vpm) return -ENOSYS; @@ -1191,7 +1191,8 @@ static int t4_ioctl(struct dahdi_chan *chan, unsigned int cmd, unsigned long dat static void inline t4_hdlc_xmit_fifo(struct t4 *wc, unsigned int span, struct t4_span *ts) { - int res, i, size = 32; + int res, i; + unsigned int size = 32; unsigned char buf[32]; res = dahdi_hdlc_getbuf(ts->sigchan, buf, &size); @@ -3796,12 +3797,10 @@ static struct pci_device_id t4_pci_tbl[] __devinitdata = }; static struct pci_driver t4_driver = { - name: "wct4xxp", - probe: t4_init_one, - remove: __devexit_p(t4_remove_one), - suspend: NULL, - resume: NULL, - id_table: t4_pci_tbl, + .name = "wct4xxp", + .probe = t4_init_one, + .remove = __devexit_p(t4_remove_one), + .id_table = t4_pci_tbl, }; static int __init t4_init(void) |