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

Commit 3ec6a8d0 authored by Andrew Morton's avatar Andrew Morton Committed by Greg Kroah-Hartman
Browse files

PCI: pcie-check-and-return-bus_register-errors fix 



__must_check goes on the declaration, not the definition.

Cc: "Randy.Dunlap" <rdunlap@xenotime.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 09d6029f

drivers/pci/pcie/portdrv.h

+3 −1
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 
#ifndef _PORTDRV_H_

#define _PORTDRV_H_



#include <linux/compiler.h>



#if !defined(PCI_CAP_ID_PME)

#define PCI_CAP_ID_PME			1

#endif
@@ -39,7 +41,7 @@ extern int pcie_port_device_suspend(struct pci_dev *dev, pm_message_t state); 
extern int pcie_port_device_resume(struct pci_dev *dev);

#endif

extern void pcie_port_device_remove(struct pci_dev *dev);

extern int pcie_port_bus_register(void);

extern int __must_check pcie_port_bus_register(void);

extern void pcie_port_bus_unregister(void);



#endif /* _PORTDRV_H_ */

drivers/pci/pcie/portdrv_core.c

+1 −2
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
 * Copyright (C) Tom Long Nguyen (tom.l.nguyen@intel.com)

 */



#include <linux/compiler.h>

#include <linux/module.h>

#include <linux/pci.h>

#include <linux/kernel.h>
@@ -401,7 +400,7 @@ void pcie_port_device_remove(struct pci_dev *dev) 
		pci_disable_msi(dev);

}



int __must_check pcie_port_bus_register(void)

int pcie_port_bus_register(void)

{

	return bus_register(&pcie_port_bus_type);

}