Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

char/mwave: drop printk wrapper

PRINTK_ERROR() + KERN_ERR_MWAVE are just wrappers around printk() with
a prefix. Instead, pr_fmt() can be used. Drop the former and use the
latter.

Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Link: https://patch.msgid.link/20251119091949.825958-6-jirislaby@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Jiri Slaby (SUSE) and committed by
Greg Kroah-Hartman
1c7e15b0 53688a9f

+74 -85
+3 -1
drivers/char/mwave/3780i.c
··· 46 46 * First release to the public 47 47 */ 48 48 49 + #define pr_fmt(fmt) "3780i: " fmt 50 + 49 51 #include <linux/kernel.h> 50 52 #include <linux/unistd.h> 51 53 #include <linux/delay.h> ··· 140 138 unsigned short tval; 141 139 142 140 if (!pSettings->bDSPEnabled) { 143 - PRINTK_ERROR( KERN_ERR "3780i::dsp3780I_EnableDSP: Error: DSP not enabled. Aborting.\n" ); 141 + pr_err("%s: Error: DSP not enabled. Aborting.\n", __func__); 144 142 return -EIO; 145 143 } 146 144
+17 -41
drivers/char/mwave/mwavedd.c
··· 46 46 * First release to the public 47 47 */ 48 48 49 + #define pr_fmt(fmt) "mwavedd: " fmt 50 + 49 51 #include <linux/module.h> 50 52 #include <linux/kernel.h> 51 53 #include <linux/fs.h> ··· 202 200 unsigned int ipcnum = (unsigned int) ioarg; 203 201 204 202 if (ipcnum >= ARRAY_SIZE(pDrvData->IPCs)) { 205 - PRINTK_ERROR(KERN_ERR_MWAVE 206 - "mwavedd::mwave_ioctl:" 207 - " IOCTL_MW_REGISTER_IPC:" 208 - " Error: Invalid ipcnum %x\n", 209 - ipcnum); 203 + pr_err("%s: IOCTL_MW_REGISTER_IPC: Error: Invalid ipcnum %x\n", 204 + __func__, ipcnum); 210 205 return -EINVAL; 211 206 } 212 207 ipcnum = array_index_nospec(ipcnum, ··· 220 221 unsigned int ipcnum = (unsigned int) ioarg; 221 222 222 223 if (ipcnum >= ARRAY_SIZE(pDrvData->IPCs)) { 223 - PRINTK_ERROR(KERN_ERR_MWAVE 224 - "mwavedd::mwave_ioctl:" 225 - " IOCTL_MW_GET_IPC: Error:" 226 - " Invalid ipcnum %x\n", ipcnum); 224 + pr_err("%s: IOCTL_MW_GET_IPC: Error: Invalid ipcnum %x\n", __func__, 225 + ipcnum); 227 226 return -EINVAL; 228 227 } 229 228 ipcnum = array_index_nospec(ipcnum, ··· 256 259 unsigned int ipcnum = (unsigned int) ioarg; 257 260 258 261 if (ipcnum >= ARRAY_SIZE(pDrvData->IPCs)) { 259 - PRINTK_ERROR(KERN_ERR_MWAVE 260 - "mwavedd::mwave_ioctl:" 261 - " IOCTL_MW_UNREGISTER_IPC:" 262 - " Error: Invalid ipcnum %x\n", 263 - ipcnum); 262 + pr_err("%s: IOCTL_MW_UNREGISTER_IPC: Error: Invalid ipcnum %x\n", 263 + __func__, ipcnum); 264 264 return -EINVAL; 265 265 } 266 266 ipcnum = array_index_nospec(ipcnum, ··· 292 298 /* OK */ 293 299 break; 294 300 default: 295 - PRINTK_ERROR(KERN_ERR_MWAVE 296 - "mwavedd::register_serial_portandirq:" 297 - " Error: Illegal port %x\n", port ); 301 + pr_err("%s: Error: Illegal port %x\n", __func__, port); 298 302 return -1; 299 303 } /* switch */ 300 304 /* port is okay */ ··· 305 313 /* OK */ 306 314 break; 307 315 default: 308 - PRINTK_ERROR(KERN_ERR_MWAVE 309 - "mwavedd::register_serial_portandirq:" 310 - " Error: Illegal irq %x\n", irq ); 316 + pr_err("%s: Error: Illegal irq %x\n", __func__, irq); 311 317 return -1; 312 318 } /* switch */ 313 319 /* irq is okay */ ··· 381 391 382 392 retval = tp3780I_InitializeBoardData(&pDrvData->rBDData); 383 393 if (retval) { 384 - PRINTK_ERROR(KERN_ERR_MWAVE 385 - "mwavedd::mwave_init: Error:" 386 - " Failed to initialize board data\n"); 394 + pr_err("%s: Error: Failed to initialize board data\n", __func__); 387 395 goto cleanup_error; 388 396 } 389 397 pDrvData->bBDInitialized = true; 390 398 391 399 retval = tp3780I_CalcResources(&pDrvData->rBDData); 392 400 if (retval) { 393 - PRINTK_ERROR(KERN_ERR_MWAVE 394 - "mwavedd:mwave_init: Error:" 395 - " Failed to calculate resources\n"); 401 + pr_err("%s: Error: Failed to calculate resources\n", __func__); 396 402 goto cleanup_error; 397 403 } 398 404 399 405 retval = tp3780I_ClaimResources(&pDrvData->rBDData); 400 406 if (retval) { 401 - PRINTK_ERROR(KERN_ERR_MWAVE 402 - "mwavedd:mwave_init: Error:" 403 - " Failed to claim resources\n"); 407 + pr_err("%s: Error: Failed to claim resources\n", __func__); 404 408 goto cleanup_error; 405 409 } 406 410 pDrvData->bResourcesClaimed = true; 407 411 408 412 retval = tp3780I_EnableDSP(&pDrvData->rBDData); 409 413 if (retval) { 410 - PRINTK_ERROR(KERN_ERR_MWAVE 411 - "mwavedd:mwave_init: Error:" 412 - " Failed to enable DSP\n"); 414 + pr_err("%s: Error: Failed to enable DSP\n", __func__); 413 415 goto cleanup_error; 414 416 } 415 417 pDrvData->bDSPEnabled = true; 416 418 417 419 if (misc_register(&mwave_misc_dev) < 0) { 418 - PRINTK_ERROR(KERN_ERR_MWAVE 419 - "mwavedd:mwave_init: Error:" 420 - " Failed to register misc device\n"); 420 + pr_err("%s: Error: Failed to register misc device\n", __func__); 421 421 goto cleanup_error; 422 422 } 423 423 pDrvData->bMwaveDevRegistered = true; ··· 417 437 pDrvData->rBDData.rDspSettings.usUartIrq 418 438 ); 419 439 if (pDrvData->sLine < 0) { 420 - PRINTK_ERROR(KERN_ERR_MWAVE 421 - "mwavedd:mwave_init: Error:" 422 - " Failed to register serial driver\n"); 440 + pr_err("%s: Error: Failed to register serial driver\n", __func__); 423 441 goto cleanup_error; 424 442 } 425 443 /* uart is registered */ ··· 426 448 return 0; 427 449 428 450 cleanup_error: 429 - PRINTK_ERROR(KERN_ERR_MWAVE 430 - "mwavedd::mwave_init: Error:" 431 - " Failed to initialize\n"); 451 + pr_err("%s: Error: Failed to initialize\n", __func__); 432 452 mwave_exit(); /* clean up */ 433 453 434 454 return -EIO;
-3
drivers/char/mwave/mwavedd.h
··· 61 61 extern int mwave_uart_irq; 62 62 extern int mwave_uart_io; 63 63 64 - #define PRINTK_ERROR printk 65 - #define KERN_ERR_MWAVE KERN_ERR "mwave: " 66 - 67 64 typedef struct _MWAVE_IPC { 68 65 unsigned short usIntCount; /* 0=none, 1=first, 2=greater than 1st */ 69 66 bool bIsEnabled;
+34 -25
drivers/char/mwave/smapi.c
··· 46 46 * First release to the public 47 47 */ 48 48 49 + #define pr_fmt(fmt) "smapi: " fmt 50 + 49 51 #include <linux/kernel.h> 50 52 #include <linux/mc146818rtc.h> /* CMOS defines */ 51 53 #include "smapi.h" ··· 129 127 bRC = smapi_request(0x1802, 0x0000, 0, 0, 130 128 &usAX, &usBX, &usCX, &usDX, &usDI, &usSI); 131 129 if (bRC) { 132 - PRINTK_ERROR(KERN_ERR_MWAVE "smapi::smapi_query_DSP_cfg: Error: Could not get DSP Settings. Aborting.\n"); 130 + pr_err("%s: Error: Could not get DSP Settings. Aborting.\n", __func__); 133 131 return bRC; 134 132 } 135 133 ··· 145 143 146 144 /* check for illegal values */ 147 145 if ( pSettings->usDspBaseIO == 0 ) 148 - PRINTK_ERROR(KERN_ERR_MWAVE "smapi::smapi_query_DSP_cfg: Worry: DSP base I/O address is 0\n"); 146 + pr_err("%s: Worry: DSP base I/O address is 0\n", __func__); 149 147 if ( pSettings->usDspIRQ == 0 ) 150 - PRINTK_ERROR(KERN_ERR_MWAVE "smapi::smapi_query_DSP_cfg: Worry: DSP IRQ line is 0\n"); 148 + pr_err("%s: Worry: DSP IRQ line is 0\n", __func__); 151 149 152 150 bRC = smapi_request(0x1804, 0x0000, 0, 0, 153 151 &usAX, &usBX, &usCX, &usDX, &usDI, &usSI); 154 152 if (bRC) { 155 - PRINTK_ERROR("smapi::smapi_query_DSP_cfg: Error: Could not get DSP modem settings. Aborting.\n"); 153 + pr_err("%s: Error: Could not get DSP modem settings. Aborting.\n", __func__); 156 154 return bRC; 157 155 } 158 156 ··· 166 164 167 165 /* check for illegal values */ 168 166 if ( pSettings->usUartBaseIO == 0 ) 169 - PRINTK_ERROR(KERN_ERR_MWAVE "smapi::smapi_query_DSP_cfg: Worry: UART base I/O address is 0\n"); 167 + pr_err("%s: Worry: UART base I/O address is 0\n", __func__); 170 168 if ( pSettings->usUartIRQ == 0 ) 171 - PRINTK_ERROR(KERN_ERR_MWAVE "smapi::smapi_query_DSP_cfg: Worry: UART IRQ line is 0\n"); 169 + pr_err("%s: Worry: UART IRQ line is 0\n", __func__); 172 170 173 171 return bRC; 174 172 } ··· 197 195 break; 198 196 } 199 197 if (i == ARRAY_SIZE(ausDspBases)) { 200 - PRINTK_ERROR(KERN_ERR_MWAVE "smapi::smapi_set_DSP_cfg: Error: Invalid mwave_3780i_io address %x. Aborting.\n", mwave_3780i_io); 198 + pr_err("%s: Error: Invalid mwave_3780i_io address %x. Aborting.\n", 199 + __func__, mwave_3780i_io); 201 200 return bRC; 202 201 } 203 202 dspio_index = i; ··· 210 207 break; 211 208 } 212 209 if (i == ARRAY_SIZE(ausDspIrqs)) { 213 - PRINTK_ERROR(KERN_ERR_MWAVE "smapi::smapi_set_DSP_cfg: Error: Invalid mwave_3780i_irq %x. Aborting.\n", mwave_3780i_irq); 210 + pr_err("%s: Error: Invalid mwave_3780i_irq %x. Aborting.\n", __func__, 211 + mwave_3780i_irq); 214 212 return bRC; 215 213 } 216 214 } ··· 222 218 break; 223 219 } 224 220 if (i == ARRAY_SIZE(ausUartBases)) { 225 - PRINTK_ERROR(KERN_ERR_MWAVE "smapi::smapi_set_DSP_cfg: Error: Invalid mwave_uart_io address %x. Aborting.\n", mwave_uart_io); 221 + pr_err("%s: Error: Invalid mwave_uart_io address %x. Aborting.\n", __func__, 222 + mwave_uart_io); 226 223 return bRC; 227 224 } 228 225 uartio_index = i; ··· 236 231 break; 237 232 } 238 233 if (i == ARRAY_SIZE(ausUartIrqs)) { 239 - PRINTK_ERROR(KERN_ERR_MWAVE "smapi::smapi_set_DSP_cfg: Error: Invalid mwave_uart_irq %x. Aborting.\n", mwave_uart_irq); 234 + pr_err("%s: Error: Invalid mwave_uart_irq %x. Aborting.\n", __func__, 235 + mwave_uart_irq); 240 236 return bRC; 241 237 } 242 238 } ··· 252 246 if (usBX & 0x0100) { /* serial port A is present */ 253 247 if (usCX & 1) { /* serial port is enabled */ 254 248 if ((usSI & 0xFF) == mwave_uart_irq) { 255 - PRINTK_ERROR(KERN_ERR_MWAVE 256 - "smapi::smapi_set_DSP_cfg: Serial port A irq %x conflicts with mwave_uart_irq %x\n", usSI & 0xFF, mwave_uart_irq); 249 + pr_err("%s: Serial port A irq %x conflicts with mwave_uart_irq %x\n", 250 + __func__, usSI & 0xFF, mwave_uart_irq); 257 251 goto exit_conflict; 258 252 } else { 259 253 if ((usSI >> 8) == uartio_index) { 260 - PRINTK_ERROR(KERN_ERR_MWAVE 261 - "smapi::smapi_set_DSP_cfg: Serial port A base I/O address %x conflicts with mwave uart I/O %x\n", ausUartBases[usSI >> 8], ausUartBases[uartio_index]); 254 + pr_err("%s: Serial port A base I/O address %x conflicts with mwave uart I/O %x\n", 255 + __func__, ausUartBases[usSI >> 8], 256 + ausUartBases[uartio_index]); 262 257 goto exit_conflict; 263 258 } 264 259 } ··· 274 267 if (usBX & 0x0100) { /* serial port B is present */ 275 268 if (usCX & 1) { /* serial port is enabled */ 276 269 if ((usSI & 0xFF) == mwave_uart_irq) { 277 - PRINTK_ERROR(KERN_ERR_MWAVE 278 - "smapi::smapi_set_DSP_cfg: Serial port B irq %x conflicts with mwave_uart_irq %x\n", usSI & 0xFF, mwave_uart_irq); 270 + pr_err("%s: Serial port B irq %x conflicts with mwave_uart_irq %x\n", 271 + __func__, usSI & 0xFF, mwave_uart_irq); 279 272 goto exit_conflict; 280 273 } else { 281 274 if ((usSI >> 8) == uartio_index) { 282 - PRINTK_ERROR(KERN_ERR_MWAVE 283 - "smapi::smapi_set_DSP_cfg: Serial port B base I/O address %x conflicts with mwave uart I/O %x\n", ausUartBases[usSI >> 8], ausUartBases[uartio_index]); 275 + pr_err("%s: Serial port B base I/O address %x conflicts with mwave uart I/O %x\n", 276 + __func__, ausUartBases[usSI >> 8], 277 + ausUartBases[uartio_index]); 284 278 goto exit_conflict; 285 279 } 286 280 } ··· 298 290 /* bRC == 0 */ 299 291 if ((usCX & 0xff) != 0xff) { /* IR port not disabled */ 300 292 if ((usCX & 0xff) == mwave_uart_irq) { 301 - PRINTK_ERROR(KERN_ERR_MWAVE 302 - "smapi::smapi_set_DSP_cfg: IR port irq %x conflicts with mwave_uart_irq %x\n", usCX & 0xff, mwave_uart_irq); 293 + pr_err("%s: IR port irq %x conflicts with mwave_uart_irq %x\n", 294 + __func__, usCX & 0xff, mwave_uart_irq); 303 295 goto exit_conflict; 304 296 } else { 305 297 if ((usSI & 0xff) == uartio_index) { 306 - PRINTK_ERROR(KERN_ERR_MWAVE 307 - "smapi::smapi_set_DSP_cfg: IR port base I/O address %x conflicts with mwave uart I/O %x\n", ausUartBases[usSI & 0xff], ausUartBases[uartio_index]); 298 + pr_err("%s: IR port base I/O address %x conflicts with mwave uart I/O %x\n", 299 + __func__, ausUartBases[usSI & 0xff], 300 + ausUartBases[uartio_index]); 308 301 goto exit_conflict; 309 302 } 310 303 } ··· 357 348 return -EIO; 358 349 359 350 exit_smapi_request_error: 360 - PRINTK_ERROR(KERN_ERR_MWAVE "smapi::smapi_set_DSP_cfg exit on smapi_request error bRC %x\n", bRC); 351 + pr_err("%s: exit on smapi_request error bRC %x\n", __func__, bRC); 361 352 return bRC; 362 353 } 363 354 ··· 390 381 g_usSmapiPort |= (CMOS_READ(0x7F) << 8); 391 382 spin_unlock_irqrestore(&rtc_lock, flags); 392 383 if (g_usSmapiPort == 0) { 393 - PRINTK_ERROR("smapi::smapi_init, ERROR unable to read from SMAPI port\n"); 384 + pr_err("%s: ERROR unable to read from SMAPI port\n", __func__); 394 385 } else { 395 386 retval = 0; 396 387 //SmapiQuerySystemID(); 397 388 } 398 389 } else { 399 - PRINTK_ERROR("smapi::smapi_init, ERROR invalid usSmapiID\n"); 390 + pr_err("%s: ERROR invalid usSmapiID\n", __func__); 400 391 retval = -ENXIO; 401 392 } 402 393
+20 -15
drivers/char/mwave/tp3780i.c
··· 46 46 * First release to the public 47 47 */ 48 48 49 + #define pr_fmt(fmt) "tp3780i: " fmt 50 + 49 51 #include <linux/interrupt.h> 50 52 #include <linux/kernel.h> 51 53 #include <linux/ptrace.h> ··· 135 133 136 134 retval = smapi_init(); 137 135 if (retval) { 138 - PRINTK_ERROR(KERN_ERR_MWAVE "tp3780i::tp3780I_InitializeBoardData: Error: SMAPI is not available on this machine\n"); 136 + pr_err("%s: Error: SMAPI is not available on this machine\n", __func__); 139 137 } else { 140 138 if (mwave_3780i_irq || mwave_3780i_io || mwave_uart_irq || mwave_uart_io) { 141 139 retval = smapi_set_DSP_cfg(); ··· 155 153 DSP_3780I_CONFIG_SETTINGS *pSettings = &pBDData->rDspSettings; 156 154 157 155 if (smapi_query_DSP_cfg(&rSmapiInfo)) { 158 - PRINTK_ERROR(KERN_ERR_MWAVE "tp3780i::tp3780I_CalcResources: Error: Could not query DSP config. Aborting.\n"); 156 + pr_err("%s: Error: Could not query DSP config. Aborting.\n", __func__); 159 157 return -EIO; 160 158 } 161 159 ··· 166 164 || ( rSmapiInfo.usUartIRQ == 0 ) 167 165 || ( rSmapiInfo.usUartBaseIO == 0 ) 168 166 ) { 169 - PRINTK_ERROR(KERN_ERR_MWAVE "tp3780i::tp3780I_CalcResources: Error: Illegal resource setting. Aborting.\n"); 167 + pr_err("%s: Error: Illegal resource setting. Aborting.\n", __func__); 170 168 return -EIO; 171 169 } 172 170 ··· 202 200 if ( pres == NULL ) retval = -EIO; 203 201 204 202 if (retval) { 205 - PRINTK_ERROR(KERN_ERR_MWAVE "tp3780i::tp3780I_ClaimResources: Error: Could not claim I/O region starting at %x\n", pSettings->usDspBaseIO); 203 + pr_err("%s: Error: Could not claim I/O region starting at %x\n", __func__, 204 + pSettings->usDspBaseIO); 206 205 return -EIO; 207 206 } 208 207 ··· 232 229 bool bDSPPoweredUp = false, bInterruptAllocated = false; 233 230 234 231 if (pBDData->bDSPEnabled) { 235 - PRINTK_ERROR(KERN_ERR_MWAVE "tp3780i::tp3780I_EnableDSP: Error: DSP already enabled!\n"); 232 + pr_err("%s: Error: DSP already enabled!\n", __func__); 236 233 goto exit_cleanup; 237 234 } 238 235 239 236 if (!pSettings->bDSPEnabled) { 240 - PRINTK_ERROR(KERN_ERR_MWAVE "tp3780::tp3780I_EnableDSP: Error: pSettings->bDSPEnabled not set\n"); 237 + pr_err("%s: Error: pSettings->bDSPEnabled not set\n", __func__); 241 238 goto exit_cleanup; 242 239 } 243 240 ··· 247 244 || (s_ausThinkpadIrqToField[pSettings->usDspIrq] == 0xFFFF) 248 245 || (s_ausThinkpadDmaToField[pSettings->usDspDma] == 0xFFFF) 249 246 ) { 250 - PRINTK_ERROR(KERN_ERR_MWAVE "tp3780i::tp3780I_EnableDSP: Error: invalid irq %x\n", pSettings->usDspIrq); 247 + pr_err("%s: Error: invalid irq %x\n", __func__, pSettings->usDspIrq); 251 248 goto exit_cleanup; 252 249 } 253 250 ··· 255 252 ((pSettings->usDspBaseIO & 0xF00F) != 0) 256 253 || (pSettings->usDspBaseIO & 0x0FF0) == 0 257 254 ) { 258 - PRINTK_ERROR(KERN_ERR_MWAVE "tp3780i::tp3780I_EnableDSP: Error: Invalid DSP base I/O address %x\n", pSettings->usDspBaseIO); 255 + pr_err("%s: Error: Invalid DSP base I/O address %x\n", __func__, 256 + pSettings->usDspBaseIO); 259 257 goto exit_cleanup; 260 258 } 261 259 ··· 265 261 pSettings->usUartIrq >= s_numIrqs 266 262 || s_ausThinkpadIrqToField[pSettings->usUartIrq] == 0xFFFF 267 263 ) { 268 - PRINTK_ERROR(KERN_ERR_MWAVE "tp3780i::tp3780I_EnableDSP: Error: Invalid UART IRQ %x\n", pSettings->usUartIrq); 264 + pr_err("%s: Error: Invalid UART IRQ %x\n", __func__, pSettings->usUartIrq); 269 265 goto exit_cleanup; 270 266 } 271 267 switch (pSettings->usUartBaseIO) { ··· 276 272 break; 277 273 278 274 default: 279 - PRINTK_ERROR("tp3780i::tp3780I_EnableDSP: Error: Invalid UART base I/O address %x\n", pSettings->usUartBaseIO); 275 + pr_err("%s: Error: Invalid UART base I/O address %x\n", __func__, 276 + pSettings->usUartBaseIO); 280 277 goto exit_cleanup; 281 278 } 282 279 } ··· 306 301 pSettings->usChipletEnable = TP_CFG_ChipletEnable; 307 302 308 303 if (request_irq(pSettings->usUartIrq, &UartInterrupt, 0, "mwave_uart", NULL)) { 309 - PRINTK_ERROR(KERN_ERR_MWAVE "tp3780i::tp3780I_EnableDSP: Error: Could not get UART IRQ %x\n", pSettings->usUartIrq); 304 + pr_err("%s: Error: Could not get UART IRQ %x\n", __func__, pSettings->usUartIrq); 310 305 goto exit_cleanup; 311 306 } else { /* no conflict just release */ 312 307 free_irq(pSettings->usUartIrq, NULL); 313 308 } 314 309 315 310 if (request_irq(pSettings->usDspIrq, &DspInterrupt, 0, "mwave_3780i", NULL)) { 316 - PRINTK_ERROR("tp3780i::tp3780I_EnableDSP: Error: Could not get 3780i IRQ %x\n", pSettings->usDspIrq); 311 + pr_err("%s: Error: Could not get 3780i IRQ %x\n", __func__, pSettings->usDspIrq); 317 312 goto exit_cleanup; 318 313 } else { 319 314 bInterruptAllocated = true; ··· 322 317 323 318 smapi_set_DSP_power_state(false); 324 319 if (smapi_set_DSP_power_state(true)) { 325 - PRINTK_ERROR(KERN_ERR_MWAVE "tp3780i::tp3780I_EnableDSP: Error: smapi_set_DSP_power_state(true) failed\n"); 320 + pr_err("%s: Error: smapi_set_DSP_power_state(true) failed\n", __func__); 326 321 goto exit_cleanup; 327 322 } else { 328 323 bDSPPoweredUp = true; 329 324 } 330 325 331 326 if (dsp3780I_EnableDSP(pSettings, s_ausThinkpadIrqToField, s_ausThinkpadDmaToField)) { 332 - PRINTK_ERROR("tp3780i::tp3780I_EnableDSP: Error: dsp7880I_EnableDSP() failed\n"); 327 + pr_err("%s: Error: dsp7880I_EnableDSP() failed\n", __func__); 333 328 goto exit_cleanup; 334 329 } 335 330 ··· 340 335 return 0; 341 336 342 337 exit_cleanup: 343 - PRINTK_ERROR("tp3780i::tp3780I_EnableDSP: Cleaning up\n"); 338 + pr_err("%s: Cleaning up\n", __func__); 344 339 if (bDSPPoweredUp) 345 340 smapi_set_DSP_power_state(false); 346 341 if (bInterruptAllocated) {