linux-kernel - Re: linux-next: manual merge of the driver-core tree with the pci tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 27 Feb 2012 20:39:00 -0800
From:	Yinghai Lu <yinghai@...nel.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Greg KH <greg@...ah.com>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Jesse Barnes <jbarnes@...tuousgeek.org>
Subject: Re: linux-next: manual merge of the driver-core tree with the pci tree

On Mon, Feb 27, 2012 at 7:29 PM, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> include/linux/pci.h between commit 6754b9e9c335 ("PCI: Rename
> pci_remove_behind_bridge to pci_stop_and_remove_behind_bridge") from the
> pci tree and commit aad4f4000cec ("PCI: Add helper macro for
> pci_register_driver boilerplate") from the driver-core tree.
>
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.
> --
> Cheers,
> Stephen Rothwell                    sfr@...b.auug.org.au
>
> diff --cc include/linux/pci.h
> index 5584aac,d4afd70..0000000
> --- a/include/linux/pci.h
> +++ b/include/linux/pci.h
> @@@ -947,7 -946,20 +947,20 @@@ int __must_check __pci_register_driver(
>        __pci_register_driver(driver, THIS_MODULE, KBUILD_MODNAME)
>
>  void pci_unregister_driver(struct pci_driver *dev);
> +
> + /**
> +  * module_pci_driver() - Helper macro for registering a PCI driver
> +  * @__pci_driver: pci_driver struct
> +  *
> +  * Helper macro for PCI drivers which do not do anything special in module
> +  * init/exit. This eliminates a lot of boilerplate. Each module may only
> +  * use this macro once, and calling it replaces module_init() and module_exit()
> +  */
> + #define module_pci_driver(__pci_driver) \
> +       module_driver(__pci_driver, pci_register_driver, \
> +                      pci_unregister_driver)
> +
>  -void pci_remove_behind_bridge(struct pci_dev *dev);
>  +void pci_stop_and_remove_behind_bridge(struct pci_dev *dev);
>  struct pci_driver *pci_dev_driver(const struct pci_dev *dev);
>  int pci_add_dynid(struct pci_driver *drv,
>                  unsigned int vendor, unsigned int device,


yes. we rename pci_remove_* to pci_stop_and_remove_*.

BTW, include/linux/pci.h looks like a mess. We should tidy it up

Thanks

Yinghai
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/