Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b364fd50 authored by Horms's avatar Horms Committed by James Bottomley
Browse files

[SCSI] fusion: honour return value of pci_enable_device() in mpt_resume() 



Honour the return value of pci_enable_device(), which
seems to be a desirable thing to do:

  2.6.20-rc4
  gcc (GCC) 4.1.2 20061115 (prerelease) (Debian 4.1.1-21)

    CC [M]  drivers/message/fusion/mptbase.o
    drivers/message/fusion/mptbase.c: In function `mpt_resume':
    drivers/message/fusion/mptbase.c:1541: warning: ignoring return value
    of `pci_enable_device', declared with attribute warn_unused_result

It also in turn has mptscsih_resume() honour the return value of
mpt_resume()

I'm not sure about the handling of the other potential error cases
in mpt_resume(), of which there appear to be many. But this does
seem to be a good start.

Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
Acked-by: default avatar"Moore, Eric" <Eric.Moore@lsi.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent a1f9ce05

drivers/message/fusion/mptbase.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -1531,6 +1531,7 @@ mpt_resume(struct pci_dev *pdev) 
	MPT_ADAPTER *ioc = pci_get_drvdata(pdev);

	MPT_ADAPTER *ioc = pci_get_drvdata(pdev);

	u32 device_state = pdev->current_state;

	u32 device_state = pdev->current_state;

	int recovery_state;

	int recovery_state;

	int err;





	printk(MYIOC_s_INFO_FMT

	printk(MYIOC_s_INFO_FMT

	"pci-resume: pdev=0x%p, slot=%s, Previous operating state [D%d]\n",

	"pci-resume: pdev=0x%p, slot=%s, Previous operating state [D%d]\n",
@@ -1538,7 +1539,9 @@ mpt_resume(struct pci_dev *pdev) 




	pci_set_power_state(pdev, 0);

	pci_set_power_state(pdev, 0);

	pci_restore_state(pdev);

	pci_restore_state(pdev);

	pci_enable_device(pdev);

	err = pci_enable_device(pdev);

	if (err)

		return err;





	/* enable interrupts */

	/* enable interrupts */

	CHIPREG_WRITE32(&ioc->chip->IntMask, MPI_HIM_DIM);

	CHIPREG_WRITE32(&ioc->chip->IntMask, MPI_HIM_DIM);

drivers/message/fusion/mptscsih.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -1188,8 +1188,7 @@ mptscsih_suspend(struct pci_dev *pdev, pm_message_t state) 
int

int

mptscsih_resume(struct pci_dev *pdev)

mptscsih_resume(struct pci_dev *pdev)

{

{

	mpt_resume(pdev);

	return mpt_resume(pdev);

	return 0;

}

}





#endif

#endif