mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
PCI: add pci_try_set_mwi
As suggested by Andrew, add pci_try_set_mwi(), which does not require return-value checking. - add pci_try_set_mwi() without __must_check - make it return 0 on success, errno if the "try" failed or error - review callers Signed-off-by: Randy Dunlap <[email protected]> Cc: Alan Cox <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
parent
f5609d7e67
commit
694625c0b3
11 changed files with 38 additions and 18 deletions
|
|
@ -4917,13 +4917,13 @@ static int __devinit cas_init_one(struct pci_dev *pdev,
|
|||
pci_cmd &= ~PCI_COMMAND_SERR;
|
||||
pci_cmd |= PCI_COMMAND_PARITY;
|
||||
pci_write_config_word(pdev, PCI_COMMAND, pci_cmd);
|
||||
if (pci_set_mwi(pdev))
|
||||
if (pci_try_set_mwi(pdev))
|
||||
printk(KERN_WARNING PFX "Could not enable MWI for %s\n",
|
||||
pci_name(pdev));
|
||||
|
||||
/*
|
||||
* On some architectures, the default cache line size set
|
||||
* by pci_set_mwi reduces perforamnce. We have to increase
|
||||
* by pci_try_set_mwi reduces perforamnce. We have to increase
|
||||
* it for this case. To start, we'll print some configuration
|
||||
* data.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -740,7 +740,7 @@ static int __devinit starfire_init_one(struct pci_dev *pdev,
|
|||
pci_set_master(pdev);
|
||||
|
||||
/* enable MWI -- it vastly improves Rx performance on sparc64 */
|
||||
pci_set_mwi(pdev);
|
||||
pci_try_set_mwi(pdev);
|
||||
|
||||
#ifdef ZEROCOPY
|
||||
/* Starfire can do TCP/UDP checksumming */
|
||||
|
|
|
|||
|
|
@ -1155,7 +1155,7 @@ static void __devinit tulip_mwi_config (struct pci_dev *pdev,
|
|||
/* set or disable MWI in the standard PCI command bit.
|
||||
* Check for the case where mwi is desired but not available
|
||||
*/
|
||||
if (csr0 & MWI) pci_set_mwi(pdev);
|
||||
if (csr0 & MWI) pci_try_set_mwi(pdev);
|
||||
else pci_clear_mwi(pdev);
|
||||
|
||||
/* read result from hardware (in case bit refused to enable) */
|
||||
|
|
|
|||
|
|
@ -166,8 +166,7 @@ prism54_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
|||
pci_set_master(pdev);
|
||||
|
||||
/* enable MWI */
|
||||
if (!pci_set_mwi(pdev))
|
||||
printk(KERN_INFO "%s: pci_set_mwi(pdev) succeeded\n", DRV_NAME);
|
||||
pci_try_set_mwi(pdev);
|
||||
|
||||
/* setup the network device interface and its structure */
|
||||
if (!(ndev = islpci_setup(pdev))) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue