You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Merge tag 'driver-core-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core updates from Greg Kroah-Hartman: "Here's the large driver core updates for 3.8-rc1. The biggest thing here is the various __dev* marking removals. This is going to be a pain for the merge with different subsystem trees, I know, but all of the patches included here have been ACKed by their various subsystem maintainers, as they wanted them to go through here. If this is too much of a pain, I can pull all of them out of this tree and just send you one with the other fixes/updates and then, after 3.8-rc1 is out, do the rest of the removals to ensure we catch them all, it's up to you. The merges should all be trivial, and Stephen has been doing them all in linux-next for a few weeks now quite easily. Other than the __dev* marking removals, there's nothing major here, some firmware loading updates and other minor things in the driver core. All of these have (much to Stephen's annoyance), been in linux-next for a while. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>" Fixed up trivial conflicts in drivers/gpio/gpio-{em,stmpe}.c due to gpio update. * tag 'driver-core-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (93 commits) modpost.c: Stop checking __dev* section mismatches init.h: Remove __dev* sections from the kernel acpi: remove use of __devinit PCI: Remove __dev* markings PCI: Always build setup-bus when PCI is enabled PCI: Move pci_uevent into pci-driver.c PCI: Remove CONFIG_HOTPLUG ifdefs unicore32/PCI: Remove CONFIG_HOTPLUG ifdefs sh/PCI: Remove CONFIG_HOTPLUG ifdefs powerpc/PCI: Remove CONFIG_HOTPLUG ifdefs mips/PCI: Remove CONFIG_HOTPLUG ifdefs microblaze/PCI: Remove CONFIG_HOTPLUG ifdefs dma: remove use of __devinit dma: remove use of __devexit_p firewire: remove use of __devinitdata firewire: remove use of __devinit leds: remove use of __devexit leds: remove use of __devinit leds: remove use of __devexit_p mmc: remove use of __devexit ...
This commit is contained in:
@@ -364,6 +364,6 @@ static inline int pm80x_dev_resume(struct device *dev)
|
||||
#endif
|
||||
|
||||
extern int pm80x_init(struct i2c_client *client,
|
||||
const struct i2c_device_id *id) __devinit;
|
||||
const struct i2c_device_id *id);
|
||||
extern int pm80x_deinit(struct i2c_client *client);
|
||||
#endif /* __LINUX_MFD_88PM80X_H */
|
||||
|
||||
@@ -291,9 +291,9 @@ struct ab8500_platform_data {
|
||||
struct ab8500_codec_platform_data *codec;
|
||||
};
|
||||
|
||||
extern int __devinit ab8500_init(struct ab8500 *ab8500,
|
||||
extern int ab8500_init(struct ab8500 *ab8500,
|
||||
enum ab8500_version version);
|
||||
extern int __devexit ab8500_exit(struct ab8500 *ab8500);
|
||||
extern int ab8500_exit(struct ab8500 *ab8500);
|
||||
|
||||
extern int ab8500_suspend(struct ab8500 *ab8500);
|
||||
|
||||
|
||||
@@ -37,21 +37,21 @@ struct pm_irq_chip;
|
||||
|
||||
#ifdef CONFIG_MFD_PM8XXX_IRQ
|
||||
int pm8xxx_get_irq_stat(struct pm_irq_chip *chip, int irq);
|
||||
struct pm_irq_chip * __devinit pm8xxx_irq_init(struct device *dev,
|
||||
struct pm_irq_chip *pm8xxx_irq_init(struct device *dev,
|
||||
const struct pm8xxx_irq_platform_data *pdata);
|
||||
int __devexit pm8xxx_irq_exit(struct pm_irq_chip *chip);
|
||||
int pm8xxx_irq_exit(struct pm_irq_chip *chip);
|
||||
#else
|
||||
static inline int pm8xxx_get_irq_stat(struct pm_irq_chip *chip, int irq)
|
||||
{
|
||||
return -ENXIO;
|
||||
}
|
||||
static inline struct pm_irq_chip * __devinit pm8xxx_irq_init(
|
||||
static inline struct pm_irq_chip *pm8xxx_irq_init(
|
||||
const struct device *dev,
|
||||
const struct pm8xxx_irq_platform_data *pdata)
|
||||
{
|
||||
return ERR_PTR(-ENXIO);
|
||||
}
|
||||
static inline int __devexit pm8xxx_irq_exit(struct pm_irq_chip *chip)
|
||||
static inline int pm8xxx_irq_exit(struct pm_irq_chip *chip)
|
||||
{
|
||||
return -ENXIO;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user