redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: slicoss: clean up use of dev_err 

First, don't print pci device information or driver prefixes, this
is already printed by dev_err. Next, don't report error messages
via dev_err when the failing function already reports all errors
via dev_err.

Signed-off-by: David Matlack <matlackdavid@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
hifive-unleashed-5.1
David Matlack 2014-05-23 21:04:55 -07:00 committed by Greg Kroah-Hartman
parent 17dd4338f3
commit 811e843ddf
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/staging/slicoss/slicoss.c
View File

@ -395,7 +395,7 @@ static int slic_card_download_gbrcv(struct adapter *adapter)
ret = request_firmware(&fw, file, &adapter->pcidev->dev);
if (ret) {
dev_err(&adapter->pcidev->dev,
"SLICOSS: Failed to load firmware %s\n", file);
"Failed to load firmware %s\n", file);
return ret;
}
@ -473,7 +473,7 @@ static int slic_card_download(struct adapter *adapter)
ret = request_firmware(&fw, file, &adapter->pcidev->dev);
if (ret) {
dev_err(&adapter->pcidev->dev,
"SLICOSS: Failed to load firmware %s\n", file);
"Failed to load firmware %s\n", file);
return ret;
}
numsects = *(u32 *)(fw->data + index);
@ -2699,13 +2699,8 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
/* Download the microcode */
status = slic_card_download(adapter);
if (status != 0) {
dev_err(&adapter->pcidev->dev,
"download failed bus %d slot %d\n",
adapter->busnumber, adapter->slotnumber);
if (status)
return status;
}
if (!card->config_set) {
peeprom = pci_alloc_consistent(adapter->pcidev,
@ -2717,8 +2712,7 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
if (!peeprom) {
dev_err(&adapter->pcidev->dev,
"eeprom read failed to get memory bus %d slot %d\n", adapter->busnumber,
adapter->slotnumber);
"Failed to allocate DMA memory for EEPROM.\n");
return -ENOMEM;
} else {
memset(peeprom, 0, sizeof(struct slic_eeprom));
@ -2767,8 +2761,7 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
i++;
if (i > 5000) {
dev_err(&adapter->pcidev->dev,
"%d config data fetch timed out!\n",
adapter->port);
"Fetch of config data timed out.\n");
slic_reg64_write(adapter,
&slic_regs->slic_isp, 0,
&slic_regs->slic_addr_upper,
@ -2851,19 +2844,16 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
slic_reg64_write(adapter, &slic_regs->slic_isp, 0,
&slic_regs->slic_addr_upper,
0, FLUSH);
dev_err(&adapter->pcidev->dev,
"unsupported CONFIGURATION EEPROM invalid\n");
dev_err(&adapter->pcidev->dev, "EEPROM invalid.\n");
return -EINVAL;
}
card->config_set = 1;
}
if (slic_card_download_gbrcv(adapter)) {
dev_err(&adapter->pcidev->dev,
"unable to download GB receive microcode\n");
return -EINVAL;
}
status = slic_card_download_gbrcv(adapter);
if (status)
return status;
if (slic_global.dynamic_intagg)
slic_intagg_set(adapter, 0);