mirror of
https://github.com/torvalds/linux.git
synced 2024-11-05 19:41:54 +00:00
cff2f741b8
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>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
iEYEABECAAYFAlDHkPkACgkQMUfUDdst+ykaWgCfW7AM30cv0nzoVO08ax6KjlG1
KVYAn3z/KYazvp4B6LMvrW9y0G34Wmad
=yvVr
-----END PGP SIGNATURE-----
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
...
95 lines
2.6 KiB
C
95 lines
2.6 KiB
C
/*
|
|
* ACPI Hardware Error Device (PNP0C33) Driver
|
|
*
|
|
* Copyright (C) 2010, Intel Corp.
|
|
* Author: Huang Ying <ying.huang@intel.com>
|
|
*
|
|
* ACPI Hardware Error Device is used to report some hardware errors
|
|
* notified via SCI, mainly the corrected errors.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License version
|
|
* 2 as published by the Free Software Foundation;
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/init.h>
|
|
#include <linux/acpi.h>
|
|
#include <acpi/acpi_bus.h>
|
|
#include <acpi/acpi_drivers.h>
|
|
#include <acpi/hed.h>
|
|
|
|
static struct acpi_device_id acpi_hed_ids[] = {
|
|
{"PNP0C33", 0},
|
|
{"", 0},
|
|
};
|
|
MODULE_DEVICE_TABLE(acpi, acpi_hed_ids);
|
|
|
|
static acpi_handle hed_handle;
|
|
|
|
static BLOCKING_NOTIFIER_HEAD(acpi_hed_notify_list);
|
|
|
|
int register_acpi_hed_notifier(struct notifier_block *nb)
|
|
{
|
|
return blocking_notifier_chain_register(&acpi_hed_notify_list, nb);
|
|
}
|
|
EXPORT_SYMBOL_GPL(register_acpi_hed_notifier);
|
|
|
|
void unregister_acpi_hed_notifier(struct notifier_block *nb)
|
|
{
|
|
blocking_notifier_chain_unregister(&acpi_hed_notify_list, nb);
|
|
}
|
|
EXPORT_SYMBOL_GPL(unregister_acpi_hed_notifier);
|
|
|
|
/*
|
|
* SCI to report hardware error is forwarded to the listeners of HED,
|
|
* it is used by HEST Generic Hardware Error Source with notify type
|
|
* SCI.
|
|
*/
|
|
static void acpi_hed_notify(struct acpi_device *device, u32 event)
|
|
{
|
|
blocking_notifier_call_chain(&acpi_hed_notify_list, 0, NULL);
|
|
}
|
|
|
|
static int acpi_hed_add(struct acpi_device *device)
|
|
{
|
|
/* Only one hardware error device */
|
|
if (hed_handle)
|
|
return -EINVAL;
|
|
hed_handle = device->handle;
|
|
return 0;
|
|
}
|
|
|
|
static int acpi_hed_remove(struct acpi_device *device, int type)
|
|
{
|
|
hed_handle = NULL;
|
|
return 0;
|
|
}
|
|
|
|
static struct acpi_driver acpi_hed_driver = {
|
|
.name = "hardware_error_device",
|
|
.class = "hardware_error",
|
|
.ids = acpi_hed_ids,
|
|
.ops = {
|
|
.add = acpi_hed_add,
|
|
.remove = acpi_hed_remove,
|
|
.notify = acpi_hed_notify,
|
|
},
|
|
};
|
|
module_acpi_driver(acpi_hed_driver);
|
|
|
|
ACPI_MODULE_NAME("hed");
|
|
MODULE_AUTHOR("Huang Ying");
|
|
MODULE_DESCRIPTION("ACPI Hardware Error Device Driver");
|
|
MODULE_LICENSE("GPL");
|