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/dahdi_dynamic.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/dahdi_dynamic.c')
| -rw-r--r-- | drivers/dahdi/dahdi_dynamic.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/dahdi/dahdi_dynamic.c b/drivers/dahdi/dahdi_dynamic.c index c1f09eb..4a52983 100644 --- a/drivers/dahdi/dahdi_dynamic.c +++ b/drivers/dahdi/dahdi_dynamic.c @@ -705,7 +705,7 @@ static int ztdynamic_ioctl(unsigned int cmd, unsigned long data) ztdynamic_run(); return 0; case DAHDI_DYNAMIC_CREATE: - if (copy_from_user(&zds, (struct dahdi_dynamic_span *)data, sizeof(zds))) + if (copy_from_user(&zds, (__user const void *) data, sizeof(zds))) return -EFAULT; if (debug) printk(KERN_DEBUG "Dynamic Create\n"); @@ -714,11 +714,11 @@ static int ztdynamic_ioctl(unsigned int cmd, unsigned long data) return res; zds.spanno = res; /* Let them know the new span number */ - if (copy_to_user((struct dahdi_dynamic_span *)data, &zds, sizeof(zds))) + if (copy_to_user((__user void *) data, &zds, sizeof(zds))) return -EFAULT; return 0; case DAHDI_DYNAMIC_DESTROY: - if (copy_from_user(&zds, (struct dahdi_dynamic_span *)data, sizeof(zds))) + if (copy_from_user(&zds, (__user const void *) data, sizeof(zds))) return -EFAULT; if (debug) printk(KERN_DEBUG "Dynamic Destroy\n"); @@ -785,7 +785,7 @@ void dahdi_dynamic_unregister(struct dahdi_dynamic_driver *dri) spin_unlock_irqrestore(&dlock, flags); } -struct timer_list alarmcheck; +static struct timer_list alarmcheck; static void check_for_red_alarm(unsigned long ignored) { @@ -817,7 +817,7 @@ static void check_for_red_alarm(unsigned long ignored) } -int ztdynamic_init(void) +static int ztdynamic_init(void) { dahdi_set_dynamic_ioctl(ztdynamic_ioctl); /* Start process to check for RED ALARM */ @@ -834,7 +834,7 @@ int ztdynamic_init(void) return 0; } -void ztdynamic_cleanup(void) +static void ztdynamic_cleanup(void) { #ifdef ENABLE_TASKLETS if (taskletpending) { |