diff options
author | Sergey Kandaurov <pluknet@FreeBSD.org> | 2013-04-30 05:08:17 +0000 |
---|---|---|
committer | Sergey Kandaurov <pluknet@FreeBSD.org> | 2013-04-30 05:08:17 +0000 |
commit | f6fea6cebc19af1bb42bccceaab860efda66745a (patch) | |
tree | 18582aa5489d76e96a3141662019de027ed5772e /sys/dev/bktr | |
parent | c9838c3ab8f8c86c209cc42b15f60ca24e2ff41f (diff) | |
download | src-f6fea6cebc19af1bb42bccceaab860efda66745a.tar.gz src-f6fea6cebc19af1bb42bccceaab860efda66745a.zip |
Pass a format string to kproc_create() [1] and thus fix the build with
-DBKTR_NEW_MSP34XX_DRIVER and -Wformat-security.
This also allows to eliminates a superfluous malloc/snprintf/free on
intermediate buffer.
PR: kern/175546
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=250088
Diffstat (limited to 'sys/dev/bktr')
-rw-r--r-- | sys/dev/bktr/msp34xx.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/sys/dev/bktr/msp34xx.c b/sys/dev/bktr/msp34xx.c index d86f71459049..65cf0e109c46 100644 --- a/sys/dev/bktr/msp34xx.c +++ b/sys/dev/bktr/msp34xx.c @@ -134,7 +134,6 @@ struct msp3400c { /* thread */ struct proc *kthread; - char *threaddesc; int active,restart,rmmod; @@ -1147,12 +1146,6 @@ int msp_attach(bktr_ptr_t bktr) msp->bass = 32768; msp->treble = 32768; msp->input = -1; - msp->threaddesc = malloc(15 * sizeof(char), M_DEVBUF, M_NOWAIT); - if (msp->threaddesc == NULL) { - free(msp, M_DEVBUF); - return ENOMEM; - } - snprintf(msp->threaddesc, 14, "%s_msp34xx_thread", bktr->bktr_xname); for (i = 0; i < DFP_COUNT; i++) msp->dfp_regs[i] = -1; @@ -1163,7 +1156,6 @@ int msp_attach(bktr_ptr_t bktr) if (-1 != rev1) rev2 = msp3400c_read(bktr, I2C_MSP3400C_DFP, 0x1f); if ((-1 == rev1) || (0 == rev1 && 0 == rev2)) { - free(msp->threaddesc, M_DEVBUF); free(msp, M_DEVBUF); bktr->msp3400c_info = NULL; printf("%s: msp3400: error while reading chip version\n", bktr_name(bktr)); @@ -1199,10 +1191,9 @@ int msp_attach(bktr_ptr_t bktr) /* startup control thread */ err = kproc_create(msp->simple ? msp3410d_thread : msp3400c_thread, bktr, &msp->kthread, (RFFDG | RFPROC), 0, - msp->threaddesc); + "%s_msp34xx_thread", bktr->bktr_xname); if (err) { printf("%s: Error returned by kproc_create: %d", bktr_name(bktr), err); - free(msp->threaddesc, M_DEVBUF); free(msp, M_DEVBUF); bktr->msp3400c_info = NULL; return ENXIO; |