提交 898eb71c 编写于 作者: J Joe Perches 提交者: Linus Torvalds

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: NJoe 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: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 6c0286b1
...@@ -269,8 +269,9 @@ xpnet_receive(partid_t partid, int channel, struct xpnet_message *msg) ...@@ -269,8 +269,9 @@ xpnet_receive(partid_t partid, int channel, struct xpnet_message *msg)
skb->protocol = eth_type_trans(skb, xpnet_device); skb->protocol = eth_type_trans(skb, xpnet_device);
skb->ip_summed = CHECKSUM_UNNECESSARY; skb->ip_summed = CHECKSUM_UNNECESSARY;
dev_dbg(xpnet, "passing skb to network layer; \n\tskb->head=0x%p " dev_dbg(xpnet, "passing skb to network layer\n"
"skb->data=0x%p skb->tail=0x%p skb->end=0x%p skb->len=%d\n", KERN_DEBUG "\tskb->head=0x%p skb->data=0x%p skb->tail=0x%p "
"skb->end=0x%p skb->len=%d\n",
(void *)skb->head, (void *)skb->data, skb_tail_pointer(skb), (void *)skb->head, (void *)skb->data, skb_tail_pointer(skb),
skb_end_pointer(skb), skb->len); skb_end_pointer(skb), skb->len);
...@@ -576,10 +577,10 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -576,10 +577,10 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
msg->tailout_ignore = end_addr - (u64)skb_tail_pointer(skb); msg->tailout_ignore = end_addr - (u64)skb_tail_pointer(skb);
msg->buf_pa = __pa(start_addr); msg->buf_pa = __pa(start_addr);
dev_dbg(xpnet, "sending XPC message to %d:%d\nmsg->buf_pa=" dev_dbg(xpnet, "sending XPC message to %d:%d\n"
"0x%lx, msg->size=%u, msg->leadin_ignore=%u, " KERN_DEBUG "msg->buf_pa=0x%lx, msg->size=%u, "
"msg->tailout_ignore=%u\n", dest_partid, "msg->leadin_ignore=%u, msg->tailout_ignore=%u\n",
XPC_NET_CHANNEL, msg->buf_pa, msg->size, dest_partid, XPC_NET_CHANNEL, msg->buf_pa, msg->size,
msg->leadin_ignore, msg->tailout_ignore); msg->leadin_ignore, msg->tailout_ignore);
......
...@@ -390,8 +390,8 @@ static inline void ace_dump_mem(void *base, int len) ...@@ -390,8 +390,8 @@ static inline void ace_dump_mem(void *base, int len)
static void ace_dump_regs(struct ace_device *ace) static void ace_dump_regs(struct ace_device *ace)
{ {
dev_info(ace->dev, " ctrl: %.8x seccnt/cmd: %.4x ver:%.4x\n" dev_info(ace->dev, " ctrl: %.8x seccnt/cmd: %.4x ver:%.4x\n"
" status:%.8x mpu_lba:%.8x busmode:%4x\n" KERN_INFO " status:%.8x mpu_lba:%.8x busmode:%4x\n"
" error: %.8x cfg_lba:%.8x fatstat:%.4x\n", KERN_INFO " error: %.8x cfg_lba:%.8x fatstat:%.4x\n",
ace_in32(ace, ACE_CTRL), ace_in32(ace, ACE_CTRL),
ace_in(ace, ACE_SECCNTCMD), ace_in(ace, ACE_SECCNTCMD),
ace_in(ace, ACE_VERSION), ace_in(ace, ACE_VERSION),
......
...@@ -1529,7 +1529,7 @@ static int __devinit reset_card(struct pci_dev *pdev, ...@@ -1529,7 +1529,7 @@ static int __devinit reset_card(struct pci_dev *pdev,
portcount = inw(base + 0x2); portcount = inw(base + 0x2);
if (!inw(base + 0xe) & 0x1 || (portcount != 0 && portcount != 4 && if (!inw(base + 0xe) & 0x1 || (portcount != 0 && portcount != 4 &&
portcount != 8 && portcount != 16)) { portcount != 8 && portcount != 16)) {
dev_err(&pdev->dev, "ISILoad:PCI Card%d reset failure.", dev_err(&pdev->dev, "ISILoad:PCI Card%d reset failure.\n",
card + 1); card + 1);
retval = -EIO; retval = -EIO;
goto end; goto end;
...@@ -1622,7 +1622,9 @@ static int __devinit load_firmware(struct pci_dev *pdev, ...@@ -1622,7 +1622,9 @@ static int __devinit load_firmware(struct pci_dev *pdev,
if ((status = inw(base + 0x4)) != 0) { if ((status = inw(base + 0x4)) != 0) {
dev_warn(&pdev->dev, "Card%d rejected load header:\n" dev_warn(&pdev->dev, "Card%d rejected load header:\n"
"Address:0x%x\nCount:0x%x\nStatus:0x%x\n", KERN_WARNING "Address:0x%x\n"
KERN_WARNING "Count:0x%x\n"
KERN_WARNING "Status:0x%x\n",
index + 1, frame->addr, frame->count, status); index + 1, frame->addr, frame->count, status);
goto errrelfw; goto errrelfw;
} }
...@@ -1666,7 +1668,9 @@ static int __devinit load_firmware(struct pci_dev *pdev, ...@@ -1666,7 +1668,9 @@ static int __devinit load_firmware(struct pci_dev *pdev,
if ((status = inw(base + 0x4)) != 0) { if ((status = inw(base + 0x4)) != 0) {
dev_warn(&pdev->dev, "Card%d rejected verify header:\n" dev_warn(&pdev->dev, "Card%d rejected verify header:\n"
"Address:0x%x\nCount:0x%x\nStatus: 0x%x\n", KERN_WARNING "Address:0x%x\n"
KERN_WARNING "Count:0x%x\n"
KERN_WARNING "Status: 0x%x\n",
index + 1, frame->addr, frame->count, status); index + 1, frame->addr, frame->count, status);
goto errrelfw; goto errrelfw;
} }
......
...@@ -1651,7 +1651,7 @@ static int adm1026_detect(struct i2c_adapter *adapter, int address, ...@@ -1651,7 +1651,7 @@ static int adm1026_detect(struct i2c_adapter *adapter, int address,
break; break;
default : default :
dev_err(&adapter->dev, ": Internal error, invalid " dev_err(&adapter->dev, ": Internal error, invalid "
"kind (%d)!", kind); "kind (%d)!\n", kind);
err = -EFAULT; err = -EFAULT;
goto exitfree; goto exitfree;
} }
......
...@@ -533,7 +533,7 @@ static void lm63_init_client(struct i2c_client *client) ...@@ -533,7 +533,7 @@ static void lm63_init_client(struct i2c_client *client)
/* Start converting if needed */ /* Start converting if needed */
if (data->config & 0x40) { /* standby */ if (data->config & 0x40) { /* standby */
dev_dbg(&client->dev, "Switching to operational mode"); dev_dbg(&client->dev, "Switching to operational mode\n");
data->config &= 0xA7; data->config &= 0xA7;
i2c_smbus_write_byte_data(client, LM63_REG_CONFIG1, i2c_smbus_write_byte_data(client, LM63_REG_CONFIG1,
data->config); data->config);
......
...@@ -795,7 +795,7 @@ static ssize_t set_pwm_auto_point_pwm(struct device *dev, ...@@ -795,7 +795,7 @@ static ssize_t set_pwm_auto_point_pwm(struct device *dev,
if ((val < 0) || (val > 255)) { if ((val < 0) || (val > 255)) {
dev_err(dev, "pwm value %ld is out of range. " dev_err(dev, "pwm value %ld is out of range. "
"Choose a value between 0 and 255." , val); "Choose a value between 0 and 255.\n" , val);
return -EINVAL; return -EINVAL;
} }
......
...@@ -1096,7 +1096,7 @@ static int w83791d_detect(struct i2c_adapter *adapter, int address, int kind) ...@@ -1096,7 +1096,7 @@ static int w83791d_detect(struct i2c_adapter *adapter, int address, int kind)
if (kind == w83791d) { if (kind == w83791d) {
client_name = "w83791d"; client_name = "w83791d";
} else { } else {
dev_err(dev, "w83791d: Internal error: unknown kind (%d)?!?", dev_err(dev, "w83791d: Internal error: unknown kind (%d)?!?\n",
kind); kind);
goto error1; goto error1;
} }
......
...@@ -1385,8 +1385,8 @@ w83792d_detect(struct i2c_adapter *adapter, int address, int kind) ...@@ -1385,8 +1385,8 @@ w83792d_detect(struct i2c_adapter *adapter, int address, int kind)
if (kind == w83792d) { if (kind == w83792d) {
client_name = "w83792d"; client_name = "w83792d";
} else { } else {
dev_err(dev, "w83792d: Internal error: unknown" dev_err(dev, "w83792d: Internal error: unknown kind (%d)?!?\n",
" kind (%d)?!?", kind); kind);
goto ERROR1; goto ERROR1;
} }
......
...@@ -591,18 +591,18 @@ static int pmcmsptwi_master_xfer(struct i2c_adapter *adap, ...@@ -591,18 +591,18 @@ static int pmcmsptwi_master_xfer(struct i2c_adapter *adap,
if (msg->flags & I2C_M_TEN) if (msg->flags & I2C_M_TEN)
pmcmsptwi_set_twi_config(&oldcfg, data); pmcmsptwi_set_twi_config(&oldcfg, data);
dev_dbg(&adap->dev, "I2C %s of %d bytes ", dev_dbg(&adap->dev, "I2C %s of %d bytes %s\n",
(msg->flags & I2C_M_RD) ? "read" : "write", msg->len); (msg->flags & I2C_M_RD) ? "read" : "write", msg->len,
(ret == MSP_TWI_XFER_OK) ? "succeeded" : "failed");
if (ret != MSP_TWI_XFER_OK) { if (ret != MSP_TWI_XFER_OK) {
/* /*
* TODO: We could potentially loop and retry in the case * TODO: We could potentially loop and retry in the case
* of MSP_TWI_XFER_TIMEOUT. * of MSP_TWI_XFER_TIMEOUT.
*/ */
dev_dbg(&adap->dev, "failed\n");
return -1; return -1;
} }
dev_dbg(&adap->dev, "succeeded\n");
return 0; return 0;
} }
......
...@@ -575,7 +575,7 @@ static int __devinit i2c_pnx_probe(struct platform_device *pdev) ...@@ -575,7 +575,7 @@ static int __devinit i2c_pnx_probe(struct platform_device *pdev)
else { else {
freq_mhz = PNX_DEFAULT_FREQ; freq_mhz = PNX_DEFAULT_FREQ;
dev_info(&pdev->dev, "Setting bus frequency to default value: " dev_info(&pdev->dev, "Setting bus frequency to default value: "
"%d MHz", freq_mhz); "%d MHz\n", freq_mhz);
} }
i2c_pnx->adapter->algo = &pnx_algorithm; i2c_pnx->adapter->algo = &pnx_algorithm;
......
...@@ -1195,7 +1195,7 @@ static int menelaus_probe(struct i2c_client *client) ...@@ -1195,7 +1195,7 @@ static int menelaus_probe(struct i2c_client *client)
err = request_irq(client->irq, menelaus_irq, IRQF_DISABLED, err = request_irq(client->irq, menelaus_irq, IRQF_DISABLED,
DRIVER_NAME, menelaus); DRIVER_NAME, menelaus);
if (err) { if (err) {
dev_dbg(&client->dev, "can't get IRQ %d, err %d", dev_dbg(&client->dev, "can't get IRQ %d, err %d\n",
client->irq, err); client->irq, err);
goto fail1; goto fail1;
} }
......
...@@ -579,12 +579,12 @@ static ssize_t ehca_show_##name(struct device *dev, \ ...@@ -579,12 +579,12 @@ static ssize_t ehca_show_##name(struct device *dev, \
\ \
rblock = ehca_alloc_fw_ctrlblock(GFP_KERNEL); \ rblock = ehca_alloc_fw_ctrlblock(GFP_KERNEL); \
if (!rblock) { \ if (!rblock) { \
dev_err(dev, "Can't allocate rblock memory."); \ dev_err(dev, "Can't allocate rblock memory.\n"); \
return 0; \ return 0; \
} \ } \
\ \
if (hipz_h_query_hca(shca->ipz_hca_handle, rblock) != H_SUCCESS) { \ if (hipz_h_query_hca(shca->ipz_hca_handle, rblock) != H_SUCCESS) { \
dev_err(dev, "Can't query device properties"); \ dev_err(dev, "Can't query device properties\n"); \
ehca_free_fw_ctrlblock(rblock); \ ehca_free_fw_ctrlblock(rblock); \
return 0; \ return 0; \
} \ } \
......
...@@ -534,7 +534,8 @@ int gigaset_fill_inbuf(struct inbuf_t *inbuf, const unsigned char *src, ...@@ -534,7 +534,8 @@ int gigaset_fill_inbuf(struct inbuf_t *inbuf, const unsigned char *src,
n = RBUFSIZE - tail; n = RBUFSIZE - tail;
if (!n) { if (!n) {
dev_err(inbuf->cs->dev, dev_err(inbuf->cs->dev,
"buffer overflow (%u bytes lost)", bytesleft); "buffer overflow (%u bytes lost)\n",
bytesleft);
break; break;
} }
if (n > bytesleft) if (n > bytesleft)
......
...@@ -696,7 +696,7 @@ static int s3c24xx_nand_probe(struct platform_device *pdev, ...@@ -696,7 +696,7 @@ static int s3c24xx_nand_probe(struct platform_device *pdev,
info->clk = clk_get(&pdev->dev, "nand"); info->clk = clk_get(&pdev->dev, "nand");
if (IS_ERR(info->clk)) { if (IS_ERR(info->clk)) {
dev_err(&pdev->dev, "failed to get clock"); dev_err(&pdev->dev, "failed to get clock\n");
err = -ENOENT; err = -ENOENT;
goto exit_error; goto exit_error;
} }
......
...@@ -900,7 +900,7 @@ static int ax_probe(struct platform_device *pdev) ...@@ -900,7 +900,7 @@ static int ax_probe(struct platform_device *pdev)
ax->map2 = ioremap(res->start, size); ax->map2 = ioremap(res->start, size);
if (ax->map2 == NULL) { if (ax->map2 == NULL) {
dev_err(&pdev->dev, "cannot map reset register"); dev_err(&pdev->dev, "cannot map reset register\n");
ret = -ENXIO; ret = -ENXIO;
goto exit_mem2; goto exit_mem2;
} }
......
...@@ -6428,7 +6428,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev) ...@@ -6428,7 +6428,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
/* enable device (incl. PCI PM wakeup), and bus-mastering */ /* enable device (incl. PCI PM wakeup), and bus-mastering */
rc = pci_enable_device(pdev); rc = pci_enable_device(pdev);
if (rc) { if (rc) {
dev_err(&pdev->dev, "Cannot enable PCI device, aborting."); dev_err(&pdev->dev, "Cannot enable PCI device, aborting.\n");
goto err_out; goto err_out;
} }
......
...@@ -3218,7 +3218,7 @@ static int __devinit ehea_probe_adapter(struct of_device *dev, ...@@ -3218,7 +3218,7 @@ static int __devinit ehea_probe_adapter(struct of_device *dev,
/* get adapter properties */ /* get adapter properties */
ret = ehea_sense_adapter_attr(adapter); ret = ehea_sense_adapter_attr(adapter);
if (ret) { if (ret) {
dev_err(&dev->dev, "sense_adapter_attr failed: %d", ret); dev_err(&dev->dev, "sense_adapter_attr failed: %d\n", ret);
goto out_free_ad; goto out_free_ad;
} }
...@@ -3226,7 +3226,7 @@ static int __devinit ehea_probe_adapter(struct of_device *dev, ...@@ -3226,7 +3226,7 @@ static int __devinit ehea_probe_adapter(struct of_device *dev,
EHEA_NEQ, EHEA_MAX_ENTRIES_EQ, 1); EHEA_NEQ, EHEA_MAX_ENTRIES_EQ, 1);
if (!adapter->neq) { if (!adapter->neq) {
ret = -EIO; ret = -EIO;
dev_err(&dev->dev, "NEQ creation failed"); dev_err(&dev->dev, "NEQ creation failed\n");
goto out_free_ad; goto out_free_ad;
} }
...@@ -3237,7 +3237,7 @@ static int __devinit ehea_probe_adapter(struct of_device *dev, ...@@ -3237,7 +3237,7 @@ static int __devinit ehea_probe_adapter(struct of_device *dev,
ehea_interrupt_neq, IRQF_DISABLED, ehea_interrupt_neq, IRQF_DISABLED,
"ehea_neq", adapter); "ehea_neq", adapter);
if (ret) { if (ret) {
dev_err(&dev->dev, "requesting NEQ IRQ failed"); dev_err(&dev->dev, "requesting NEQ IRQ failed\n");
goto out_kill_eq; goto out_kill_eq;
} }
...@@ -3247,7 +3247,7 @@ static int __devinit ehea_probe_adapter(struct of_device *dev, ...@@ -3247,7 +3247,7 @@ static int __devinit ehea_probe_adapter(struct of_device *dev,
ret = ehea_setup_ports(adapter); ret = ehea_setup_ports(adapter);
if (ret) { if (ret) {
dev_err(&dev->dev, "setup_ports failed"); dev_err(&dev->dev, "setup_ports failed\n");
goto out_rem_dev_sysfs; goto out_rem_dev_sysfs;
} }
......
...@@ -3058,7 +3058,8 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -3058,7 +3058,8 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
if (status != 0) { if (status != 0) {
dac_enabled = 0; dac_enabled = 0;
dev_err(&pdev->dev, dev_err(&pdev->dev,
"64-bit pci address mask was refused, trying 32-bit"); "64-bit pci address mask was refused, "
"trying 32-bit\n");
status = pci_set_dma_mask(pdev, DMA_32BIT_MASK); status = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
} }
if (status != 0) { if (status != 0) {
......
...@@ -3961,7 +3961,7 @@ static __devinit struct net_device *sky2_init_netdev(struct sky2_hw *hw, ...@@ -3961,7 +3961,7 @@ static __devinit struct net_device *sky2_init_netdev(struct sky2_hw *hw,
struct net_device *dev = alloc_etherdev(sizeof(*sky2)); struct net_device *dev = alloc_etherdev(sizeof(*sky2));
if (!dev) { if (!dev) {
dev_err(&hw->pdev->dev, "etherdev alloc failed"); dev_err(&hw->pdev->dev, "etherdev alloc failed\n");
return NULL; return NULL;
} }
......
...@@ -114,8 +114,8 @@ static void mcs7830_async_cmd_callback(struct urb *urb) ...@@ -114,8 +114,8 @@ static void mcs7830_async_cmd_callback(struct urb *urb)
struct usb_ctrlrequest *req = (struct usb_ctrlrequest *)urb->context; struct usb_ctrlrequest *req = (struct usb_ctrlrequest *)urb->context;
if (urb->status < 0) if (urb->status < 0)
printk(KERN_DEBUG "mcs7830_async_cmd_callback() failed with %d", printk(KERN_DEBUG "%s() failed with %d\n",
urb->status); __FUNCTION__, urb->status);
kfree(req); kfree(req);
usb_free_urb(urb); usb_free_urb(urb);
...@@ -129,15 +129,15 @@ static void mcs7830_set_reg_async(struct usbnet *dev, u16 index, u16 size, void ...@@ -129,15 +129,15 @@ static void mcs7830_set_reg_async(struct usbnet *dev, u16 index, u16 size, void
urb = usb_alloc_urb(0, GFP_ATOMIC); urb = usb_alloc_urb(0, GFP_ATOMIC);
if (!urb) { if (!urb) {
dev_dbg(&dev->udev->dev, "Error allocating URB " dev_dbg(&dev->udev->dev,
"in write_cmd_async!"); "Error allocating URB in write_cmd_async!\n");
return; return;
} }
req = kmalloc(sizeof *req, GFP_ATOMIC); req = kmalloc(sizeof *req, GFP_ATOMIC);
if (!req) { if (!req) {
dev_err(&dev->udev->dev, "Failed to allocate memory for " dev_err(&dev->udev->dev,
"control request"); "Failed to allocate memory for control request\n");
goto out; goto out;
} }
req->bRequestType = MCS7830_WR_BMREQ; req->bRequestType = MCS7830_WR_BMREQ;
...@@ -153,8 +153,8 @@ static void mcs7830_set_reg_async(struct usbnet *dev, u16 index, u16 size, void ...@@ -153,8 +153,8 @@ static void mcs7830_set_reg_async(struct usbnet *dev, u16 index, u16 size, void
ret = usb_submit_urb(urb, GFP_ATOMIC); ret = usb_submit_urb(urb, GFP_ATOMIC);
if (ret < 0) { if (ret < 0) {
dev_err(&dev->udev->dev, "Error submitting the control " dev_err(&dev->udev->dev,
"message: ret=%d", ret); "Error submitting the control message: ret=%d\n", ret);
goto out; goto out;
} }
return; return;
......
...@@ -1526,7 +1526,7 @@ static int xennet_connect(struct net_device *dev) ...@@ -1526,7 +1526,7 @@ static int xennet_connect(struct net_device *dev)
if (!feature_rx_copy) { if (!feature_rx_copy) {
dev_info(&dev->dev, dev_info(&dev->dev,
"backend does not support copying recieve path"); "backend does not support copying receive path\n");
return -ENODEV; return -ENODEV;
} }
......
...@@ -366,7 +366,7 @@ static int ds2760_battery_probe(struct platform_device *pdev) ...@@ -366,7 +366,7 @@ static int ds2760_battery_probe(struct platform_device *pdev)
retval = power_supply_register(&pdev->dev, &di->bat); retval = power_supply_register(&pdev->dev, &di->bat);
if (retval) { if (retval) {
dev_err(di->dev, "failed to register battery"); dev_err(di->dev, "failed to register battery\n");
goto batt_failed; goto batt_failed;
} }
......
...@@ -66,7 +66,7 @@ static int ps3stor_probe_access(struct ps3_storage_device *dev) ...@@ -66,7 +66,7 @@ static int ps3stor_probe_access(struct ps3_storage_device *dev)
if (n > 1) if (n > 1)
dev_info(&dev->sbd.core, dev_info(&dev->sbd.core,
"%s:%u: %lu accessible regions found. Only the first " "%s:%u: %lu accessible regions found. Only the first "
"one will be used", "one will be used\n",
__func__, __LINE__, n); __func__, __LINE__, n);
dev->region_idx = __ffs(dev->accessible_regions); dev->region_idx = __ffs(dev->accessible_regions);
dev_info(&dev->sbd.core, dev_info(&dev->sbd.core,
......
...@@ -200,9 +200,8 @@ void rtc_sysfs_add_device(struct rtc_device *rtc) ...@@ -200,9 +200,8 @@ void rtc_sysfs_add_device(struct rtc_device *rtc)
err = device_create_file(&rtc->dev, &dev_attr_wakealarm); err = device_create_file(&rtc->dev, &dev_attr_wakealarm);
if (err) if (err)
dev_err(rtc->dev.parent, "failed to create " dev_err(rtc->dev.parent,
"alarm attribute, %d", "failed to create alarm attribute, %d\n", err);
err);
} }
void rtc_sysfs_del_device(struct rtc_device *rtc) void rtc_sysfs_del_device(struct rtc_device *rtc)
......
...@@ -1243,7 +1243,8 @@ void lpfc_sli_poll_fcp_ring(struct lpfc_hba *phba) ...@@ -1243,7 +1243,8 @@ void lpfc_sli_poll_fcp_ring(struct lpfc_hba *phba)
memset(adaptermsg, 0, LPFC_MAX_ADPTMSG); memset(adaptermsg, 0, LPFC_MAX_ADPTMSG);
memcpy(&adaptermsg[0], (uint8_t *) irsp, memcpy(&adaptermsg[0], (uint8_t *) irsp,
MAX_MSG_DATA); MAX_MSG_DATA);
dev_warn(&((phba->pcidev)->dev), "lpfc%d: %s", dev_warn(&((phba->pcidev)->dev),
"lpfc%d: %s\n",
phba->brd_no, adaptermsg); phba->brd_no, adaptermsg);
} else { } else {
/* Unknown IOCB command */ /* Unknown IOCB command */
...@@ -1430,7 +1431,8 @@ lpfc_sli_handle_fast_ring_event(struct lpfc_hba *phba, ...@@ -1430,7 +1431,8 @@ lpfc_sli_handle_fast_ring_event(struct lpfc_hba *phba,
memset(adaptermsg, 0, LPFC_MAX_ADPTMSG); memset(adaptermsg, 0, LPFC_MAX_ADPTMSG);
memcpy(&adaptermsg[0], (uint8_t *) irsp, memcpy(&adaptermsg[0], (uint8_t *) irsp,
MAX_MSG_DATA); MAX_MSG_DATA);
dev_warn(&((phba->pcidev)->dev), "lpfc%d: %s", dev_warn(&((phba->pcidev)->dev),
"lpfc%d: %s\n",
phba->brd_no, adaptermsg); phba->brd_no, adaptermsg);
} else { } else {
/* Unknown IOCB command */ /* Unknown IOCB command */
...@@ -1681,7 +1683,7 @@ lpfc_sli_handle_slow_ring_event(struct lpfc_hba *phba, ...@@ -1681,7 +1683,7 @@ lpfc_sli_handle_slow_ring_event(struct lpfc_hba *phba,
memcpy(&adaptermsg[0], (uint8_t *) irsp, memcpy(&adaptermsg[0], (uint8_t *) irsp,
MAX_MSG_DATA); MAX_MSG_DATA);
dev_warn(&((phba->pcidev)->dev), dev_warn(&((phba->pcidev)->dev),
"lpfc%d: %s", "lpfc%d: %s\n",
phba->brd_no, adaptermsg); phba->brd_no, adaptermsg);
} else { } else {
/* Unknown IOCB command */ /* Unknown IOCB command */
......
...@@ -1286,7 +1286,7 @@ static int __devinit qla4xxx_probe_adapter(struct pci_dev *pdev, ...@@ -1286,7 +1286,7 @@ static int __devinit qla4xxx_probe_adapter(struct pci_dev *pdev,
ret = scsi_init_shared_tag_map(host, MAX_SRBS); ret = scsi_init_shared_tag_map(host, MAX_SRBS);
if (ret) { if (ret) {
dev_warn(&ha->pdev->dev, "scsi_init_shared_tag_map failed"); dev_warn(&ha->pdev->dev, "scsi_init_shared_tag_map failed\n");
goto probe_failed; goto probe_failed;
} }
......
...@@ -1070,7 +1070,7 @@ static int setup(struct spi_device *spi) ...@@ -1070,7 +1070,7 @@ static int setup(struct spi_device *spi)
return -ENODEV; return -ENODEV;
} }
dev_dbg(&spi->dev, "setup spi chip %s, width is %d, dma is %d,", dev_dbg(&spi->dev, "setup spi chip %s, width is %d, dma is %d\n",
spi->modalias, chip->width, chip->enable_dma); spi->modalias, chip->width, chip->enable_dma);
dev_dbg(&spi->dev, "ctl_reg is 0x%x, flag_reg is 0x%x\n", dev_dbg(&spi->dev, "ctl_reg is 0x%x, flag_reg is 0x%x\n",
chip->ctl_reg, chip->flag); chip->ctl_reg, chip->flag);
......
...@@ -1194,7 +1194,7 @@ static int setup(struct spi_device *spi) ...@@ -1194,7 +1194,7 @@ static int setup(struct spi_device *spi)
chip = kzalloc(sizeof(struct chip_data), GFP_KERNEL); chip = kzalloc(sizeof(struct chip_data), GFP_KERNEL);
if (!chip) { if (!chip) {
dev_err(&spi->dev, dev_err(&spi->dev,
"setup - cannot allocate controller state"); "setup - cannot allocate controller state\n");
return -ENOMEM; return -ENOMEM;
} }
chip->control = SPI_DEFAULT_CONTROL; chip->control = SPI_DEFAULT_CONTROL;
...@@ -1206,7 +1206,7 @@ static int setup(struct spi_device *spi) ...@@ -1206,7 +1206,7 @@ static int setup(struct spi_device *spi)
if (!chip_info) { if (!chip_info) {
dev_err(&spi->dev, dev_err(&spi->dev,
"setup - " "setup - "
"cannot allocate controller data"); "cannot allocate controller data\n");
status = -ENOMEM; status = -ENOMEM;
goto err_first_setup; goto err_first_setup;
} }
......
...@@ -332,7 +332,7 @@ static void acm_read_bulk(struct urb *urb) ...@@ -332,7 +332,7 @@ static void acm_read_bulk(struct urb *urb)
return; return;
if (status) if (status)
dev_dbg(&acm->data->dev, "bulk rx status %d", status); dev_dbg(&acm->data->dev, "bulk rx status %d\n", status);
buf = rcv->buffer; buf = rcv->buffer;
buf->size = urb->actual_length; buf->size = urb->actual_length;
...@@ -831,13 +831,13 @@ static int acm_probe (struct usb_interface *intf, ...@@ -831,13 +831,13 @@ static int acm_probe (struct usb_interface *intf,
/* normal probing*/ /* normal probing*/
if (!buffer) { if (!buffer) {
err("Wierd descriptor references\n"); err("Weird descriptor references\n");
return -EINVAL; return -EINVAL;
} }
if (!buflen) { if (!buflen) {
if (intf->cur_altsetting->endpoint->extralen && intf->cur_altsetting->endpoint->extra) { if (intf->cur_altsetting->endpoint->extralen && intf->cur_altsetting->endpoint->extra) {
dev_dbg(&intf->dev,"Seeking extra descriptors on endpoint"); dev_dbg(&intf->dev,"Seeking extra descriptors on endpoint\n");
buflen = intf->cur_altsetting->endpoint->extralen; buflen = intf->cur_altsetting->endpoint->extralen;
buffer = intf->cur_altsetting->endpoint->extra; buffer = intf->cur_altsetting->endpoint->extra;
} else { } else {
...@@ -887,24 +887,24 @@ static int acm_probe (struct usb_interface *intf, ...@@ -887,24 +887,24 @@ static int acm_probe (struct usb_interface *intf,
if (!union_header) { if (!union_header) {
if (call_interface_num > 0) { if (call_interface_num > 0) {
dev_dbg(&intf->dev,"No union descriptor, using call management descriptor"); dev_dbg(&intf->dev,"No union descriptor, using call management descriptor\n");
data_interface = usb_ifnum_to_if(usb_dev, (data_interface_num = call_interface_num)); data_interface = usb_ifnum_to_if(usb_dev, (data_interface_num = call_interface_num));
control_interface = intf; control_interface = intf;
} else { } else {
dev_dbg(&intf->dev,"No union descriptor, giving up"); dev_dbg(&intf->dev,"No union descriptor, giving up\n");
return -ENODEV; return -ENODEV;
} }
} else { } else {
control_interface = usb_ifnum_to_if(usb_dev, union_header->bMasterInterface0); control_interface = usb_ifnum_to_if(usb_dev, union_header->bMasterInterface0);
data_interface = usb_ifnum_to_if(usb_dev, (data_interface_num = union_header->bSlaveInterface0)); data_interface = usb_ifnum_to_if(usb_dev, (data_interface_num = union_header->bSlaveInterface0));
if (!control_interface || !data_interface) { if (!control_interface || !data_interface) {
dev_dbg(&intf->dev,"no interfaces"); dev_dbg(&intf->dev,"no interfaces\n");
return -ENODEV; return -ENODEV;
} }
} }
if (data_interface_num != call_interface_num) if (data_interface_num != call_interface_num)
dev_dbg(&intf->dev,"Seperate call control interface. That is not fully supported."); dev_dbg(&intf->dev,"Seperate call control interface. That is not fully supported.\n");
skip_normal_probe: skip_normal_probe:
...@@ -912,7 +912,7 @@ static int acm_probe (struct usb_interface *intf, ...@@ -912,7 +912,7 @@ static int acm_probe (struct usb_interface *intf,
if (data_interface->cur_altsetting->desc.bInterfaceClass != CDC_DATA_INTERFACE_TYPE) { if (data_interface->cur_altsetting->desc.bInterfaceClass != CDC_DATA_INTERFACE_TYPE) {
if (control_interface->cur_altsetting->desc.bInterfaceClass == CDC_DATA_INTERFACE_TYPE) { if (control_interface->cur_altsetting->desc.bInterfaceClass == CDC_DATA_INTERFACE_TYPE) {
struct usb_interface *t; struct usb_interface *t;
dev_dbg(&intf->dev,"Your device has switched interfaces."); dev_dbg(&intf->dev,"Your device has switched interfaces.\n");
t = control_interface; t = control_interface;
control_interface = data_interface; control_interface = data_interface;
...@@ -927,7 +927,7 @@ static int acm_probe (struct usb_interface *intf, ...@@ -927,7 +927,7 @@ static int acm_probe (struct usb_interface *intf,
return -ENODEV; return -ENODEV;
if (usb_interface_claimed(data_interface)) { /* valid in this context */ if (usb_interface_claimed(data_interface)) { /* valid in this context */
dev_dbg(&intf->dev,"The data interface isn't available"); dev_dbg(&intf->dev,"The data interface isn't available\n");
return -EBUSY; return -EBUSY;
} }
...@@ -944,7 +944,7 @@ static int acm_probe (struct usb_interface *intf, ...@@ -944,7 +944,7 @@ static int acm_probe (struct usb_interface *intf,
if (!usb_endpoint_dir_in(epread)) { if (!usb_endpoint_dir_in(epread)) {
/* descriptors are swapped */ /* descriptors are swapped */
struct usb_endpoint_descriptor *t; struct usb_endpoint_descriptor *t;
dev_dbg(&intf->dev,"The data interface has switched endpoints"); dev_dbg(&intf->dev,"The data interface has switched endpoints\n");
t = epread; t = epread;
epread = epwrite; epread = epwrite;
...@@ -959,7 +959,7 @@ static int acm_probe (struct usb_interface *intf, ...@@ -959,7 +959,7 @@ static int acm_probe (struct usb_interface *intf,
} }
if (!(acm = kzalloc(sizeof(struct acm), GFP_KERNEL))) { if (!(acm = kzalloc(sizeof(struct acm), GFP_KERNEL))) {
dev_dbg(&intf->dev, "out of memory (acm kzalloc)"); dev_dbg(&intf->dev, "out of memory (acm kzalloc)\n");
goto alloc_fail; goto alloc_fail;
} }
...@@ -985,26 +985,26 @@ static int acm_probe (struct usb_interface *intf, ...@@ -985,26 +985,26 @@ static int acm_probe (struct usb_interface *intf,
buf = usb_buffer_alloc(usb_dev, ctrlsize, GFP_KERNEL, &acm->ctrl_dma); buf = usb_buffer_alloc(usb_dev, ctrlsize, GFP_KERNEL, &acm->ctrl_dma);
if (!buf) { if (!buf) {
dev_dbg(&intf->dev, "out of memory (ctrl buffer alloc)"); dev_dbg(&intf->dev, "out of memory (ctrl buffer alloc)\n");
goto alloc_fail2; goto alloc_fail2;
} }
acm->ctrl_buffer = buf; acm->ctrl_buffer = buf;
if (acm_write_buffers_alloc(acm) < 0) { if (acm_write_buffers_alloc(acm) < 0) {
dev_dbg(&intf->dev, "out of memory (write buffer alloc)"); dev_dbg(&intf->dev, "out of memory (write buffer alloc)\n");
goto alloc_fail4; goto alloc_fail4;
} }
acm->ctrlurb = usb_alloc_urb(0, GFP_KERNEL); acm->ctrlurb = usb_alloc_urb(0, GFP_KERNEL);
if (!acm->ctrlurb) { if (!acm->ctrlurb) {
dev_dbg(&intf->dev, "out of memory (ctrlurb kmalloc)"); dev_dbg(&intf->dev, "out of memory (ctrlurb kmalloc)\n");
goto alloc_fail5; goto alloc_fail5;
} }
for (i = 0; i < num_rx_buf; i++) { for (i = 0; i < num_rx_buf; i++) {
struct acm_ru *rcv = &(acm->ru[i]); struct acm_ru *rcv = &(acm->ru[i]);
if (!(rcv->urb = usb_alloc_urb(0, GFP_KERNEL))) { if (!(rcv->urb = usb_alloc_urb(0, GFP_KERNEL))) {
dev_dbg(&intf->dev, "out of memory (read urbs usb_alloc_urb)"); dev_dbg(&intf->dev, "out of memory (read urbs usb_alloc_urb)\n");
goto alloc_fail7; goto alloc_fail7;
} }
...@@ -1015,13 +1015,13 @@ static int acm_probe (struct usb_interface *intf, ...@@ -1015,13 +1015,13 @@ static int acm_probe (struct usb_interface *intf,
struct acm_rb *buf = &(acm->rb[i]); struct acm_rb *buf = &(acm->rb[i]);
if (!(buf->base = usb_buffer_alloc(acm->dev, readsize, GFP_KERNEL, &buf->dma))) { if (!(buf->base = usb_buffer_alloc(acm->dev, readsize, GFP_KERNEL, &buf->dma))) {
dev_dbg(&intf->dev, "out of memory (read bufs usb_buffer_alloc)"); dev_dbg(&intf->dev, "out of memory (read bufs usb_buffer_alloc)\n");
goto alloc_fail7; goto alloc_fail7;
} }
} }
acm->writeurb = usb_alloc_urb(0, GFP_KERNEL); acm->writeurb = usb_alloc_urb(0, GFP_KERNEL);
if (!acm->writeurb) { if (!acm->writeurb) {
dev_dbg(&intf->dev, "out of memory (writeurb kmalloc)"); dev_dbg(&intf->dev, "out of memory (writeurb kmalloc)\n");
goto alloc_fail7; goto alloc_fail7;
} }
......
...@@ -291,7 +291,7 @@ int usb_create_ep_files(struct device *parent, ...@@ -291,7 +291,7 @@ int usb_create_ep_files(struct device *parent,
retval = endpoint_get_minor(ep_dev); retval = endpoint_get_minor(ep_dev);
if (retval) { if (retval) {
dev_err(parent, "can not allocate minor number for %s", dev_err(parent, "can not allocate minor number for %s\n",
ep_dev->dev.bus_id); ep_dev->dev.bus_id);
goto error_register; goto error_register;
} }
......
...@@ -1526,7 +1526,7 @@ int usb_set_configuration(struct usb_device *dev, int configuration) ...@@ -1526,7 +1526,7 @@ int usb_set_configuration(struct usb_device *dev, int configuration)
new_interfaces = kmalloc(nintf * sizeof(*new_interfaces), new_interfaces = kmalloc(nintf * sizeof(*new_interfaces),
GFP_KERNEL); GFP_KERNEL);
if (!new_interfaces) { if (!new_interfaces) {
dev_err(&dev->dev, "Out of memory"); dev_err(&dev->dev, "Out of memory\n");
return -ENOMEM; return -ENOMEM;
} }
...@@ -1535,7 +1535,7 @@ int usb_set_configuration(struct usb_device *dev, int configuration) ...@@ -1535,7 +1535,7 @@ int usb_set_configuration(struct usb_device *dev, int configuration)
sizeof(struct usb_interface), sizeof(struct usb_interface),
GFP_KERNEL); GFP_KERNEL);
if (!new_interfaces[n]) { if (!new_interfaces[n]) {
dev_err(&dev->dev, "Out of memory"); dev_err(&dev->dev, "Out of memory\n");
ret = -ENOMEM; ret = -ENOMEM;
free_interfaces: free_interfaces:
while (--n >= 0) while (--n >= 0)
......
...@@ -358,7 +358,7 @@ static int usb_hcd_s3c2410_probe (const struct hc_driver *driver, ...@@ -358,7 +358,7 @@ static int usb_hcd_s3c2410_probe (const struct hc_driver *driver,
hcd->rsrc_len = dev->resource[0].end - dev->resource[0].start + 1; hcd->rsrc_len = dev->resource[0].end - dev->resource[0].start + 1;
if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) { if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
dev_err(&dev->dev, "request_mem_region failed"); dev_err(&dev->dev, "request_mem_region failed\n");
retval = -EBUSY; retval = -EBUSY;
goto err_put; goto err_put;
} }
......
...@@ -805,7 +805,7 @@ static int adu_probe(struct usb_interface *interface, ...@@ -805,7 +805,7 @@ static int adu_probe(struct usb_interface *interface,
dev->minor = interface->minor; dev->minor = interface->minor;
/* let the user know what node this device is now attached to */ /* let the user know what node this device is now attached to */
dev_info(&interface->dev, "ADU%d %s now attached to /dev/usb/adutux%d", dev_info(&interface->dev, "ADU%d %s now attached to /dev/usb/adutux%d\n",
udev->descriptor.idProduct, dev->serial_number, udev->descriptor.idProduct, dev->serial_number,
(dev->minor - ADU_MINOR_BASE)); (dev->minor - ADU_MINOR_BASE));
exit: exit:
...@@ -851,7 +851,7 @@ static void adu_disconnect(struct usb_interface *interface) ...@@ -851,7 +851,7 @@ static void adu_disconnect(struct usb_interface *interface)
mutex_unlock(&dev->mtx); mutex_unlock(&dev->mtx);
} }
dev_info(&interface->dev, "ADU device adutux%d now disconnected", dev_info(&interface->dev, "ADU device adutux%d now disconnected\n",
(minor - ADU_MINOR_BASE)); (minor - ADU_MINOR_BASE));
dbg(2," %s : leave", __FUNCTION__); dbg(2," %s : leave", __FUNCTION__);
......
...@@ -216,7 +216,7 @@ static void iowarrior_callback(struct urb *urb) ...@@ -216,7 +216,7 @@ static void iowarrior_callback(struct urb *urb)
exit: exit:
retval = usb_submit_urb(urb, GFP_ATOMIC); retval = usb_submit_urb(urb, GFP_ATOMIC);
if (retval) if (retval)
dev_err(&dev->interface->dev, "%s - usb_submit_urb failed with result %d", dev_err(&dev->interface->dev, "%s - usb_submit_urb failed with result %d\n",
__FUNCTION__, retval); __FUNCTION__, retval);
} }
...@@ -451,7 +451,7 @@ static ssize_t iowarrior_write(struct file *file, ...@@ -451,7 +451,7 @@ static ssize_t iowarrior_write(struct file *file,
break; break;
default: default:
/* what do we have here ? An unsupported Product-ID ? */ /* what do we have here ? An unsupported Product-ID ? */
dev_err(&dev->interface->dev, "%s - not supported for product=0x%x", dev_err(&dev->interface->dev, "%s - not supported for product=0x%x\n",
__FUNCTION__, dev->product_id); __FUNCTION__, dev->product_id);
retval = -EFAULT; retval = -EFAULT;
goto exit; goto exit;
...@@ -526,7 +526,7 @@ static int iowarrior_ioctl(struct inode *inode, struct file *file, ...@@ -526,7 +526,7 @@ static int iowarrior_ioctl(struct inode *inode, struct file *file,
} else { } else {
retval = -EINVAL; retval = -EINVAL;
dev_err(&dev->interface->dev, dev_err(&dev->interface->dev,
"ioctl 'IOW_WRITE' is not supported for product=0x%x.", "ioctl 'IOW_WRITE' is not supported for product=0x%x.\n",
dev->product_id); dev->product_id);
} }
break; break;
...@@ -752,7 +752,7 @@ static int iowarrior_probe(struct usb_interface *interface, ...@@ -752,7 +752,7 @@ static int iowarrior_probe(struct usb_interface *interface,
/* allocate memory for our device state and intialize it */ /* allocate memory for our device state and intialize it */
dev = kzalloc(sizeof(struct iowarrior), GFP_KERNEL); dev = kzalloc(sizeof(struct iowarrior), GFP_KERNEL);
if (dev == NULL) { if (dev == NULL) {
dev_err(&interface->dev, "Out of memory"); dev_err(&interface->dev, "Out of memory\n");
return retval; return retval;
} }
......
...@@ -155,7 +155,7 @@ static void motorcontrol_irq(struct urb *urb) ...@@ -155,7 +155,7 @@ static void motorcontrol_irq(struct urb *urb)
retval = usb_submit_urb(urb, GFP_ATOMIC); retval = usb_submit_urb(urb, GFP_ATOMIC);
if (retval) if (retval)
dev_err(&mc->intf->dev, dev_err(&mc->intf->dev,
"can't resubmit intr, %s-%s/motorcontrol0, retval %d", "can't resubmit intr, %s-%s/motorcontrol0, retval %d\n",
mc->udev->bus->bus_name, mc->udev->bus->bus_name,
mc->udev->devpath, retval); mc->udev->devpath, retval);
} }
......
...@@ -1071,7 +1071,7 @@ static ssize_t show_latency_timer(struct device *dev, struct device_attribute *a ...@@ -1071,7 +1071,7 @@ static ssize_t show_latency_timer(struct device *dev, struct device_attribute *a
(char*) &latency, 1, WDR_TIMEOUT); (char*) &latency, 1, WDR_TIMEOUT);
if (rv < 0) { if (rv < 0) {
dev_err(dev, "Unable to read latency timer: %i", rv); dev_err(dev, "Unable to read latency timer: %i\n", rv);
return -EIO; return -EIO;
} }
return sprintf(buf, "%i\n", latency); return sprintf(buf, "%i\n", latency);
...@@ -1098,7 +1098,7 @@ static ssize_t store_latency_timer(struct device *dev, struct device_attribute * ...@@ -1098,7 +1098,7 @@ static ssize_t store_latency_timer(struct device *dev, struct device_attribute *
buf, 0, WDR_TIMEOUT); buf, 0, WDR_TIMEOUT);
if (rv < 0) { if (rv < 0) {
dev_err(dev, "Unable to write latency timer: %i", rv); dev_err(dev, "Unable to write latency timer: %i\n", rv);
return -EIO; return -EIO;
} }
......
...@@ -2882,7 +2882,7 @@ static int edge_startup (struct usb_serial *serial) ...@@ -2882,7 +2882,7 @@ static int edge_startup (struct usb_serial *serial)
(edge_serial->product_info.NumPorts != serial->num_ports)) { (edge_serial->product_info.NumPorts != serial->num_ports)) {
dev_warn(&serial->dev->dev, "Device Reported %d serial ports " dev_warn(&serial->dev->dev, "Device Reported %d serial ports "
"vs. core thinking we have %d ports, email " "vs. core thinking we have %d ports, email "
"greg@kroah.com this information.", "greg@kroah.com this information.\n",
edge_serial->product_info.NumPorts, edge_serial->product_info.NumPorts,
serial->num_ports); serial->num_ports);
} }
......
...@@ -227,7 +227,7 @@ static int ipw_open(struct usb_serial_port *port, struct file *filp) ...@@ -227,7 +227,7 @@ static int ipw_open(struct usb_serial_port *port, struct file *filp)
0, 0,
100000); 100000);
if (result < 0) if (result < 0)
dev_err(&port->dev, "Init of modem failed (error = %d)", result); dev_err(&port->dev, "Init of modem failed (error = %d)\n", result);
/* reset the bulk pipes */ /* reset the bulk pipes */
usb_clear_halt(dev, usb_rcvbulkpipe(dev, port->bulk_in_endpointAddress)); 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,7 +255,7 @@ static int ipw_open(struct usb_serial_port *port, struct file *filp)
0, 0,
100000); 100000);
if (result < 0) if (result < 0)
dev_err(&port->dev, "Enabling bulk RxRead failed (error = %d)", result); dev_err(&port->dev, "Enabling bulk RxRead failed (error = %d)\n", result);
/*--4: setup the initial flowcontrol */ /*--4: setup the initial flowcontrol */
dbg("%s:setting init flowcontrol (%s)",__FUNCTION__,buf_flow_init); 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,7 +268,7 @@ static int ipw_open(struct usb_serial_port *port, struct file *filp)
0x10, 0x10,
200000); 200000);
if (result < 0) if (result < 0)
dev_err(&port->dev, "initial flowcontrol failed (error = %d)", result); dev_err(&port->dev, "initial flowcontrol failed (error = %d)\n", result);
/*--5: raise the dtr */ /*--5: raise the dtr */
...@@ -282,7 +282,7 @@ static int ipw_open(struct usb_serial_port *port, struct file *filp) ...@@ -282,7 +282,7 @@ static int ipw_open(struct usb_serial_port *port, struct file *filp)
0, 0,
200000); 200000);
if (result < 0) if (result < 0)
dev_err(&port->dev, "setting dtr failed (error = %d)", result); dev_err(&port->dev, "setting dtr failed (error = %d)\n", result);
/*--6: raise the rts */ /*--6: raise the rts */
dbg("%s:raising rts",__FUNCTION__); dbg("%s:raising rts",__FUNCTION__);
...@@ -295,7 +295,7 @@ static int ipw_open(struct usb_serial_port *port, struct file *filp) ...@@ -295,7 +295,7 @@ static int ipw_open(struct usb_serial_port *port, struct file *filp)
0, 0,
200000); 200000);
if (result < 0) if (result < 0)
dev_err(&port->dev, "setting dtr failed (error = %d)", result); dev_err(&port->dev, "setting dtr failed (error = %d)\n", result);
kfree(buf_flow_init); kfree(buf_flow_init);
return 0; return 0;
...@@ -322,7 +322,7 @@ static void ipw_close(struct usb_serial_port *port, struct file * filp) ...@@ -322,7 +322,7 @@ static void ipw_close(struct usb_serial_port *port, struct file * filp)
0, 0,
200000); 200000);
if (result < 0) if (result < 0)
dev_err(&port->dev, "dropping dtr failed (error = %d)", result); dev_err(&port->dev, "dropping dtr failed (error = %d)\n", result);
/*--2: drop the rts */ /*--2: drop the rts */
dbg("%s:dropping rts",__FUNCTION__); dbg("%s:dropping rts",__FUNCTION__);
...@@ -334,7 +334,7 @@ static void ipw_close(struct usb_serial_port *port, struct file * filp) ...@@ -334,7 +334,7 @@ static void ipw_close(struct usb_serial_port *port, struct file * filp)
0, 0,
200000); 200000);
if (result < 0) if (result < 0)
dev_err(&port->dev, "dropping rts failed (error = %d)", result); dev_err(&port->dev, "dropping rts failed (error = %d)\n", result);
/*--3: purge */ /*--3: purge */
...@@ -347,7 +347,7 @@ static void ipw_close(struct usb_serial_port *port, struct file * filp) ...@@ -347,7 +347,7 @@ static void ipw_close(struct usb_serial_port *port, struct file * filp)
0, 0,
200000); 200000);
if (result < 0) if (result < 0)
dev_err(&port->dev, "purge failed (error = %d)", result); dev_err(&port->dev, "purge failed (error = %d)\n", result);
/* send RXBULK_off (tell modem to stop transmitting bulk data on rx chan) */ /* 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,7 +361,7 @@ static void ipw_close(struct usb_serial_port *port, struct file * filp)
100000); 100000);
if (result < 0) if (result < 0)
dev_err(&port->dev, "Disabling bulk RxRead failed (error = %d)", result); dev_err(&port->dev, "Disabling bulk RxRead failed (error = %d)\n", result);
/* shutdown any in-flight urbs that we know about */ /* shutdown any in-flight urbs that we know about */
usb_kill_urb(port->read_urb); usb_kill_urb(port->read_urb);
......
...@@ -478,7 +478,7 @@ static int mos7720_open(struct usb_serial_port *port, struct file * filp) ...@@ -478,7 +478,7 @@ static int mos7720_open(struct usb_serial_port *port, struct file * filp)
response = usb_submit_urb(port0->interrupt_in_urb, GFP_KERNEL); response = usb_submit_urb(port0->interrupt_in_urb, GFP_KERNEL);
if (response) if (response)
dev_err(&port->dev, dev_err(&port->dev,
"%s - Error %d submitting control urb", "%s - Error %d submitting control urb\n",
__FUNCTION__, response); __FUNCTION__, response);
} }
...@@ -492,7 +492,7 @@ static int mos7720_open(struct usb_serial_port *port, struct file * filp) ...@@ -492,7 +492,7 @@ static int mos7720_open(struct usb_serial_port *port, struct file * filp)
response = usb_submit_urb(port->read_urb, GFP_KERNEL); response = usb_submit_urb(port->read_urb, GFP_KERNEL);
if (response) if (response)
dev_err(&port->dev, dev_err(&port->dev,
"%s - Error %d submitting read urb", __FUNCTION__, response); "%s - Error %d submitting read urb\n", __FUNCTION__, response);
/* initialize our icount structure */ /* initialize our icount structure */
memset(&(mos7720_port->icount), 0x00, sizeof(mos7720_port->icount)); memset(&(mos7720_port->icount), 0x00, sizeof(mos7720_port->icount));
......
...@@ -256,7 +256,7 @@ static void setup_line(struct work_struct *work) ...@@ -256,7 +256,7 @@ static void setup_line(struct work_struct *work)
100); 100);
if (result != OTI6858_CTRL_PKT_SIZE) { if (result != OTI6858_CTRL_PKT_SIZE) {
dev_err(&port->dev, "%s(): error reading status", __FUNCTION__); dev_err(&port->dev, "%s(): error reading status\n", __FUNCTION__);
kfree(new_setup); kfree(new_setup);
/* we will try again */ /* we will try again */
schedule_delayed_work(&priv->delayed_setup_work, msecs_to_jiffies(2)); schedule_delayed_work(&priv->delayed_setup_work, msecs_to_jiffies(2));
......
...@@ -48,7 +48,7 @@ enum devicetype { ...@@ -48,7 +48,7 @@ enum devicetype {
static int sierra_set_power_state(struct usb_device *udev, __u16 swiState) static int sierra_set_power_state(struct usb_device *udev, __u16 swiState)
{ {
int result; int result;
dev_dbg(&udev->dev, "%s", "SET POWER STATE"); dev_dbg(&udev->dev, "%s", "SET POWER STATE\n");
result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
0x00, /* __u8 request */ 0x00, /* __u8 request */
0x40, /* __u8 request type */ 0x40, /* __u8 request type */
...@@ -63,7 +63,7 @@ static int sierra_set_power_state(struct usb_device *udev, __u16 swiState) ...@@ -63,7 +63,7 @@ static int sierra_set_power_state(struct usb_device *udev, __u16 swiState)
static int sierra_set_ms_mode(struct usb_device *udev, __u16 eSocMode) static int sierra_set_ms_mode(struct usb_device *udev, __u16 eSocMode)
{ {
int result; int result;
dev_dbg(&udev->dev, "%s", "DEVICE MODE SWITCH"); dev_dbg(&udev->dev, "%s", "DEVICE MODE SWITCH\n");
result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
SWIMS_USB_REQUEST_SetMode, /* __u8 request */ SWIMS_USB_REQUEST_SetMode, /* __u8 request */
SWIMS_USB_REQUEST_TYPE_SetMode, /* __u8 request type */ SWIMS_USB_REQUEST_TYPE_SetMode, /* __u8 request type */
...@@ -397,7 +397,7 @@ static void sierra_indat_callback(struct urb *urb) ...@@ -397,7 +397,7 @@ static void sierra_indat_callback(struct urb *urb)
err = usb_submit_urb(urb, GFP_ATOMIC); err = usb_submit_urb(urb, GFP_ATOMIC);
if (err) if (err)
dev_err(&port->dev, "resubmit read urb failed." dev_err(&port->dev, "resubmit read urb failed."
"(%d)", err); "(%d)\n", err);
} }
} }
return; return;
...@@ -525,7 +525,7 @@ static int sierra_open(struct usb_serial_port *port, struct file *filp) ...@@ -525,7 +525,7 @@ static int sierra_open(struct usb_serial_port *port, struct file *filp)
result = usb_submit_urb(urb, GFP_KERNEL); result = usb_submit_urb(urb, GFP_KERNEL);
if (result) { if (result) {
dev_err(&port->dev, "submit urb %d failed (%d) %d", dev_err(&port->dev, "submit urb %d failed (%d) %d\n",
i, result, urb->transfer_buffer_length); i, result, urb->transfer_buffer_length);
} }
} }
...@@ -538,7 +538,7 @@ static int sierra_open(struct usb_serial_port *port, struct file *filp) ...@@ -538,7 +538,7 @@ static int sierra_open(struct usb_serial_port *port, struct file *filp)
if (port->interrupt_in_urb) { if (port->interrupt_in_urb) {
result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL); result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
if (result) if (result)
dev_err(&port->dev, "submit irq_in urb failed %d", dev_err(&port->dev, "submit irq_in urb failed %d\n",
result); result);
} }
return 0; return 0;
......
...@@ -636,7 +636,7 @@ static int __devinit gxt4500_probe(struct pci_dev *pdev, ...@@ -636,7 +636,7 @@ static int __devinit gxt4500_probe(struct pci_dev *pdev,
info = framebuffer_alloc(sizeof(struct gxt4500_par), &pdev->dev); info = framebuffer_alloc(sizeof(struct gxt4500_par), &pdev->dev);
if (!info) { if (!info) {
dev_err(&pdev->dev, "gxt4500: cannot alloc FB info record"); dev_err(&pdev->dev, "gxt4500: cannot alloc FB info record\n");
goto err_free_fb; goto err_free_fb;
} }
par = info->par; par = info->par;
......
...@@ -225,7 +225,7 @@ static void blizzard_restart_sdram(void) ...@@ -225,7 +225,7 @@ static void blizzard_restart_sdram(void)
while (!(blizzard_read_reg(BLIZZARD_MEM_BANK0_STATUS) & 0x01)) { while (!(blizzard_read_reg(BLIZZARD_MEM_BANK0_STATUS) & 0x01)) {
if (time_after(jiffies, tmo)) { if (time_after(jiffies, tmo)) {
dev_err(blizzard.fbdev->dev, dev_err(blizzard.fbdev->dev,
"s1d1374x: SDRAM not ready"); "s1d1374x: SDRAM not ready\n");
break; break;
} }
msleep(1); msleep(1);
......
...@@ -880,19 +880,19 @@ static irqreturn_t omap_dispc_irq_handler(int irq, void *dev) ...@@ -880,19 +880,19 @@ static irqreturn_t omap_dispc_irq_handler(int irq, void *dev)
static int get_dss_clocks(void) static int get_dss_clocks(void)
{ {
if (IS_ERR((dispc.dss_ick = clk_get(dispc.fbdev->dev, "dss_ick")))) { if (IS_ERR((dispc.dss_ick = clk_get(dispc.fbdev->dev, "dss_ick")))) {
dev_err(dispc.fbdev->dev, "can't get dss_ick"); dev_err(dispc.fbdev->dev, "can't get dss_ick\n");
return PTR_ERR(dispc.dss_ick); return PTR_ERR(dispc.dss_ick);
} }
if (IS_ERR((dispc.dss1_fck = clk_get(dispc.fbdev->dev, "dss1_fck")))) { if (IS_ERR((dispc.dss1_fck = clk_get(dispc.fbdev->dev, "dss1_fck")))) {
dev_err(dispc.fbdev->dev, "can't get dss1_fck"); dev_err(dispc.fbdev->dev, "can't get dss1_fck\n");
clk_put(dispc.dss_ick); clk_put(dispc.dss_ick);
return PTR_ERR(dispc.dss1_fck); return PTR_ERR(dispc.dss1_fck);
} }
if (IS_ERR((dispc.dss_54m_fck = if (IS_ERR((dispc.dss_54m_fck =
clk_get(dispc.fbdev->dev, "dss_54m_fck")))) { clk_get(dispc.fbdev->dev, "dss_54m_fck")))) {
dev_err(dispc.fbdev->dev, "can't get dss_54m_fck"); dev_err(dispc.fbdev->dev, "can't get dss_54m_fck\n");
clk_put(dispc.dss_ick); clk_put(dispc.dss_ick);
clk_put(dispc.dss1_fck); clk_put(dispc.dss1_fck);
return PTR_ERR(dispc.dss_54m_fck); return PTR_ERR(dispc.dss_54m_fck);
......
...@@ -508,7 +508,7 @@ int hwa742_update_window_async(struct fb_info *fbi, ...@@ -508,7 +508,7 @@ int hwa742_update_window_async(struct fb_info *fbi,
if (unlikely(win->format & if (unlikely(win->format &
~(0x03 | OMAPFB_FORMAT_FLAG_DOUBLE | ~(0x03 | OMAPFB_FORMAT_FLAG_DOUBLE |
OMAPFB_FORMAT_FLAG_TEARSYNC | OMAPFB_FORMAT_FLAG_FORCE_VSYNC))) { OMAPFB_FORMAT_FLAG_TEARSYNC | OMAPFB_FORMAT_FLAG_FORCE_VSYNC))) {
dev_dbg(hwa742.fbdev->dev, "invalid window flag"); dev_dbg(hwa742.fbdev->dev, "invalid window flag\n");
r = -EINVAL; r = -EINVAL;
goto out; goto out;
} }
......
...@@ -84,12 +84,12 @@ static inline u32 rfbi_read_reg(int idx) ...@@ -84,12 +84,12 @@ static inline u32 rfbi_read_reg(int idx)
static int rfbi_get_clocks(void) static int rfbi_get_clocks(void)
{ {
if (IS_ERR((rfbi.dss_ick = clk_get(rfbi.fbdev->dev, "dss_ick")))) { if (IS_ERR((rfbi.dss_ick = clk_get(rfbi.fbdev->dev, "dss_ick")))) {
dev_err(rfbi.fbdev->dev, "can't get dss_ick"); dev_err(rfbi.fbdev->dev, "can't get dss_ick\n");
return PTR_ERR(rfbi.dss_ick); return PTR_ERR(rfbi.dss_ick);
} }
if (IS_ERR((rfbi.dss1_fck = clk_get(rfbi.fbdev->dev, "dss1_fck")))) { if (IS_ERR((rfbi.dss1_fck = clk_get(rfbi.fbdev->dev, "dss1_fck")))) {
dev_err(rfbi.fbdev->dev, "can't get dss1_fck"); dev_err(rfbi.fbdev->dev, "can't get dss1_fck\n");
clk_put(rfbi.dss_ick); clk_put(rfbi.dss_ick);
return PTR_ERR(rfbi.dss1_fck); return PTR_ERR(rfbi.dss1_fck);
} }
......
...@@ -307,7 +307,7 @@ static void ds1wm_search(void *data, u8 search_type, ...@@ -307,7 +307,7 @@ static void ds1wm_search(void *data, u8 search_type,
rom_id |= (unsigned long long) r << (i * 4); rom_id |= (unsigned long long) r << (i * 4);
} }
dev_dbg(&ds1wm_data->pdev->dev, "found 0x%08llX", rom_id); dev_dbg(&ds1wm_data->pdev->dev, "found 0x%08llX\n", rom_id);
ds1wm_write_register(ds1wm_data, DS1WM_CMD, ~DS1WM_CMD_SRA); ds1wm_write_register(ds1wm_data, DS1WM_CMD, ~DS1WM_CMD_SRA);
ds1wm_reset(ds1wm_data); ds1wm_reset(ds1wm_data);
......
...@@ -185,13 +185,14 @@ static void otherend_changed(struct xenbus_watch *watch, ...@@ -185,13 +185,14 @@ static void otherend_changed(struct xenbus_watch *watch,
if (!dev->otherend || if (!dev->otherend ||
strncmp(dev->otherend, vec[XS_WATCH_PATH], strncmp(dev->otherend, vec[XS_WATCH_PATH],
strlen(dev->otherend))) { strlen(dev->otherend))) {
dev_dbg(&dev->dev, "Ignoring watch at %s", vec[XS_WATCH_PATH]); dev_dbg(&dev->dev, "Ignoring watch at %s\n",
vec[XS_WATCH_PATH]);
return; return;
} }
state = xenbus_read_driver_state(dev->otherend); state = xenbus_read_driver_state(dev->otherend);
dev_dbg(&dev->dev, "state is %d, (%s), %s, %s", dev_dbg(&dev->dev, "state is %d, (%s), %s, %s\n",
state, xenbus_strstate(state), dev->otherend_watch.node, state, xenbus_strstate(state), dev->otherend_watch.node,
vec[XS_WATCH_PATH]); vec[XS_WATCH_PATH]);
......
...@@ -209,7 +209,7 @@ static void aaci_fifo_irq(struct aaci *aaci, int channel, u32 mask) ...@@ -209,7 +209,7 @@ static void aaci_fifo_irq(struct aaci *aaci, int channel, u32 mask)
void *ptr; void *ptr;
if (!aacirun->substream || !aacirun->start) { if (!aacirun->substream || !aacirun->start) {
dev_warn(&aaci->dev->dev, "RX interrupt???"); dev_warn(&aaci->dev->dev, "RX interrupt???\n");
writel(0, aacirun->base + AACI_IE); writel(0, aacirun->base + AACI_IE);
return; return;
} }
...@@ -263,7 +263,7 @@ static void aaci_fifo_irq(struct aaci *aaci, int channel, u32 mask) ...@@ -263,7 +263,7 @@ static void aaci_fifo_irq(struct aaci *aaci, int channel, u32 mask)
void *ptr; void *ptr;
if (!aacirun->substream || !aacirun->start) { if (!aacirun->substream || !aacirun->start) {
dev_warn(&aaci->dev->dev, "TX interrupt???"); dev_warn(&aaci->dev->dev, "TX interrupt???\n");
writel(0, aacirun->base + AACI_IE); writel(0, aacirun->base + AACI_IE);
return; return;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册