diff options
author | Joe Perches <joe@perches.com> | 2007-10-18 06:06:30 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 17:37:28 -0400 |
commit | 898eb71cb17644964c5895fb190e79e3d0c49679 (patch) | |
tree | 96be8f0a40feaf56fef836634c89955e432b12db /drivers | |
parent | 6c0286b199c3eb2caa973525dfc8a7ed67090ec0 (diff) |
Add missing newlines to some uses of dev_<level> messages
Found these while looking at printk uses.
Add missing newlines to dev_<level> uses
Add missing KERN_<level> prefixes to multiline dev_<level>s
Fixed a wierd->weird spelling typo
Added a newline to a printk
Signed-off-by: Joe Perches <joe@perches.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Mark M. Hoffman <mhoffman@lightlink.com>
Cc: Roland Dreier <rolandd@cisco.com>
Cc: Tilman Schmidt <tilman@imap.cc>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Stephen Hemminger <shemminger@linux-foundation.org>
Cc: Greg KH <greg@kroah.com>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: David Brownell <david-b@pacbell.net>
Cc: James Smart <James.Smart@Emulex.Com>
Cc: Andrew Vasquez <andrew.vasquez@qlogic.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Jaroslav Kysela <perex@suse.cz>
Cc: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
47 files changed, 117 insertions, 109 deletions
diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c index 9e7652dcde6..82effce97c5 100644 --- a/drivers/block/xsysace.c +++ b/drivers/block/xsysace.c | |||
@@ -390,8 +390,8 @@ static inline void ace_dump_mem(void *base, int len) | |||
390 | static void ace_dump_regs(struct ace_device *ace) | 390 | static void ace_dump_regs(struct ace_device *ace) |
391 | { | 391 | { |
392 | dev_info(ace->dev, " ctrl: %.8x seccnt/cmd: %.4x ver:%.4x\n" | 392 | dev_info(ace->dev, " ctrl: %.8x seccnt/cmd: %.4x ver:%.4x\n" |
393 | " status:%.8x mpu_lba:%.8x busmode:%4x\n" | 393 | KERN_INFO " status:%.8x mpu_lba:%.8x busmode:%4x\n" |
394 | " error: %.8x cfg_lba:%.8x fatstat:%.4x\n", | 394 | KERN_INFO " error: %.8x cfg_lba:%.8x fatstat:%.4x\n", |
395 | ace_in32(ace, ACE_CTRL), | 395 | ace_in32(ace, ACE_CTRL), |
396 | ace_in(ace, ACE_SECCNTCMD), | 396 | ace_in(ace, ACE_SECCNTCMD), |
397 | ace_in(ace, ACE_VERSION), | 397 | ace_in(ace, ACE_VERSION), |
diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c index 77a7a4a0662..85d596a3c18 100644 --- a/drivers/char/isicom.c +++ b/drivers/char/isicom.c | |||
@@ -1529,7 +1529,7 @@ static int __devinit reset_card(struct pci_dev *pdev, | |||
1529 | portcount = inw(base + 0x2); | 1529 | portcount = inw(base + 0x2); |
1530 | if (!inw(base + 0xe) & 0x1 || (portcount != 0 && portcount != 4 && | 1530 | if (!inw(base + 0xe) & 0x1 || (portcount != 0 && portcount != 4 && |
1531 | portcount != 8 && portcount != 16)) { | 1531 | portcount != 8 && portcount != 16)) { |
1532 | dev_err(&pdev->dev, "ISILoad:PCI Card%d reset failure.", | 1532 | dev_err(&pdev->dev, "ISILoad:PCI Card%d reset failure.\n", |
1533 | card + 1); | 1533 | card + 1); |
1534 | retval = -EIO; | 1534 | retval = -EIO; |
1535 | goto end; | 1535 | goto end; |
@@ -1622,7 +1622,9 @@ static int __devinit load_firmware(struct pci_dev *pdev, | |||
1622 | 1622 | ||
1623 | if ((status = inw(base + 0x4)) != 0) { | 1623 | if ((status = inw(base + 0x4)) != 0) { |
1624 | dev_warn(&pdev->dev, "Card%d rejected load header:\n" | 1624 | dev_warn(&pdev->dev, "Card%d rejected load header:\n" |
1625 | "Address:0x%x\nCount:0x%x\nStatus:0x%x\n", | 1625 | KERN_WARNING "Address:0x%x\n" |
1626 | KERN_WARNING "Count:0x%x\n" | ||
1627 | KERN_WARNING "Status:0x%x\n", | ||
1626 | index + 1, frame->addr, frame->count, status); | 1628 | index + 1, frame->addr, frame->count, status); |
1627 | goto errrelfw; | 1629 | goto errrelfw; |
1628 | } | 1630 | } |
@@ -1666,7 +1668,9 @@ static int __devinit load_firmware(struct pci_dev *pdev, | |||
1666 | 1668 | ||
1667 | if ((status = inw(base + 0x4)) != 0) { | 1669 | if ((status = inw(base + 0x4)) != 0) { |
1668 | dev_warn(&pdev->dev, "Card%d rejected verify header:\n" | 1670 | dev_warn(&pdev->dev, "Card%d rejected verify header:\n" |
1669 | "Address:0x%x\nCount:0x%x\nStatus: 0x%x\n", | 1671 | KERN_WARNING "Address:0x%x\n" |
1672 | KERN_WARNING "Count:0x%x\n" | ||
1673 | KERN_WARNING "Status: 0x%x\n", | ||
1670 | index + 1, frame->addr, frame->count, status); | 1674 | index + 1, frame->addr, frame->count, status); |
1671 | goto errrelfw; | 1675 | goto errrelfw; |
1672 | } | 1676 | } |
diff --git a/drivers/hwmon/adm1026.c b/drivers/hwmon/adm1026.c index aa875ca50d9..3e63c148677 100644 --- a/drivers/hwmon/adm1026.c +++ b/drivers/hwmon/adm1026.c | |||
@@ -1651,7 +1651,7 @@ static int adm1026_detect(struct i2c_adapter *adapter, int address, | |||
1651 | break; | 1651 | break; |
1652 | default : | 1652 | default : |
1653 | dev_err(&adapter->dev, ": Internal error, invalid " | 1653 | dev_err(&adapter->dev, ": Internal error, invalid " |
1654 | "kind (%d)!", kind); | 1654 | "kind (%d)!\n", kind); |
1655 | err = -EFAULT; | 1655 | err = -EFAULT; |
1656 | goto exitfree; | 1656 | goto exitfree; |
1657 | } | 1657 | } |
diff --git a/drivers/hwmon/lm63.c b/drivers/hwmon/lm63.c index f207434730d..650b07d5b90 100644 --- a/drivers/hwmon/lm63.c +++ b/drivers/hwmon/lm63.c | |||
@@ -533,7 +533,7 @@ static void lm63_init_client(struct i2c_client *client) | |||
533 | 533 | ||
534 | /* Start converting if needed */ | 534 | /* Start converting if needed */ |
535 | if (data->config & 0x40) { /* standby */ | 535 | if (data->config & 0x40) { /* standby */ |
536 | dev_dbg(&client->dev, "Switching to operational mode"); | 536 | dev_dbg(&client->dev, "Switching to operational mode\n"); |
537 | data->config &= 0xA7; | 537 | data->config &= 0xA7; |
538 | i2c_smbus_write_byte_data(client, LM63_REG_CONFIG1, | 538 | i2c_smbus_write_byte_data(client, LM63_REG_CONFIG1, |
539 | data->config); | 539 | data->config); |
diff --git a/drivers/hwmon/vt1211.c b/drivers/hwmon/vt1211.c index e69416465e6..7dfcc8dd316 100644 --- a/drivers/hwmon/vt1211.c +++ b/drivers/hwmon/vt1211.c | |||
@@ -795,7 +795,7 @@ static ssize_t set_pwm_auto_point_pwm(struct device *dev, | |||
795 | 795 | ||
796 | if ((val < 0) || (val > 255)) { | 796 | if ((val < 0) || (val > 255)) { |
797 | dev_err(dev, "pwm value %ld is out of range. " | 797 | dev_err(dev, "pwm value %ld is out of range. " |
798 | "Choose a value between 0 and 255." , val); | 798 | "Choose a value between 0 and 255.\n" , val); |
799 | return -EINVAL; | 799 | return -EINVAL; |
800 | } | 800 | } |
801 | 801 | ||
diff --git a/drivers/hwmon/w83791d.c b/drivers/hwmon/w83791d.c index b6f2ebf9f9c..a9c01a6f005 100644 --- a/drivers/hwmon/w83791d.c +++ b/drivers/hwmon/w83791d.c | |||
@@ -1096,7 +1096,7 @@ static int w83791d_detect(struct i2c_adapter *adapter, int address, int kind) | |||
1096 | if (kind == w83791d) { | 1096 | if (kind == w83791d) { |
1097 | client_name = "w83791d"; | 1097 | client_name = "w83791d"; |
1098 | } else { | 1098 | } else { |
1099 | dev_err(dev, "w83791d: Internal error: unknown kind (%d)?!?", | 1099 | dev_err(dev, "w83791d: Internal error: unknown kind (%d)?!?\n", |
1100 | kind); | 1100 | kind); |
1101 | goto error1; | 1101 | goto error1; |
1102 | } | 1102 | } |
diff --git a/drivers/hwmon/w83792d.c b/drivers/hwmon/w83792d.c index f836198b705..007449d3e16 100644 --- a/drivers/hwmon/w83792d.c +++ b/drivers/hwmon/w83792d.c | |||
@@ -1385,8 +1385,8 @@ w83792d_detect(struct i2c_adapter *adapter, int address, int kind) | |||
1385 | if (kind == w83792d) { | 1385 | if (kind == w83792d) { |
1386 | client_name = "w83792d"; | 1386 | client_name = "w83792d"; |
1387 | } else { | 1387 | } else { |
1388 | dev_err(dev, "w83792d: Internal error: unknown" | 1388 | dev_err(dev, "w83792d: Internal error: unknown kind (%d)?!?\n", |
1389 | " kind (%d)?!?", kind); | 1389 | kind); |
1390 | goto ERROR1; | 1390 | goto ERROR1; |
1391 | } | 1391 | } |
1392 | 1392 | ||
diff --git a/drivers/i2c/busses/i2c-pmcmsp.c b/drivers/i2c/busses/i2c-pmcmsp.c index 17cecf1ea79..be99c02ecac 100644 --- a/drivers/i2c/busses/i2c-pmcmsp.c +++ b/drivers/i2c/busses/i2c-pmcmsp.c | |||
@@ -591,18 +591,18 @@ static int pmcmsptwi_master_xfer(struct i2c_adapter *adap, | |||
591 | if (msg->flags & I2C_M_TEN) | 591 | if (msg->flags & I2C_M_TEN) |
592 | pmcmsptwi_set_twi_config(&oldcfg, data); | 592 | pmcmsptwi_set_twi_config(&oldcfg, data); |
593 | 593 | ||
594 | dev_dbg(&adap->dev, "I2C %s of %d bytes ", | 594 | dev_dbg(&adap->dev, "I2C %s of %d bytes %s\n", |
595 | (msg->flags & I2C_M_RD) ? "read" : "write", msg->len); | 595 | (msg->flags & I2C_M_RD) ? "read" : "write", msg->len, |
596 | (ret == MSP_TWI_XFER_OK) ? "succeeded" : "failed"); | ||
597 | |||
596 | if (ret != MSP_TWI_XFER_OK) { | 598 | if (ret != MSP_TWI_XFER_OK) { |
597 | /* | 599 | /* |
598 | * TODO: We could potentially loop and retry in the case | 600 | * TODO: We could potentially loop and retry in the case |
599 | * of MSP_TWI_XFER_TIMEOUT. | 601 | * of MSP_TWI_XFER_TIMEOUT. |
600 | */ | 602 | */ |
601 | dev_dbg(&adap->dev, "failed\n"); | ||
602 | return -1; | 603 | return -1; |
603 | } | 604 | } |
604 | 605 | ||
605 | dev_dbg(&adap->dev, "succeeded\n"); | ||
606 | return 0; | 606 | return 0; |
607 | } | 607 | } |
608 | 608 | ||
diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c index 17376feb1ac..f8d0dff0de7 100644 --- a/drivers/i2c/busses/i2c-pnx.c +++ b/drivers/i2c/busses/i2c-pnx.c | |||
@@ -575,7 +575,7 @@ static int __devinit i2c_pnx_probe(struct platform_device *pdev) | |||
575 | else { | 575 | else { |
576 | freq_mhz = PNX_DEFAULT_FREQ; | 576 | freq_mhz = PNX_DEFAULT_FREQ; |
577 | dev_info(&pdev->dev, "Setting bus frequency to default value: " | 577 | dev_info(&pdev->dev, "Setting bus frequency to default value: " |
578 | "%d MHz", freq_mhz); | 578 | "%d MHz\n", freq_mhz); |
579 | } | 579 | } |
580 | 580 | ||
581 | i2c_pnx->adapter->algo = &pnx_algorithm; | 581 | i2c_pnx->adapter->algo = &pnx_algorithm; |
diff --git a/drivers/i2c/chips/menelaus.c b/drivers/i2c/chips/menelaus.c index 66436bae11a..2dea0123a95 100644 --- a/drivers/i2c/chips/menelaus.c +++ b/drivers/i2c/chips/menelaus.c | |||
@@ -1195,7 +1195,7 @@ static int menelaus_probe(struct i2c_client *client) | |||
1195 | err = request_irq(client->irq, menelaus_irq, IRQF_DISABLED, | 1195 | err = request_irq(client->irq, menelaus_irq, IRQF_DISABLED, |
1196 | DRIVER_NAME, menelaus); | 1196 | DRIVER_NAME, menelaus); |
1197 | if (err) { | 1197 | if (err) { |
1198 | dev_dbg(&client->dev, "can't get IRQ %d, err %d", | 1198 | dev_dbg(&client->dev, "can't get IRQ %d, err %d\n", |
1199 | client->irq, err); | 1199 | client->irq, err); |
1200 | goto fail1; | 1200 | goto fail1; |
1201 | } | 1201 | } |
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c index a3409fdb307..7a7dab890f6 100644 --- a/drivers/infiniband/hw/ehca/ehca_main.c +++ b/drivers/infiniband/hw/ehca/ehca_main.c | |||
@@ -579,12 +579,12 @@ static ssize_t ehca_show_##name(struct device *dev, \ | |||
579 | \ | 579 | \ |
580 | rblock = ehca_alloc_fw_ctrlblock(GFP_KERNEL); \ | 580 | rblock = ehca_alloc_fw_ctrlblock(GFP_KERNEL); \ |
581 | if (!rblock) { \ | 581 | if (!rblock) { \ |
582 | dev_err(dev, "Can't allocate rblock memory."); \ | 582 | dev_err(dev, "Can't allocate rblock memory.\n"); \ |
583 | return 0; \ | 583 | return 0; \ |
584 | } \ | 584 | } \ |
585 | \ | 585 | \ |
586 | if (hipz_h_query_hca(shca->ipz_hca_handle, rblock) != H_SUCCESS) { \ | 586 | if (hipz_h_query_hca(shca->ipz_hca_handle, rblock) != H_SUCCESS) { \ |
587 | dev_err(dev, "Can't query device properties"); \ | 587 | dev_err(dev, "Can't query device properties\n"); \ |
588 | ehca_free_fw_ctrlblock(rblock); \ | 588 | ehca_free_fw_ctrlblock(rblock); \ |
589 | return 0; \ | 589 | return 0; \ |
590 | } \ | 590 | } \ |
diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c index 6df336bdd57..acd417197d0 100644 --- a/drivers/isdn/gigaset/common.c +++ b/drivers/isdn/gigaset/common.c | |||
@@ -534,7 +534,8 @@ int gigaset_fill_inbuf(struct inbuf_t *inbuf, const unsigned char *src, | |||
534 | n = RBUFSIZE - tail; | 534 | n = RBUFSIZE - tail; |
535 | if (!n) { | 535 | if (!n) { |
536 | dev_err(inbuf->cs->dev, | 536 | dev_err(inbuf->cs->dev, |
537 | "buffer overflow (%u bytes lost)", bytesleft); | 537 | "buffer overflow (%u bytes lost)\n", |
538 | bytesleft); | ||
538 | break; | 539 | break; |
539 | } | 540 | } |
540 | if (n > bytesleft) | 541 | if (n > bytesleft) |
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c index b79a9cf2d16..21b921dd6aa 100644 --- a/drivers/mtd/nand/s3c2410.c +++ b/drivers/mtd/nand/s3c2410.c | |||
@@ -696,7 +696,7 @@ static int s3c24xx_nand_probe(struct platform_device *pdev, | |||
696 | 696 | ||
697 | info->clk = clk_get(&pdev->dev, "nand"); | 697 | info->clk = clk_get(&pdev->dev, "nand"); |
698 | if (IS_ERR(info->clk)) { | 698 | if (IS_ERR(info->clk)) { |
699 | dev_err(&pdev->dev, "failed to get clock"); | 699 | dev_err(&pdev->dev, "failed to get clock\n"); |
700 | err = -ENOENT; | 700 | err = -ENOENT; |
701 | goto exit_error; | 701 | goto exit_error; |
702 | } | 702 | } |
diff --git a/drivers/net/ax88796.c b/drivers/net/ax88796.c index 9fe0517cf89..7495a9ee8f4 100644 --- a/drivers/net/ax88796.c +++ b/drivers/net/ax88796.c | |||
@@ -900,7 +900,7 @@ static int ax_probe(struct platform_device *pdev) | |||
900 | 900 | ||
901 | ax->map2 = ioremap(res->start, size); | 901 | ax->map2 = ioremap(res->start, size); |
902 | if (ax->map2 == NULL) { | 902 | if (ax->map2 == NULL) { |
903 | dev_err(&pdev->dev, "cannot map reset register"); | 903 | dev_err(&pdev->dev, "cannot map reset register\n"); |
904 | ret = -ENXIO; | 904 | ret = -ENXIO; |
905 | goto exit_mem2; | 905 | goto exit_mem2; |
906 | } | 906 | } |
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 78ed633ceb8..fa0d69ab908 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c | |||
@@ -6428,7 +6428,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev) | |||
6428 | /* enable device (incl. PCI PM wakeup), and bus-mastering */ | 6428 | /* enable device (incl. PCI PM wakeup), and bus-mastering */ |
6429 | rc = pci_enable_device(pdev); | 6429 | rc = pci_enable_device(pdev); |
6430 | if (rc) { | 6430 | if (rc) { |
6431 | dev_err(&pdev->dev, "Cannot enable PCI device, aborting."); | 6431 | dev_err(&pdev->dev, "Cannot enable PCI device, aborting.\n"); |
6432 | goto err_out; | 6432 | goto err_out; |
6433 | } | 6433 | } |
6434 | 6434 | ||
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c index fe5ffac7ac5..2809c99906e 100644 --- a/drivers/net/ehea/ehea_main.c +++ b/drivers/net/ehea/ehea_main.c | |||
@@ -3218,7 +3218,7 @@ static int __devinit ehea_probe_adapter(struct of_device *dev, | |||
3218 | /* get adapter properties */ | 3218 | /* get adapter properties */ |
3219 | ret = ehea_sense_adapter_attr(adapter); | 3219 | ret = ehea_sense_adapter_attr(adapter); |
3220 | if (ret) { | 3220 | if (ret) { |
3221 | dev_err(&dev->dev, "sense_adapter_attr failed: %d", ret); | 3221 | dev_err(&dev->dev, "sense_adapter_attr failed: %d\n", ret); |
3222 | goto out_free_ad; | 3222 | goto out_free_ad; |
3223 | } | 3223 | } |
3224 | 3224 | ||
@@ -3226,7 +3226,7 @@ static int __devinit ehea_probe_adapter(struct of_device *dev, | |||
3226 | EHEA_NEQ, EHEA_MAX_ENTRIES_EQ, 1); | 3226 | EHEA_NEQ, EHEA_MAX_ENTRIES_EQ, 1); |
3227 | if (!adapter->neq) { | 3227 | if (!adapter->neq) { |
3228 | ret = -EIO; | 3228 | ret = -EIO; |
3229 | dev_err(&dev->dev, "NEQ creation failed"); | 3229 | dev_err(&dev->dev, "NEQ creation failed\n"); |
3230 | goto out_free_ad; | 3230 | goto out_free_ad; |
3231 | } | 3231 | } |
3232 | 3232 | ||
@@ -3237,7 +3237,7 @@ static int __devinit ehea_probe_adapter(struct of_device *dev, | |||
3237 | ehea_interrupt_neq, IRQF_DISABLED, | 3237 | ehea_interrupt_neq, IRQF_DISABLED, |
3238 | "ehea_neq", adapter); | 3238 | "ehea_neq", adapter); |
3239 | if (ret) { | 3239 | if (ret) { |
3240 | dev_err(&dev->dev, "requesting NEQ IRQ failed"); | 3240 | dev_err(&dev->dev, "requesting NEQ IRQ failed\n"); |
3241 | goto out_kill_eq; | 3241 | goto out_kill_eq; |
3242 | } | 3242 | } |
3243 | 3243 | ||
@@ -3247,7 +3247,7 @@ static int __devinit ehea_probe_adapter(struct of_device *dev, | |||
3247 | 3247 | ||
3248 | ret = ehea_setup_ports(adapter); | 3248 | ret = ehea_setup_ports(adapter); |
3249 | if (ret) { | 3249 | if (ret) { |
3250 | dev_err(&dev->dev, "setup_ports failed"); | 3250 | dev_err(&dev->dev, "setup_ports failed\n"); |
3251 | goto out_rem_dev_sysfs; | 3251 | goto out_rem_dev_sysfs; |
3252 | } | 3252 | } |
3253 | 3253 | ||
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c index 64c8151f200..366e62a2b1e 100644 --- a/drivers/net/myri10ge/myri10ge.c +++ b/drivers/net/myri10ge/myri10ge.c | |||
@@ -3058,7 +3058,8 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
3058 | if (status != 0) { | 3058 | if (status != 0) { |
3059 | dac_enabled = 0; | 3059 | dac_enabled = 0; |
3060 | dev_err(&pdev->dev, | 3060 | dev_err(&pdev->dev, |
3061 | "64-bit pci address mask was refused, trying 32-bit"); | 3061 | "64-bit pci address mask was refused, " |
3062 | "trying 32-bit\n"); | ||
3062 | status = pci_set_dma_mask(pdev, DMA_32BIT_MASK); | 3063 | status = pci_set_dma_mask(pdev, DMA_32BIT_MASK); |
3063 | } | 3064 | } |
3064 | if (status != 0) { | 3065 | if (status != 0) { |
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 7967240534d..70d7e478a3e 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
@@ -3961,7 +3961,7 @@ static __devinit struct net_device *sky2_init_netdev(struct sky2_hw *hw, | |||
3961 | struct net_device *dev = alloc_etherdev(sizeof(*sky2)); | 3961 | struct net_device *dev = alloc_etherdev(sizeof(*sky2)); |
3962 | 3962 | ||
3963 | if (!dev) { | 3963 | if (!dev) { |
3964 | dev_err(&hw->pdev->dev, "etherdev alloc failed"); | 3964 | dev_err(&hw->pdev->dev, "etherdev alloc failed\n"); |
3965 | return NULL; | 3965 | return NULL; |
3966 | } | 3966 | } |
3967 | 3967 | ||
diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c index 6240b978fe3..f55a5951733 100644 --- a/drivers/net/usb/mcs7830.c +++ b/drivers/net/usb/mcs7830.c | |||
@@ -114,8 +114,8 @@ static void mcs7830_async_cmd_callback(struct urb *urb) | |||
114 | struct usb_ctrlrequest *req = (struct usb_ctrlrequest *)urb->context; | 114 | struct usb_ctrlrequest *req = (struct usb_ctrlrequest *)urb->context; |
115 | 115 | ||
116 | if (urb->status < 0) | 116 | if (urb->status < 0) |
117 | printk(KERN_DEBUG "mcs7830_async_cmd_callback() failed with %d", | 117 | printk(KERN_DEBUG "%s() failed with %d\n", |
118 | urb->status); | 118 | __FUNCTION__, urb->status); |
119 | 119 | ||
120 | kfree(req); | 120 | kfree(req); |
121 | usb_free_urb(urb); | 121 | usb_free_urb(urb); |
@@ -129,15 +129,15 @@ static void mcs7830_set_reg_async(struct usbnet *dev, u16 index, u16 size, void | |||
129 | 129 | ||
130 | urb = usb_alloc_urb(0, GFP_ATOMIC); | 130 | urb = usb_alloc_urb(0, GFP_ATOMIC); |
131 | if (!urb) { | 131 | if (!urb) { |
132 | dev_dbg(&dev->udev->dev, "Error allocating URB " | 132 | dev_dbg(&dev->udev->dev, |
133 | "in write_cmd_async!"); | 133 | "Error allocating URB in write_cmd_async!\n"); |
134 | return; | 134 | return; |
135 | } | 135 | } |
136 | 136 | ||
137 | req = kmalloc(sizeof *req, GFP_ATOMIC); | 137 | req = kmalloc(sizeof *req, GFP_ATOMIC); |
138 | if (!req) { | 138 | if (!req) { |
139 | dev_err(&dev->udev->dev, "Failed to allocate memory for " | 139 | dev_err(&dev->udev->dev, |
140 | "control request"); | 140 | "Failed to allocate memory for control request\n"); |
141 | goto out; | 141 | goto out; |
142 | } | 142 | } |
143 | req->bRequestType = MCS7830_WR_BMREQ; | 143 | req->bRequestType = MCS7830_WR_BMREQ; |
@@ -153,8 +153,8 @@ static void mcs7830_set_reg_async(struct usbnet *dev, u16 index, u16 size, void | |||
153 | 153 | ||
154 | ret = usb_submit_urb(urb, GFP_ATOMIC); | 154 | ret = usb_submit_urb(urb, GFP_ATOMIC); |
155 | if (ret < 0) { | 155 | if (ret < 0) { |
156 | dev_err(&dev->udev->dev, "Error submitting the control " | 156 | dev_err(&dev->udev->dev, |
157 | "message: ret=%d", ret); | 157 | "Error submitting the control message: ret=%d\n", ret); |
158 | goto out; | 158 | goto out; |
159 | } | 159 | } |
160 | return; | 160 | return; |
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index 7fd505cc4f7..2a8fc431099 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c | |||
@@ -1526,7 +1526,7 @@ static int xennet_connect(struct net_device *dev) | |||
1526 | 1526 | ||
1527 | if (!feature_rx_copy) { | 1527 | if (!feature_rx_copy) { |
1528 | dev_info(&dev->dev, | 1528 | dev_info(&dev->dev, |
1529 | "backend does not support copying recieve path"); | 1529 | "backend does not support copying receive path\n"); |
1530 | return -ENODEV; | 1530 | return -ENODEV; |
1531 | } | 1531 | } |
1532 | 1532 | ||
diff --git a/drivers/power/ds2760_battery.c b/drivers/power/ds2760_battery.c index be7021ee361..bdb9b7285b3 100644 --- a/drivers/power/ds2760_battery.c +++ b/drivers/power/ds2760_battery.c | |||
@@ -366,7 +366,7 @@ static int ds2760_battery_probe(struct platform_device *pdev) | |||
366 | 366 | ||
367 | retval = power_supply_register(&pdev->dev, &di->bat); | 367 | retval = power_supply_register(&pdev->dev, &di->bat); |
368 | if (retval) { | 368 | if (retval) { |
369 | dev_err(di->dev, "failed to register battery"); | 369 | dev_err(di->dev, "failed to register battery\n"); |
370 | goto batt_failed; | 370 | goto batt_failed; |
371 | } | 371 | } |
372 | 372 | ||
diff --git a/drivers/ps3/ps3stor_lib.c b/drivers/ps3/ps3stor_lib.c index 3a9824e3b25..55955f16ad9 100644 --- a/drivers/ps3/ps3stor_lib.c +++ b/drivers/ps3/ps3stor_lib.c | |||
@@ -66,7 +66,7 @@ static int ps3stor_probe_access(struct ps3_storage_device *dev) | |||
66 | if (n > 1) | 66 | if (n > 1) |
67 | dev_info(&dev->sbd.core, | 67 | dev_info(&dev->sbd.core, |
68 | "%s:%u: %lu accessible regions found. Only the first " | 68 | "%s:%u: %lu accessible regions found. Only the first " |
69 | "one will be used", | 69 | "one will be used\n", |
70 | __func__, __LINE__, n); | 70 | __func__, __LINE__, n); |
71 | dev->region_idx = __ffs(dev->accessible_regions); | 71 | dev->region_idx = __ffs(dev->accessible_regions); |
72 | dev_info(&dev->sbd.core, | 72 | dev_info(&dev->sbd.core, |
diff --git a/drivers/rtc/rtc-sysfs.c b/drivers/rtc/rtc-sysfs.c index 6cad0841f3c..2ae0e8304d3 100644 --- a/drivers/rtc/rtc-sysfs.c +++ b/drivers/rtc/rtc-sysfs.c | |||
@@ -200,9 +200,8 @@ void rtc_sysfs_add_device(struct rtc_device *rtc) | |||
200 | 200 | ||
201 | err = device_create_file(&rtc->dev, &dev_attr_wakealarm); | 201 | err = device_create_file(&rtc->dev, &dev_attr_wakealarm); |
202 | if (err) | 202 | if (err) |
203 | dev_err(rtc->dev.parent, "failed to create " | 203 | dev_err(rtc->dev.parent, |
204 | "alarm attribute, %d", | 204 | "failed to create alarm attribute, %d\n", err); |
205 | err); | ||
206 | } | 205 | } |
207 | 206 | ||
208 | void rtc_sysfs_del_device(struct rtc_device *rtc) | 207 | void rtc_sysfs_del_device(struct rtc_device *rtc) |
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c index e5337ad4121..ce348c5c706 100644 --- a/drivers/scsi/lpfc/lpfc_sli.c +++ b/drivers/scsi/lpfc/lpfc_sli.c | |||
@@ -1243,7 +1243,8 @@ void lpfc_sli_poll_fcp_ring(struct lpfc_hba *phba) | |||
1243 | memset(adaptermsg, 0, LPFC_MAX_ADPTMSG); | 1243 | memset(adaptermsg, 0, LPFC_MAX_ADPTMSG); |
1244 | memcpy(&adaptermsg[0], (uint8_t *) irsp, | 1244 | memcpy(&adaptermsg[0], (uint8_t *) irsp, |
1245 | MAX_MSG_DATA); | 1245 | MAX_MSG_DATA); |
1246 | dev_warn(&((phba->pcidev)->dev), "lpfc%d: %s", | 1246 | dev_warn(&((phba->pcidev)->dev), |
1247 | "lpfc%d: %s\n", | ||
1247 | phba->brd_no, adaptermsg); | 1248 | phba->brd_no, adaptermsg); |
1248 | } else { | 1249 | } else { |
1249 | /* Unknown IOCB command */ | 1250 | /* Unknown IOCB command */ |
@@ -1430,7 +1431,8 @@ lpfc_sli_handle_fast_ring_event(struct lpfc_hba *phba, | |||
1430 | memset(adaptermsg, 0, LPFC_MAX_ADPTMSG); | 1431 | memset(adaptermsg, 0, LPFC_MAX_ADPTMSG); |
1431 | memcpy(&adaptermsg[0], (uint8_t *) irsp, | 1432 | memcpy(&adaptermsg[0], (uint8_t *) irsp, |
1432 | MAX_MSG_DATA); | 1433 | MAX_MSG_DATA); |
1433 | dev_warn(&((phba->pcidev)->dev), "lpfc%d: %s", | 1434 | dev_warn(&((phba->pcidev)->dev), |
1435 | "lpfc%d: %s\n", | ||
1434 | phba->brd_no, adaptermsg); | 1436 | phba->brd_no, adaptermsg); |
1435 | } else { | 1437 | } else { |
1436 | /* Unknown IOCB command */ | 1438 | /* Unknown IOCB command */ |
@@ -1681,7 +1683,7 @@ lpfc_sli_handle_slow_ring_event(struct lpfc_hba *phba, | |||
1681 | memcpy(&adaptermsg[0], (uint8_t *) irsp, | 1683 | memcpy(&adaptermsg[0], (uint8_t *) irsp, |
1682 | MAX_MSG_DATA); | 1684 | MAX_MSG_DATA); |
1683 | dev_warn(&((phba->pcidev)->dev), | 1685 | dev_warn(&((phba->pcidev)->dev), |
1684 | "lpfc%d: %s", | 1686 | "lpfc%d: %s\n", |
1685 | phba->brd_no, adaptermsg); | 1687 | phba->brd_no, adaptermsg); |
1686 | } else { | 1688 | } else { |
1687 | /* Unknown IOCB command */ | 1689 | /* Unknown IOCB command */ |
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c index 03b68d4f3bd..89460d27c68 100644 --- a/drivers/scsi/qla4xxx/ql4_os.c +++ b/drivers/scsi/qla4xxx/ql4_os.c | |||
@@ -1286,7 +1286,7 @@ static int __devinit qla4xxx_probe_adapter(struct pci_dev *pdev, | |||
1286 | 1286 | ||
1287 | ret = scsi_init_shared_tag_map(host, MAX_SRBS); | 1287 | ret = scsi_init_shared_tag_map(host, MAX_SRBS); |
1288 | if (ret) { | 1288 | if (ret) { |
1289 | dev_warn(&ha->pdev->dev, "scsi_init_shared_tag_map failed"); | 1289 | dev_warn(&ha->pdev->dev, "scsi_init_shared_tag_map failed\n"); |
1290 | goto probe_failed; | 1290 | goto probe_failed; |
1291 | } | 1291 | } |
1292 | 1292 | ||
diff --git a/drivers/spi/spi_bfin5xx.c b/drivers/spi/spi_bfin5xx.c index 6cb71d74738..2ef11bb70b2 100644 --- a/drivers/spi/spi_bfin5xx.c +++ b/drivers/spi/spi_bfin5xx.c | |||
@@ -1070,7 +1070,7 @@ static int setup(struct spi_device *spi) | |||
1070 | return -ENODEV; | 1070 | return -ENODEV; |
1071 | } | 1071 | } |
1072 | 1072 | ||
1073 | dev_dbg(&spi->dev, "setup spi chip %s, width is %d, dma is %d,", | 1073 | dev_dbg(&spi->dev, "setup spi chip %s, width is %d, dma is %d\n", |
1074 | spi->modalias, chip->width, chip->enable_dma); | 1074 | spi->modalias, chip->width, chip->enable_dma); |
1075 | dev_dbg(&spi->dev, "ctl_reg is 0x%x, flag_reg is 0x%x\n", | 1075 | dev_dbg(&spi->dev, "ctl_reg is 0x%x, flag_reg is 0x%x\n", |
1076 | chip->ctl_reg, chip->flag); | 1076 | chip->ctl_reg, chip->flag); |
diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c index 3b4650ae6f1..7686ba34430 100644 --- a/drivers/spi/spi_imx.c +++ b/drivers/spi/spi_imx.c | |||
@@ -1194,7 +1194,7 @@ static int setup(struct spi_device *spi) | |||
1194 | chip = kzalloc(sizeof(struct chip_data), GFP_KERNEL); | 1194 | chip = kzalloc(sizeof(struct chip_data), GFP_KERNEL); |
1195 | if (!chip) { | 1195 | if (!chip) { |
1196 | dev_err(&spi->dev, | 1196 | dev_err(&spi->dev, |
1197 | "setup - cannot allocate controller state"); | 1197 | "setup - cannot allocate controller state\n"); |
1198 | return -ENOMEM; | 1198 | return -ENOMEM; |
1199 | } | 1199 | } |
1200 | chip->control = SPI_DEFAULT_CONTROL; | 1200 | chip->control = SPI_DEFAULT_CONTROL; |
@@ -1206,7 +1206,7 @@ static int setup(struct spi_device *spi) | |||
1206 | if (!chip_info) { | 1206 | if (!chip_info) { |
1207 | dev_err(&spi->dev, | 1207 | dev_err(&spi->dev, |
1208 | "setup - " | 1208 | "setup - " |
1209 | "cannot allocate controller data"); | 1209 | "cannot allocate controller data\n"); |
1210 | status = -ENOMEM; | 1210 | status = -ENOMEM; |
1211 | goto err_first_setup; | 1211 | goto err_first_setup; |
1212 | } | 1212 | } |
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index f51e22490ed..912d97aaf9b 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c | |||
@@ -332,7 +332,7 @@ static void acm_read_bulk(struct urb *urb) | |||
332 | return; | 332 | return; |
333 | 333 | ||
334 | if (status) | 334 | if (status) |
335 | dev_dbg(&acm->data->dev, "bulk rx status %d", status); | 335 | dev_dbg(&acm->data->dev, "bulk rx status %d\n", status); |
336 | 336 | ||
337 | buf = rcv->buffer; | 337 | buf = rcv->buffer; |
338 | buf->size = urb->actual_length; | 338 | buf->size = urb->actual_length; |
@@ -831,13 +831,13 @@ static int acm_probe (struct usb_interface *intf, | |||
831 | 831 | ||
832 | /* normal probing*/ | 832 | /* normal probing*/ |
833 | if (!buffer) { | 833 | if (!buffer) { |
834 | err("Wierd descriptor references\n"); | 834 | err("Weird descriptor references\n"); |
835 | return -EINVAL; | 835 | return -EINVAL; |
836 | } | 836 | } |
837 | 837 | ||
838 | if (!buflen) { | 838 | if (!buflen) { |
839 | if (intf->cur_altsetting->endpoint->extralen && intf->cur_altsetting->endpoint->extra) { | 839 | if (intf->cur_altsetting->endpoint->extralen && intf->cur_altsetting->endpoint->extra) { |
840 | dev_dbg(&intf->dev,"Seeking extra descriptors on endpoint"); | 840 | dev_dbg(&intf->dev,"Seeking extra descriptors on endpoint\n"); |
841 | buflen = intf->cur_altsetting->endpoint->extralen; | 841 | buflen = intf->cur_altsetting->endpoint->extralen; |
842 | buffer = intf->cur_altsetting->endpoint->extra; | 842 | buffer = intf->cur_altsetting->endpoint->extra; |
843 | } else { | 843 | } else { |
@@ -887,24 +887,24 @@ next_desc: | |||
887 | 887 | ||
888 | if (!union_header) { | 888 | if (!union_header) { |
889 | if (call_interface_num > 0) { | 889 | if (call_interface_num > 0) { |
890 | dev_dbg(&intf->dev,"No union descriptor, using call management descriptor"); | 890 | dev_dbg(&intf->dev,"No union descriptor, using call management descriptor\n"); |
891 | data_interface = usb_ifnum_to_if(usb_dev, (data_interface_num = call_interface_num)); | 891 | data_interface = usb_ifnum_to_if(usb_dev, (data_interface_num = call_interface_num)); |
892 | control_interface = intf; | 892 | control_interface = intf; |
893 | } else { | 893 | } else { |
894 | dev_dbg(&intf->dev,"No union descriptor, giving up"); | 894 | dev_dbg(&intf->dev,"No union descriptor, giving up\n"); |
895 | return -ENODEV; | 895 | return -ENODEV; |
896 | } | 896 | } |
897 | } else { | 897 | } else { |
898 | control_interface = usb_ifnum_to_if(usb_dev, union_header->bMasterInterface0); | 898 | control_interface = usb_ifnum_to_if(usb_dev, union_header->bMasterInterface0); |
899 | data_interface = usb_ifnum_to_if(usb_dev, (data_interface_num = union_header->bSlaveInterface0)); | 899 | data_interface = usb_ifnum_to_if(usb_dev, (data_interface_num = union_header->bSlaveInterface0)); |
900 | if (!control_interface || !data_interface) { | 900 | if (!control_interface || !data_interface) { |
901 | dev_dbg(&intf->dev,"no interfaces"); | 901 | dev_dbg(&intf->dev,"no interfaces\n"); |
902 | return -ENODEV; | 902 | return -ENODEV; |
903 | } | 903 | } |
904 | } | 904 | } |
905 | 905 | ||
906 | if (data_interface_num != call_interface_num) | 906 | if (data_interface_num != call_interface_num) |
907 | dev_dbg(&intf->dev,"Seperate call control interface. That is not fully supported."); | 907 | dev_dbg(&intf->dev,"Seperate call control interface. That is not fully supported.\n"); |
908 | 908 | ||
909 | skip_normal_probe: | 909 | skip_normal_probe: |
910 | 910 | ||
@@ -912,7 +912,7 @@ skip_normal_probe: | |||
912 | if (data_interface->cur_altsetting->desc.bInterfaceClass != CDC_DATA_INTERFACE_TYPE) { | 912 | if (data_interface->cur_altsetting->desc.bInterfaceClass != CDC_DATA_INTERFACE_TYPE) { |
913 | if (control_interface->cur_altsetting->desc.bInterfaceClass == CDC_DATA_INTERFACE_TYPE) { | 913 | if (control_interface->cur_altsetting->desc.bInterfaceClass == CDC_DATA_INTERFACE_TYPE) { |
914 | struct usb_interface *t; | 914 | struct usb_interface *t; |
915 | dev_dbg(&intf->dev,"Your device has switched interfaces."); | 915 | dev_dbg(&intf->dev,"Your device has switched interfaces.\n"); |
916 | 916 | ||
917 | t = control_interface; | 917 | t = control_interface; |
918 | control_interface = data_interface; | 918 | control_interface = data_interface; |
@@ -927,7 +927,7 @@ skip_normal_probe: | |||
927 | return -ENODEV; | 927 | return -ENODEV; |
928 | 928 | ||
929 | if (usb_interface_claimed(data_interface)) { /* valid in this context */ | 929 | if (usb_interface_claimed(data_interface)) { /* valid in this context */ |
930 | dev_dbg(&intf->dev,"The data interface isn't available"); | 930 | dev_dbg(&intf->dev,"The data interface isn't available\n"); |
931 | return -EBUSY; | 931 | return -EBUSY; |
932 | } | 932 | } |
933 | 933 | ||
@@ -944,7 +944,7 @@ skip_normal_probe: | |||
944 | if (!usb_endpoint_dir_in(epread)) { | 944 | if (!usb_endpoint_dir_in(epread)) { |
945 | /* descriptors are swapped */ | 945 | /* descriptors are swapped */ |
946 | struct usb_endpoint_descriptor *t; | 946 | struct usb_endpoint_descriptor *t; |
947 | dev_dbg(&intf->dev,"The data interface has switched endpoints"); | 947 | dev_dbg(&intf->dev,"The data interface has switched endpoints\n"); |
948 | 948 | ||
949 | t = epread; | 949 | t = epread; |
950 | epread = epwrite; | 950 | epread = epwrite; |
@@ -959,7 +959,7 @@ skip_normal_probe: | |||
959 | } | 959 | } |
960 | 960 | ||
961 | if (!(acm = kzalloc(sizeof(struct acm), GFP_KERNEL))) { | 961 | if (!(acm = kzalloc(sizeof(struct acm), GFP_KERNEL))) { |
962 | dev_dbg(&intf->dev, "out of memory (acm kzalloc)"); | 962 | dev_dbg(&intf->dev, "out of memory (acm kzalloc)\n"); |
963 | goto alloc_fail; | 963 | goto alloc_fail; |
964 | } | 964 | } |
965 | 965 | ||
@@ -985,26 +985,26 @@ skip_normal_probe: | |||
985 | 985 | ||
986 | buf = usb_buffer_alloc(usb_dev, ctrlsize, GFP_KERNEL, &acm->ctrl_dma); | 986 | buf = usb_buffer_alloc(usb_dev, ctrlsize, GFP_KERNEL, &acm->ctrl_dma); |
987 | if (!buf) { | 987 | if (!buf) { |
988 | dev_dbg(&intf->dev, "out of memory (ctrl buffer alloc)"); | 988 | dev_dbg(&intf->dev, "out of memory (ctrl buffer alloc)\n"); |
989 | goto alloc_fail2; | 989 | goto alloc_fail2; |
990 | } | 990 | } |
991 | acm->ctrl_buffer = buf; | 991 | acm->ctrl_buffer = buf; |
992 | 992 | ||
993 | if (acm_write_buffers_alloc(acm) < 0) { | 993 | if (acm_write_buffers_alloc(acm) < 0) { |
994 | dev_dbg(&intf->dev, "out of memory (write buffer alloc)"); | 994 | dev_dbg(&intf->dev, "out of memory (write buffer alloc)\n"); |
995 | goto alloc_fail4; | 995 | goto alloc_fail4; |
996 | } | 996 | } |
997 | 997 | ||
998 | acm->ctrlurb = usb_alloc_urb(0, GFP_KERNEL); | 998 | acm->ctrlurb = usb_alloc_urb(0, GFP_KERNEL); |
999 | if (!acm->ctrlurb) { | 999 | if (!acm->ctrlurb) { |
1000 | dev_dbg(&intf->dev, "out of memory (ctrlurb kmalloc)"); | 1000 | dev_dbg(&intf->dev, "out of memory (ctrlurb kmalloc)\n"); |
1001 | goto alloc_fail5; | 1001 | goto alloc_fail5; |
1002 | } | 1002 | } |
1003 | for (i = 0; i < num_rx_buf; i++) { | 1003 | for (i = 0; i < num_rx_buf; i++) { |
1004 | struct acm_ru *rcv = &(acm->ru[i]); | 1004 | struct acm_ru *rcv = &(acm->ru[i]); |
1005 | 1005 | ||
1006 | if (!(rcv->urb = usb_alloc_urb(0, GFP_KERNEL))) { | 1006 | if (!(rcv->urb = usb_alloc_urb(0, GFP_KERNEL))) { |
1007 | dev_dbg(&intf->dev, "out of memory (read urbs usb_alloc_urb)"); | 1007 | dev_dbg(&intf->dev, "out of memory (read urbs usb_alloc_urb)\n"); |
1008 | goto alloc_fail7; | 1008 | goto alloc_fail7; |
1009 | } | 1009 | } |
1010 | 1010 | ||
@@ -1015,13 +1015,13 @@ skip_normal_probe: | |||
1015 | struct acm_rb *buf = &(acm->rb[i]); | 1015 | struct acm_rb *buf = &(acm->rb[i]); |
1016 | 1016 | ||
1017 | if (!(buf->base = usb_buffer_alloc(acm->dev, readsize, GFP_KERNEL, &buf->dma))) { | 1017 | if (!(buf->base = usb_buffer_alloc(acm->dev, readsize, GFP_KERNEL, &buf->dma))) { |
1018 | dev_dbg(&intf->dev, "out of memory (read bufs usb_buffer_alloc)"); | 1018 | dev_dbg(&intf->dev, "out of memory (read bufs usb_buffer_alloc)\n"); |
1019 | goto alloc_fail7; | 1019 | goto alloc_fail7; |
1020 | } | 1020 | } |
1021 | } | 1021 | } |
1022 | acm->writeurb = usb_alloc_urb(0, GFP_KERNEL); | 1022 | acm->writeurb = usb_alloc_urb(0, GFP_KERNEL); |
1023 | if (!acm->writeurb) { | 1023 | if (!acm->writeurb) { |
1024 | dev_dbg(&intf->dev, "out of memory (writeurb kmalloc)"); | 1024 | dev_dbg(&intf->dev, "out of memory (writeurb kmalloc)\n"); |
1025 | goto alloc_fail7; | 1025 | goto alloc_fail7; |
1026 | } | 1026 | } |
1027 | 1027 | ||
diff --git a/drivers/usb/core/endpoint.c b/drivers/usb/core/endpoint.c index 7dc123d6b2d..99e5a68a3f1 100644 --- a/drivers/usb/core/endpoint.c +++ b/drivers/usb/core/endpoint.c | |||
@@ -291,7 +291,7 @@ int usb_create_ep_files(struct device *parent, | |||
291 | 291 | ||
292 | retval = endpoint_get_minor(ep_dev); | 292 | retval = endpoint_get_minor(ep_dev); |
293 | if (retval) { | 293 | if (retval) { |
294 | dev_err(parent, "can not allocate minor number for %s", | 294 | dev_err(parent, "can not allocate minor number for %s\n", |
295 | ep_dev->dev.bus_id); | 295 | ep_dev->dev.bus_id); |
296 | goto error_register; | 296 | goto error_register; |
297 | } | 297 | } |
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c index c021af39037..8dd5a6afd51 100644 --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c | |||
@@ -1526,7 +1526,7 @@ int usb_set_configuration(struct usb_device *dev, int configuration) | |||
1526 | new_interfaces = kmalloc(nintf * sizeof(*new_interfaces), | 1526 | new_interfaces = kmalloc(nintf * sizeof(*new_interfaces), |
1527 | GFP_KERNEL); | 1527 | GFP_KERNEL); |
1528 | if (!new_interfaces) { | 1528 | if (!new_interfaces) { |
1529 | dev_err(&dev->dev, "Out of memory"); | 1529 | dev_err(&dev->dev, "Out of memory\n"); |
1530 | return -ENOMEM; | 1530 | return -ENOMEM; |
1531 | } | 1531 | } |
1532 | 1532 | ||
@@ -1535,7 +1535,7 @@ int usb_set_configuration(struct usb_device *dev, int configuration) | |||
1535 | sizeof(struct usb_interface), | 1535 | sizeof(struct usb_interface), |
1536 | GFP_KERNEL); | 1536 | GFP_KERNEL); |
1537 | if (!new_interfaces[n]) { | 1537 | if (!new_interfaces[n]) { |
1538 | dev_err(&dev->dev, "Out of memory"); | 1538 | dev_err(&dev->dev, "Out of memory\n"); |
1539 | ret = -ENOMEM; | 1539 | ret = -ENOMEM; |
1540 | free_interfaces: | 1540 | free_interfaces: |
1541 | while (--n >= 0) | 1541 | while (--n >= 0) |
diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c index 6829814b7aa..44b79e8a6e2 100644 --- a/drivers/usb/host/ohci-s3c2410.c +++ b/drivers/usb/host/ohci-s3c2410.c | |||
@@ -358,7 +358,7 @@ static int usb_hcd_s3c2410_probe (const struct hc_driver *driver, | |||
358 | hcd->rsrc_len = dev->resource[0].end - dev->resource[0].start + 1; | 358 | hcd->rsrc_len = dev->resource[0].end - dev->resource[0].start + 1; |
359 | 359 | ||
360 | if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) { | 360 | if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) { |
361 | dev_err(&dev->dev, "request_mem_region failed"); | 361 | dev_err(&dev->dev, "request_mem_region failed\n"); |
362 | retval = -EBUSY; | 362 | retval = -EBUSY; |
363 | goto err_put; | 363 | goto err_put; |
364 | } | 364 | } |
diff --git a/drivers/usb/misc/adutux.c b/drivers/usb/misc/adutux.c index 5131cbfb2f5..c567aa7a41e 100644 --- a/drivers/usb/misc/adutux.c +++ b/drivers/usb/misc/adutux.c | |||
@@ -805,7 +805,7 @@ static int adu_probe(struct usb_interface *interface, | |||
805 | dev->minor = interface->minor; | 805 | dev->minor = interface->minor; |
806 | 806 | ||
807 | /* let the user know what node this device is now attached to */ | 807 | /* let the user know what node this device is now attached to */ |
808 | dev_info(&interface->dev, "ADU%d %s now attached to /dev/usb/adutux%d", | 808 | dev_info(&interface->dev, "ADU%d %s now attached to /dev/usb/adutux%d\n", |
809 | udev->descriptor.idProduct, dev->serial_number, | 809 | udev->descriptor.idProduct, dev->serial_number, |
810 | (dev->minor - ADU_MINOR_BASE)); | 810 | (dev->minor - ADU_MINOR_BASE)); |
811 | exit: | 811 | exit: |
@@ -851,7 +851,7 @@ static void adu_disconnect(struct usb_interface *interface) | |||
851 | mutex_unlock(&dev->mtx); | 851 | mutex_unlock(&dev->mtx); |
852 | } | 852 | } |
853 | 853 | ||
854 | dev_info(&interface->dev, "ADU device adutux%d now disconnected", | 854 | dev_info(&interface->dev, "ADU device adutux%d now disconnected\n", |
855 | (minor - ADU_MINOR_BASE)); | 855 | (minor - ADU_MINOR_BASE)); |
856 | 856 | ||
857 | dbg(2," %s : leave", __FUNCTION__); | 857 | dbg(2," %s : leave", __FUNCTION__); |
diff --git a/drivers/usb/misc/iowarrior.c b/drivers/usb/misc/iowarrior.c index 46d9f27ec17..d372fbc4eff 100644 --- a/drivers/usb/misc/iowarrior.c +++ b/drivers/usb/misc/iowarrior.c | |||
@@ -216,7 +216,7 @@ static void iowarrior_callback(struct urb *urb) | |||
216 | exit: | 216 | exit: |
217 | retval = usb_submit_urb(urb, GFP_ATOMIC); | 217 | retval = usb_submit_urb(urb, GFP_ATOMIC); |
218 | if (retval) | 218 | if (retval) |
219 | dev_err(&dev->interface->dev, "%s - usb_submit_urb failed with result %d", | 219 | dev_err(&dev->interface->dev, "%s - usb_submit_urb failed with result %d\n", |
220 | __FUNCTION__, retval); | 220 | __FUNCTION__, retval); |
221 | 221 | ||
222 | } | 222 | } |
@@ -451,7 +451,7 @@ static ssize_t iowarrior_write(struct file *file, | |||
451 | break; | 451 | break; |
452 | default: | 452 | default: |
453 | /* what do we have here ? An unsupported Product-ID ? */ | 453 | /* what do we have here ? An unsupported Product-ID ? */ |
454 | dev_err(&dev->interface->dev, "%s - not supported for product=0x%x", | 454 | dev_err(&dev->interface->dev, "%s - not supported for product=0x%x\n", |
455 | __FUNCTION__, dev->product_id); | 455 | __FUNCTION__, dev->product_id); |
456 | retval = -EFAULT; | 456 | retval = -EFAULT; |
457 | goto exit; | 457 | goto exit; |
@@ -526,7 +526,7 @@ static int iowarrior_ioctl(struct inode *inode, struct file *file, | |||
526 | } else { | 526 | } else { |
527 | retval = -EINVAL; | 527 | retval = -EINVAL; |
528 | dev_err(&dev->interface->dev, | 528 | dev_err(&dev->interface->dev, |
529 | "ioctl 'IOW_WRITE' is not supported for product=0x%x.", | 529 | "ioctl 'IOW_WRITE' is not supported for product=0x%x.\n", |
530 | dev->product_id); | 530 | dev->product_id); |
531 | } | 531 | } |
532 | break; | 532 | break; |
@@ -752,7 +752,7 @@ static int iowarrior_probe(struct usb_interface *interface, | |||
752 | /* allocate memory for our device state and intialize it */ | 752 | /* allocate memory for our device state and intialize it */ |
753 | dev = kzalloc(sizeof(struct iowarrior), GFP_KERNEL); | 753 | dev = kzalloc(sizeof(struct iowarrior), GFP_KERNEL); |
754 | if (dev == NULL) { | 754 | if (dev == NULL) { |
755 | dev_err(&interface->dev, "Out of memory"); | 755 | dev_err(&interface->dev, "Out of memory\n"); |
756 | return retval; | 756 | return retval; |
757 | } | 757 | } |
758 | 758 | ||
diff --git a/drivers/usb/misc/phidgetmotorcontrol.c b/drivers/usb/misc/phidgetmotorcontrol.c index df0ebcdb9d6..2ad09b1f484 100644 --- a/drivers/usb/misc/phidgetmotorcontrol.c +++ b/drivers/usb/misc/phidgetmotorcontrol.c | |||
@@ -155,7 +155,7 @@ resubmit: | |||
155 | retval = usb_submit_urb(urb, GFP_ATOMIC); | 155 | retval = usb_submit_urb(urb, GFP_ATOMIC); |
156 | if (retval) | 156 | if (retval) |
157 | dev_err(&mc->intf->dev, | 157 | dev_err(&mc->intf->dev, |
158 | "can't resubmit intr, %s-%s/motorcontrol0, retval %d", | 158 | "can't resubmit intr, %s-%s/motorcontrol0, retval %d\n", |
159 | mc->udev->bus->bus_name, | 159 | mc->udev->bus->bus_name, |
160 | mc->udev->devpath, retval); | 160 | mc->udev->devpath, retval); |
161 | } | 161 | } |
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index e4c248c98e8..65257867b34 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
@@ -1071,7 +1071,7 @@ static ssize_t show_latency_timer(struct device *dev, struct device_attribute *a | |||
1071 | (char*) &latency, 1, WDR_TIMEOUT); | 1071 | (char*) &latency, 1, WDR_TIMEOUT); |
1072 | 1072 | ||
1073 | if (rv < 0) { | 1073 | if (rv < 0) { |
1074 | dev_err(dev, "Unable to read latency timer: %i", rv); | 1074 | dev_err(dev, "Unable to read latency timer: %i\n", rv); |
1075 | return -EIO; | 1075 | return -EIO; |
1076 | } | 1076 | } |
1077 | return sprintf(buf, "%i\n", latency); | 1077 | return sprintf(buf, "%i\n", latency); |
@@ -1098,7 +1098,7 @@ static ssize_t store_latency_timer(struct device *dev, struct device_attribute * | |||
1098 | buf, 0, WDR_TIMEOUT); | 1098 | buf, 0, WDR_TIMEOUT); |
1099 | 1099 | ||
1100 | if (rv < 0) { | 1100 | if (rv < 0) { |
1101 | dev_err(dev, "Unable to write latency timer: %i", rv); | 1101 | dev_err(dev, "Unable to write latency timer: %i\n", rv); |
1102 | return -EIO; | 1102 | return -EIO; |
1103 | } | 1103 | } |
1104 | 1104 | ||
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c index 2ecb1d2a034..8dd3abc99d6 100644 --- a/drivers/usb/serial/io_edgeport.c +++ b/drivers/usb/serial/io_edgeport.c | |||
@@ -2882,7 +2882,7 @@ static int edge_startup (struct usb_serial *serial) | |||
2882 | (edge_serial->product_info.NumPorts != serial->num_ports)) { | 2882 | (edge_serial->product_info.NumPorts != serial->num_ports)) { |
2883 | dev_warn(&serial->dev->dev, "Device Reported %d serial ports " | 2883 | dev_warn(&serial->dev->dev, "Device Reported %d serial ports " |
2884 | "vs. core thinking we have %d ports, email " | 2884 | "vs. core thinking we have %d ports, email " |
2885 | "greg@kroah.com this information.", | 2885 | "greg@kroah.com this information.\n", |
2886 | edge_serial->product_info.NumPorts, | 2886 | edge_serial->product_info.NumPorts, |
2887 | serial->num_ports); | 2887 | serial->num_ports); |
2888 | } | 2888 | } |
diff --git a/drivers/usb/serial/ipw.c b/drivers/usb/serial/ipw.c index 1b94daa6158..cbe5530f3db 100644 --- a/drivers/usb/serial/ipw.c +++ b/drivers/usb/serial/ipw.c | |||
@@ -227,7 +227,7 @@ static int ipw_open(struct usb_serial_port *port, struct file *filp) | |||
227 | 0, | 227 | 0, |
228 | 100000); | 228 | 100000); |
229 | if (result < 0) | 229 | if (result < 0) |
230 | dev_err(&port->dev, "Init of modem failed (error = %d)", result); | 230 | dev_err(&port->dev, "Init of modem failed (error = %d)\n", result); |
231 | 231 | ||
232 | /* reset the bulk pipes */ | 232 | /* reset the bulk pipes */ |
233 | usb_clear_halt(dev, usb_rcvbulkpipe(dev, port->bulk_in_endpointAddress)); | 233 | usb_clear_halt(dev, usb_rcvbulkpipe(dev, port->bulk_in_endpointAddress)); |
@@ -255,7 +255,7 @@ static int ipw_open(struct usb_serial_port *port, struct file *filp) | |||
255 | 0, | 255 | 0, |
256 | 100000); | 256 | 100000); |
257 | if (result < 0) | 257 | if (result < 0) |
258 | dev_err(&port->dev, "Enabling bulk RxRead failed (error = %d)", result); | 258 | dev_err(&port->dev, "Enabling bulk RxRead failed (error = %d)\n", result); |
259 | 259 | ||
260 | /*--4: setup the initial flowcontrol */ | 260 | /*--4: setup the initial flowcontrol */ |
261 | dbg("%s:setting init flowcontrol (%s)",__FUNCTION__,buf_flow_init); | 261 | dbg("%s:setting init flowcontrol (%s)",__FUNCTION__,buf_flow_init); |
@@ -268,7 +268,7 @@ static int ipw_open(struct usb_serial_port *port, struct file *filp) | |||
268 | 0x10, | 268 | 0x10, |
269 | 200000); | 269 | 200000); |
270 | if (result < 0) | 270 | if (result < 0) |
271 | dev_err(&port->dev, "initial flowcontrol failed (error = %d)", result); | 271 | dev_err(&port->dev, "initial flowcontrol failed (error = %d)\n", result); |
272 | 272 | ||
273 | 273 | ||
274 | /*--5: raise the dtr */ | 274 | /*--5: raise the dtr */ |
@@ -282,7 +282,7 @@ static int ipw_open(struct usb_serial_port *port, struct file *filp) | |||
282 | 0, | 282 | 0, |
283 | 200000); | 283 | 200000); |
284 | if (result < 0) | 284 | if (result < 0) |
285 | dev_err(&port->dev, "setting dtr failed (error = %d)", result); | 285 | dev_err(&port->dev, "setting dtr failed (error = %d)\n", result); |
286 | 286 | ||
287 | /*--6: raise the rts */ | 287 | /*--6: raise the rts */ |
288 | dbg("%s:raising rts",__FUNCTION__); | 288 | dbg("%s:raising rts",__FUNCTION__); |
@@ -295,7 +295,7 @@ static int ipw_open(struct usb_serial_port *port, struct file *filp) | |||
295 | 0, | 295 | 0, |
296 | 200000); | 296 | 200000); |
297 | if (result < 0) | 297 | if (result < 0) |
298 | dev_err(&port->dev, "setting dtr failed (error = %d)", result); | 298 | dev_err(&port->dev, "setting dtr failed (error = %d)\n", result); |
299 | 299 | ||
300 | kfree(buf_flow_init); | 300 | kfree(buf_flow_init); |
301 | return 0; | 301 | return 0; |
@@ -322,7 +322,7 @@ static void ipw_close(struct usb_serial_port *port, struct file * filp) | |||
322 | 0, | 322 | 0, |
323 | 200000); | 323 | 200000); |
324 | if (result < 0) | 324 | if (result < 0) |
325 | dev_err(&port->dev, "dropping dtr failed (error = %d)", result); | 325 | dev_err(&port->dev, "dropping dtr failed (error = %d)\n", result); |
326 | 326 | ||
327 | /*--2: drop the rts */ | 327 | /*--2: drop the rts */ |
328 | dbg("%s:dropping rts",__FUNCTION__); | 328 | dbg("%s:dropping rts",__FUNCTION__); |
@@ -334,7 +334,7 @@ static void ipw_close(struct usb_serial_port *port, struct file * filp) | |||
334 | 0, | 334 | 0, |
335 | 200000); | 335 | 200000); |
336 | if (result < 0) | 336 | if (result < 0) |
337 | dev_err(&port->dev, "dropping rts failed (error = %d)", result); | 337 | dev_err(&port->dev, "dropping rts failed (error = %d)\n", result); |
338 | 338 | ||
339 | 339 | ||
340 | /*--3: purge */ | 340 | /*--3: purge */ |
@@ -347,7 +347,7 @@ static void ipw_close(struct usb_serial_port *port, struct file * filp) | |||
347 | 0, | 347 | 0, |
348 | 200000); | 348 | 200000); |
349 | if (result < 0) | 349 | if (result < 0) |
350 | dev_err(&port->dev, "purge failed (error = %d)", result); | 350 | dev_err(&port->dev, "purge failed (error = %d)\n", result); |
351 | 351 | ||
352 | 352 | ||
353 | /* send RXBULK_off (tell modem to stop transmitting bulk data on rx chan) */ | 353 | /* send RXBULK_off (tell modem to stop transmitting bulk data on rx chan) */ |
@@ -361,7 +361,7 @@ static void ipw_close(struct usb_serial_port *port, struct file * filp) | |||
361 | 100000); | 361 | 100000); |
362 | 362 | ||
363 | if (result < 0) | 363 | if (result < 0) |
364 | dev_err(&port->dev, "Disabling bulk RxRead failed (error = %d)", result); | 364 | dev_err(&port->dev, "Disabling bulk RxRead failed (error = %d)\n", result); |
365 | 365 | ||
366 | /* shutdown any in-flight urbs that we know about */ | 366 | /* shutdown any in-flight urbs that we know about */ |
367 | usb_kill_urb(port->read_urb); | 367 | usb_kill_urb(port->read_urb); |
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c index 01e811becec..e02c198016b 100644 --- a/drivers/usb/serial/mos7720.c +++ b/drivers/usb/serial/mos7720.c | |||
@@ -478,7 +478,7 @@ static int mos7720_open(struct usb_serial_port *port, struct file * filp) | |||
478 | response = usb_submit_urb(port0->interrupt_in_urb, GFP_KERNEL); | 478 | response = usb_submit_urb(port0->interrupt_in_urb, GFP_KERNEL); |
479 | if (response) | 479 | if (response) |
480 | dev_err(&port->dev, | 480 | dev_err(&port->dev, |
481 | "%s - Error %d submitting control urb", | 481 | "%s - Error %d submitting control urb\n", |
482 | __FUNCTION__, response); | 482 | __FUNCTION__, response); |
483 | } | 483 | } |
484 | 484 | ||
@@ -492,7 +492,7 @@ static int mos7720_open(struct usb_serial_port *port, struct file * filp) | |||
492 | response = usb_submit_urb(port->read_urb, GFP_KERNEL); | 492 | response = usb_submit_urb(port->read_urb, GFP_KERNEL); |
493 | if (response) | 493 | if (response) |
494 | dev_err(&port->dev, | 494 | dev_err(&port->dev, |
495 | "%s - Error %d submitting read urb", __FUNCTION__, response); | 495 | "%s - Error %d submitting read urb\n", __FUNCTION__, response); |
496 | 496 | ||
497 | /* initialize our icount structure */ | 497 | /* initialize our icount structure */ |
498 | memset(&(mos7720_port->icount), 0x00, sizeof(mos7720_port->icount)); | 498 | memset(&(mos7720_port->icount), 0x00, sizeof(mos7720_port->icount)); |
diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c index d19861166b5..eea226ae37b 100644 --- a/drivers/usb/serial/oti6858.c +++ b/drivers/usb/serial/oti6858.c | |||
@@ -256,7 +256,7 @@ static void setup_line(struct work_struct *work) | |||
256 | 100); | 256 | 100); |
257 | 257 | ||
258 | if (result != OTI6858_CTRL_PKT_SIZE) { | 258 | if (result != OTI6858_CTRL_PKT_SIZE) { |
259 | dev_err(&port->dev, "%s(): error reading status", __FUNCTION__); | 259 | dev_err(&port->dev, "%s(): error reading status\n", __FUNCTION__); |
260 | kfree(new_setup); | 260 | kfree(new_setup); |
261 | /* we will try again */ | 261 | /* we will try again */ |
262 | schedule_delayed_work(&priv->delayed_setup_work, msecs_to_jiffies(2)); | 262 | schedule_delayed_work(&priv->delayed_setup_work, msecs_to_jiffies(2)); |
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c index 0bb8de4cc52..959b3e4e907 100644 --- a/drivers/usb/serial/sierra.c +++ b/drivers/usb/serial/sierra.c | |||
@@ -48,7 +48,7 @@ enum devicetype { | |||
48 | static int sierra_set_power_state(struct usb_device *udev, __u16 swiState) | 48 | static int sierra_set_power_state(struct usb_device *udev, __u16 swiState) |
49 | { | 49 | { |
50 | int result; | 50 | int result; |
51 | dev_dbg(&udev->dev, "%s", "SET POWER STATE"); | 51 | dev_dbg(&udev->dev, "%s", "SET POWER STATE\n"); |
52 | result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), | 52 | result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), |
53 | 0x00, /* __u8 request */ | 53 | 0x00, /* __u8 request */ |
54 | 0x40, /* __u8 request type */ | 54 | 0x40, /* __u8 request type */ |
@@ -63,7 +63,7 @@ static int sierra_set_power_state(struct usb_device *udev, __u16 swiState) | |||
63 | static int sierra_set_ms_mode(struct usb_device *udev, __u16 eSocMode) | 63 | static int sierra_set_ms_mode(struct usb_device *udev, __u16 eSocMode) |
64 | { | 64 | { |
65 | int result; | 65 | int result; |
66 | dev_dbg(&udev->dev, "%s", "DEVICE MODE SWITCH"); | 66 | dev_dbg(&udev->dev, "%s", "DEVICE MODE SWITCH\n"); |
67 | result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), | 67 | result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), |
68 | SWIMS_USB_REQUEST_SetMode, /* __u8 request */ | 68 | SWIMS_USB_REQUEST_SetMode, /* __u8 request */ |
69 | SWIMS_USB_REQUEST_TYPE_SetMode, /* __u8 request type */ | 69 | SWIMS_USB_REQUEST_TYPE_SetMode, /* __u8 request type */ |
@@ -397,7 +397,7 @@ static void sierra_indat_callback(struct urb *urb) | |||
397 | err = usb_submit_urb(urb, GFP_ATOMIC); | 397 | err = usb_submit_urb(urb, GFP_ATOMIC); |
398 | if (err) | 398 | if (err) |
399 | dev_err(&port->dev, "resubmit read urb failed." | 399 | dev_err(&port->dev, "resubmit read urb failed." |
400 | "(%d)", err); | 400 | "(%d)\n", err); |
401 | } | 401 | } |
402 | } | 402 | } |
403 | return; | 403 | return; |
@@ -525,7 +525,7 @@ static int sierra_open(struct usb_serial_port *port, struct file *filp) | |||
525 | 525 | ||
526 | result = usb_submit_urb(urb, GFP_KERNEL); | 526 | result = usb_submit_urb(urb, GFP_KERNEL); |
527 | if (result) { | 527 | if (result) { |
528 | dev_err(&port->dev, "submit urb %d failed (%d) %d", | 528 | dev_err(&port->dev, "submit urb %d failed (%d) %d\n", |
529 | i, result, urb->transfer_buffer_length); | 529 | i, result, urb->transfer_buffer_length); |
530 | } | 530 | } |
531 | } | 531 | } |
@@ -538,7 +538,7 @@ static int sierra_open(struct usb_serial_port *port, struct file *filp) | |||
538 | if (port->interrupt_in_urb) { | 538 | if (port->interrupt_in_urb) { |
539 | result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL); | 539 | result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL); |
540 | if (result) | 540 | if (result) |
541 | dev_err(&port->dev, "submit irq_in urb failed %d", | 541 | dev_err(&port->dev, "submit irq_in urb failed %d\n", |
542 | result); | 542 | result); |
543 | } | 543 | } |
544 | return 0; | 544 | return 0; |
diff --git a/drivers/video/gxt4500.c b/drivers/video/gxt4500.c index 23a6bcc3e3c..e92337bef50 100644 --- a/drivers/video/gxt4500.c +++ b/drivers/video/gxt4500.c | |||
@@ -636,7 +636,7 @@ static int __devinit gxt4500_probe(struct pci_dev *pdev, | |||
636 | 636 | ||
637 | info = framebuffer_alloc(sizeof(struct gxt4500_par), &pdev->dev); | 637 | info = framebuffer_alloc(sizeof(struct gxt4500_par), &pdev->dev); |
638 | if (!info) { | 638 | if (!info) { |
639 | dev_err(&pdev->dev, "gxt4500: cannot alloc FB info record"); | 639 | dev_err(&pdev->dev, "gxt4500: cannot alloc FB info record\n"); |
640 | goto err_free_fb; | 640 | goto err_free_fb; |
641 | } | 641 | } |
642 | par = info->par; | 642 | par = info->par; |
diff --git a/drivers/video/omap/blizzard.c b/drivers/video/omap/blizzard.c index e682940a97a..4d8ad9cd0e1 100644 --- a/drivers/video/omap/blizzard.c +++ b/drivers/video/omap/blizzard.c | |||
@@ -225,7 +225,7 @@ static void blizzard_restart_sdram(void) | |||
225 | while (!(blizzard_read_reg(BLIZZARD_MEM_BANK0_STATUS) & 0x01)) { | 225 | while (!(blizzard_read_reg(BLIZZARD_MEM_BANK0_STATUS) & 0x01)) { |
226 | if (time_after(jiffies, tmo)) { | 226 | if (time_after(jiffies, tmo)) { |
227 | dev_err(blizzard.fbdev->dev, | 227 | dev_err(blizzard.fbdev->dev, |
228 | "s1d1374x: SDRAM not ready"); | 228 | "s1d1374x: SDRAM not ready\n"); |
229 | break; | 229 | break; |
230 | } | 230 | } |
231 | msleep(1); | 231 | msleep(1); |
diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c index f4c23434de6..ab32ceb0617 100644 --- a/drivers/video/omap/dispc.c +++ b/drivers/video/omap/dispc.c | |||
@@ -880,19 +880,19 @@ static irqreturn_t omap_dispc_irq_handler(int irq, void *dev) | |||
880 | static int get_dss_clocks(void) | 880 | static int get_dss_clocks(void) |
881 | { | 881 | { |
882 | if (IS_ERR((dispc.dss_ick = clk_get(dispc.fbdev->dev, "dss_ick")))) { | 882 | if (IS_ERR((dispc.dss_ick = clk_get(dispc.fbdev->dev, "dss_ick")))) { |
883 | dev_err(dispc.fbdev->dev, "can't get dss_ick"); | 883 | dev_err(dispc.fbdev->dev, "can't get dss_ick\n"); |
884 | return PTR_ERR(dispc.dss_ick); | 884 | return PTR_ERR(dispc.dss_ick); |
885 | } | 885 | } |
886 | 886 | ||
887 | if (IS_ERR((dispc.dss1_fck = clk_get(dispc.fbdev->dev, "dss1_fck")))) { | 887 | if (IS_ERR((dispc.dss1_fck = clk_get(dispc.fbdev->dev, "dss1_fck")))) { |
888 | dev_err(dispc.fbdev->dev, "can't get dss1_fck"); | 888 | dev_err(dispc.fbdev->dev, "can't get dss1_fck\n"); |
889 | clk_put(dispc.dss_ick); | 889 | clk_put(dispc.dss_ick); |
890 | return PTR_ERR(dispc.dss1_fck); | 890 | return PTR_ERR(dispc.dss1_fck); |
891 | } | 891 | } |
892 | 892 | ||
893 | if (IS_ERR((dispc.dss_54m_fck = | 893 | if (IS_ERR((dispc.dss_54m_fck = |
894 | clk_get(dispc.fbdev->dev, "dss_54m_fck")))) { | 894 | clk_get(dispc.fbdev->dev, "dss_54m_fck")))) { |
895 | dev_err(dispc.fbdev->dev, "can't get dss_54m_fck"); | 895 | dev_err(dispc.fbdev->dev, "can't get dss_54m_fck\n"); |
896 | clk_put(dispc.dss_ick); | 896 | clk_put(dispc.dss_ick); |
897 | clk_put(dispc.dss1_fck); | 897 | clk_put(dispc.dss1_fck); |
898 | return PTR_ERR(dispc.dss_54m_fck); | 898 | return PTR_ERR(dispc.dss_54m_fck); |
diff --git a/drivers/video/omap/hwa742.c b/drivers/video/omap/hwa742.c index dc48e02f215..1e642b7a20f 100644 --- a/drivers/video/omap/hwa742.c +++ b/drivers/video/omap/hwa742.c | |||
@@ -508,7 +508,7 @@ int hwa742_update_window_async(struct fb_info *fbi, | |||
508 | if (unlikely(win->format & | 508 | if (unlikely(win->format & |
509 | ~(0x03 | OMAPFB_FORMAT_FLAG_DOUBLE | | 509 | ~(0x03 | OMAPFB_FORMAT_FLAG_DOUBLE | |
510 | OMAPFB_FORMAT_FLAG_TEARSYNC | OMAPFB_FORMAT_FLAG_FORCE_VSYNC))) { | 510 | OMAPFB_FORMAT_FLAG_TEARSYNC | OMAPFB_FORMAT_FLAG_FORCE_VSYNC))) { |
511 | dev_dbg(hwa742.fbdev->dev, "invalid window flag"); | 511 | dev_dbg(hwa742.fbdev->dev, "invalid window flag\n"); |
512 | r = -EINVAL; | 512 | r = -EINVAL; |
513 | goto out; | 513 | goto out; |
514 | } | 514 | } |
diff --git a/drivers/video/omap/rfbi.c b/drivers/video/omap/rfbi.c index 2b4269813b2..789cfd23c36 100644 --- a/drivers/video/omap/rfbi.c +++ b/drivers/video/omap/rfbi.c | |||
@@ -84,12 +84,12 @@ static inline u32 rfbi_read_reg(int idx) | |||
84 | static int rfbi_get_clocks(void) | 84 | static int rfbi_get_clocks(void) |
85 | { | 85 | { |
86 | if (IS_ERR((rfbi.dss_ick = clk_get(rfbi.fbdev->dev, "dss_ick")))) { | 86 | if (IS_ERR((rfbi.dss_ick = clk_get(rfbi.fbdev->dev, "dss_ick")))) { |
87 | dev_err(rfbi.fbdev->dev, "can't get dss_ick"); | 87 | dev_err(rfbi.fbdev->dev, "can't get dss_ick\n"); |
88 | return PTR_ERR(rfbi.dss_ick); | 88 | return PTR_ERR(rfbi.dss_ick); |
89 | } | 89 | } |
90 | 90 | ||
91 | if (IS_ERR((rfbi.dss1_fck = clk_get(rfbi.fbdev->dev, "dss1_fck")))) { | 91 | if (IS_ERR((rfbi.dss1_fck = clk_get(rfbi.fbdev->dev, "dss1_fck")))) { |
92 | dev_err(rfbi.fbdev->dev, "can't get dss1_fck"); | 92 | dev_err(rfbi.fbdev->dev, "can't get dss1_fck\n"); |
93 | clk_put(rfbi.dss_ick); | 93 | clk_put(rfbi.dss_ick); |
94 | return PTR_ERR(rfbi.dss1_fck); | 94 | return PTR_ERR(rfbi.dss1_fck); |
95 | } | 95 | } |
diff --git a/drivers/w1/masters/ds1wm.c b/drivers/w1/masters/ds1wm.c index 4b696641ce3..5747997f8d7 100644 --- a/drivers/w1/masters/ds1wm.c +++ b/drivers/w1/masters/ds1wm.c | |||
@@ -307,7 +307,7 @@ static void ds1wm_search(void *data, u8 search_type, | |||
307 | rom_id |= (unsigned long long) r << (i * 4); | 307 | rom_id |= (unsigned long long) r << (i * 4); |
308 | 308 | ||
309 | } | 309 | } |
310 | dev_dbg(&ds1wm_data->pdev->dev, "found 0x%08llX", rom_id); | 310 | dev_dbg(&ds1wm_data->pdev->dev, "found 0x%08llX\n", rom_id); |
311 | 311 | ||
312 | ds1wm_write_register(ds1wm_data, DS1WM_CMD, ~DS1WM_CMD_SRA); | 312 | ds1wm_write_register(ds1wm_data, DS1WM_CMD, ~DS1WM_CMD_SRA); |
313 | ds1wm_reset(ds1wm_data); | 313 | ds1wm_reset(ds1wm_data); |
diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c index 0b769f7c4a4..4750de316ad 100644 --- a/drivers/xen/xenbus/xenbus_probe.c +++ b/drivers/xen/xenbus/xenbus_probe.c | |||
@@ -185,13 +185,14 @@ static void otherend_changed(struct xenbus_watch *watch, | |||
185 | if (!dev->otherend || | 185 | if (!dev->otherend || |
186 | strncmp(dev->otherend, vec[XS_WATCH_PATH], | 186 | strncmp(dev->otherend, vec[XS_WATCH_PATH], |
187 | strlen(dev->otherend))) { | 187 | strlen(dev->otherend))) { |
188 | dev_dbg(&dev->dev, "Ignoring watch at %s", vec[XS_WATCH_PATH]); | 188 | dev_dbg(&dev->dev, "Ignoring watch at %s\n", |
189 | vec[XS_WATCH_PATH]); | ||
189 | return; | 190 | return; |
190 | } | 191 | } |
191 | 192 | ||
192 | state = xenbus_read_driver_state(dev->otherend); | 193 | state = xenbus_read_driver_state(dev->otherend); |
193 | 194 | ||
194 | dev_dbg(&dev->dev, "state is %d, (%s), %s, %s", | 195 | dev_dbg(&dev->dev, "state is %d, (%s), %s, %s\n", |
195 | state, xenbus_strstate(state), dev->otherend_watch.node, | 196 | state, xenbus_strstate(state), dev->otherend_watch.node, |
196 | vec[XS_WATCH_PATH]); | 197 | vec[XS_WATCH_PATH]); |
197 | 198 | ||