summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ocfs2: Correct merge of 52f7c21 (Move /sys/o2cb to /sys/fs/o2cb)Joel Becker2008-04-301-1/+1
| | | | | | | | | | | | Commit 52f7c21b613f80cb425d115c9e5b4ed958a133c0 was intended to move /sys/o2cb to /sys/fs/o2cb, providing /sys/o2cb as a symlink for backwards compatibility. However, the merge apparently added the symlink but failed to move the directory, resulting in a duplicate filename error. It's a one-line change that was missing. Signed-off-by: Joel Becker <joel.becker@oracle.com> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Mark Fasheh <mfasheh@suse.com>
* Merge branch 'release' of ↵Linus Torvalds2008-04-30196-3650/+6663
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (179 commits) ACPI: Fix acpi_processor_idle and idle= boot parameters interaction acpi: fix section mismatch warning in pnpacpi intel_menlo: fix build warning ACPI: Cleanup: Remove unneeded, multiple local dummy variables ACPI: video - fix permissions on some proc entries ACPI: video - properly handle errors when registering proc elements ACPI: video - do not store invalid entries in attached_array list ACPI: re-name acpi_pm_ops to acpi_suspend_ops ACER_WMI/ASUS_LAPTOP: fix build bug thinkpad_acpi: fix possible NULL pointer dereference if kstrdup failed ACPI: check a return value correctly in acpi_power_get_context() #if 0 acpi/bay.c:eject_removable_drive() eeepc-laptop: add hwmon fan control eeepc-laptop: add backlight eeepc-laptop: add base driver ACPI: thinkpad-acpi: bump up version to 0.20 ACPI: thinkpad-acpi: fix selects in Kconfig ACPI: thinkpad-acpi: use a private workqueue ACPI: thinkpad-acpi: fluff really minor fix ACPI: thinkpad-acpi: use uppercase for "LED" on user documentation ... Fixed conflicts in drivers/acpi/video.c and drivers/misc/intel_menlow.c manually.
| * Merge branch 'pnp' into releaseLen Brown2008-04-3026-1356/+1689
| |\
| | * PNPBIOS: remove include/linux/pnpbios.hBjorn Helgaas2008-04-296-155/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The contents of include/linux/pnpbios.h are used only inside the PNPBIOS backend, so this file doesn't need to be visible outside PNP. This patch moves the contents into an existing PNPBIOS-specific file, drivers/pnp/pnpbios/pnpbios.h. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Acked-By: Rene Herman <rene.herman@gmail.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * ISAPNP: remove unused pnp_dev->regs fieldBjorn Helgaas2008-04-292-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | The "regs" field in struct pnp_dev is set but never read, so remove it. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Acked-By: Rene Herman <rene.herman@gmail.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNP: make interfaces private to the PNP coreBjorn Helgaas2008-04-292-37/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | The interfaces for registering protocols, devices, cards, and resource options should only be used inside the PNP core. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Acked-By: Rene Herman <rene.herman@gmail.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNPACPI: move _CRS/_PRS warnings closer to the actionBjorn Helgaas2008-04-293-29/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move warnings about _CRS and _PRS problems to the place where we actually make the ACPI calls. Then we don't have to pass around acpi_status values any more than necessary. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Acked-By: Rene Herman <rene.herman@gmail.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * ISAPNP: fold isapnp_read_resources() back into isapnp_get_resources()Bjorn Helgaas2008-04-291-37/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | isapnp_get_resources() does very little besides call isapnp_read_resources(), so just fold them back together. Based on a patch by Rene Herman <rene.herman@gmail.com> Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNP: make generic pnp_add_mem_resource()Bjorn Helgaas2008-04-296-61/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add a pnp_add_mem_resource() that can be used by all the PNP backends. This consolidates a little more pnp_resource_table knowledge into one place. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNP: make generic pnp_add_io_resource()Bjorn Helgaas2008-04-296-59/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add a pnp_add_io_resource() that can be used by all the PNP backends. This consolidates a little more pnp_resource_table knowledge into one place. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNP: make generic pnp_add_dma_resource()Bjorn Helgaas2008-04-296-72/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add a pnp_add_dma_resource() that can be used by all the PNP backends. This consolidates a little more pnp_resource_table knowledge into one place. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNP: make generic pnp_add_irq_resource()Bjorn Helgaas2008-04-296-66/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add a pnp_add_irq_resource() that can be used by all the PNP backends. This consolidates a little more pnp_resource_table knowledge into one place. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNP: add pnp_new_resource() to find a new unset pnp_resourceBjorn Helgaas2008-04-291-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | This encapsulates the code to locate a new pnp_resource of the desired type. Currently this uses the pnp_resource_table, but it will soon change to find a resource in a linked list. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNP: add pnp_resource index for ISAPNPBjorn Helgaas2008-04-294-37/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Save the ISAPNP config register index in the struct pnp_resource. We need this because it is important to write ISAPNP configuration back to the same registers we read it from. For example, if we read valid regions from memory descriptors 0, 1, and 3, we'd better write them back to the same registers, without compressing them to descriptors 0, 1, and 2. This was previously guaranteed by using the index into the pnp_resource_table array as the ISAPNP config register index. However, I am removing those fixed-size arrays, so we need to save the ISAPNP register index elsewhere. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNP: add pnp_get_pnp_resource()Bjorn Helgaas2008-04-292-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some places, we need to get the struct pnp_resource, not just the struct resource, because ISAPNP needs to store the register index in the pnp_resource. I don't like pnp_get_pnp_resource() and hope that it is temporary, but we need it for a little while. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNP: add struct pnp_resourceBjorn Helgaas2008-04-293-16/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a "struct pnp_resource". This currently contains only a struct resource, but we will soon need additional PNP-specific information. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNP: remove pnp_resource_table references from resource decodersBjorn Helgaas2008-04-293-125/+140
| | | | | | | | | | | | | | | | | | | | | | | | This removes a few more references to the pnp_resource_table. No functional change. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNP: make pnp_resource_table private to PNP coreBjorn Helgaas2008-04-298-31/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | There are no remaining references to the PNP_MAX_* constants or the pnp_resource_table structure outside of the PNP core. Make them private to the PNP core. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * rtc: dont reference pnp_resource_table directlyBjorn Helgaas2008-04-291-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | pnp_resource_table is going away soon, so use the more generic public interfaces instead. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Acked-By: Rene Herman <rene.herman@gmail.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNP: remove PNP_MAX_* usesBjorn Helgaas2008-04-294-63/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove some PNP_MAX_* uses. The pnp_resource_table isn't dynamic yet, but with pnp_get_resource(), we can start moving away from the table size constants. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNP: convert assign, interface to use pnp_get_resource(), not pnp_resource_tableBjorn Helgaas2008-04-293-32/+32
| | | | | | | | | | | | | | | | | | | | | | | | This removes more direct references to pnp_resource_table from the pnp_assign_resources() path and the /sys user interface path. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNP: convert encoders to use pnp_get_resource(), not pnp_resource_tableBjorn Helgaas2008-04-292-19/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes more direct references to pnp_resource_table. This path is used when telling a device what resources it should use. This doesn't convert ISAPNP because ISA needs to know the config register index in addition to the resource itself. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Acked-By: Rene Herman <rene.herman@gmail.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNP: convert resource checks to use pnp_get_resource(), not pnp_resource_tableBjorn Helgaas2008-04-291-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | This removes more direct references to pnp_resource_table. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Acked-By: Rene Herman <rene.herman@gmail.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNP: pass resources, not indexes, to pnp_check_port(), et alBjorn Helgaas2008-04-293-20/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | The caller already has the struct resource pointer, so no need for pnp_check_port(), pnp_check_mem(), etc., to look it up again. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Acked-By: Rene Herman <rene.herman@gmail.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNP: check for conflicts with all resources, not just earlier onesBjorn Helgaas2008-04-291-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes a use of "idx" in pnp_check_port() and similar functions, in preparation for replacing idx with a pointer to the resource itself. I split this out because it changes the behavior slightly: we used to check for conflicts only with earlier resources, e.g., we checked resource 2 against resources 0 and 1 but not against 3, 4, etc. Now we will check against all resources except 2. Since resources are assigned in ascending order, the old behavior was probably safe, but I don't like to depend on that ordering. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Acked-By: Rene Herman <rene.herman@gmail.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNP: reduce redundancy in pnp_set_current_resources()Bjorn Helgaas2008-04-291-24/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use a temporary "res" pointer to replace repeated lookups in the pnp resource tables. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Acked-By: Rene Herman <rene.herman@gmail.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNP: reduce redundancy in pnp_check_port() and othersBjorn Helgaas2008-04-291-38/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use a temporary "res" pointer to replace repeated lookups in the pnp resource tables. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Acked-By: Rene Herman <rene.herman@gmail.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNP: reduce redundancy in pnp_assign_port() and othersBjorn Helgaas2008-04-291-67/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use a temporary "res" pointer to replace repeated lookups in the pnp resource tables. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Acked-By: Rene Herman <rene.herman@gmail.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNP: use conventional "i" for loop indicesBjorn Helgaas2008-04-291-46/+46
| | | | | | | | | | | | | | | | | | | | | | | | Cosmetic only: just use "i" instead of "tmp". Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Acked-By: Rene Herman <rene.herman@gmail.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNP: convert resource accessors to use pnp_get_resource(), not ↵Bjorn Helgaas2008-04-291-40/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | pnp_resource_table This removes more direct references to pnp_resource_table. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNP: remove pnp_mem_flags() as an lvalueBjorn Helgaas2008-04-291-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A future change will change pnp_mem_flags() from a "#define that simplifies to an lvalue" to "an inline function that returns the flags value." Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Acked-By: Rene Herman <rene.herman@gmail.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNP: add pnp_get_resource() interfaceBjorn Helgaas2008-04-292-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a pnp_get_resource() that works the same way as platform_get_resource(). This will enable us to consolidate many pnp_resource_table references in one place, which will make it easier to make the table dynamic. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Acked-By: Rene Herman <rene.herman@gmail.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNP: factor pnp_init_resource_table() and pnp_clean_resource_table()Bjorn Helgaas2008-04-292-46/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the common part of pnp_init_resource_table() and pnp_clean_resource_table() into a new pnp_init_resource(). This reduces a little code duplication and will be useful later to initialize an individual resource. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNP: use dev_printk when possibleBjorn Helgaas2008-04-293-50/+43
| | | | | | | | | | | | | | | | | | | | | | | | Use dev_printk() when possible for more informative error messages. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Acked-By: Rene Herman <rene.herman@gmail.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNP: remove unused interfaces using pnp_resource_tableBjorn Helgaas2008-04-292-84/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rene Herman <rene.herman@gmail.com> recently removed the only in-tree driver uses of: pnp_init_resource_table() pnp_manual_config_dev() pnp_resource_change() in this change: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=109c53f840e551d6e99ecfd8b0131a968332c89f These are no longer used in the PNP core either, so we can just remove them completely. It's possible that there are out-of-tree drivers that use these interfaces. They should be changed to either (1) use PNP quirks to work around broken hardware or firmware, or (2) use the sysfs interfaces to control resource usage from userspace. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Acked-By: Rene Herman <rene.herman@gmail.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNP: remove pnp_resource_table from internal pnp_clean_resource_table interfaceBjorn Helgaas2008-04-291-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes pnp_clean_resource_table() to take a pnp_dev pointer rather than a pnp_resource_table pointer. This reduces the visibility of pnp_resource_table and removes an opportunity for error in the caller. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Acked-By: Rene Herman <rene.herman@gmail.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNP: add pnp_init_resources(struct pnp_dev *) interfaceBjorn Helgaas2008-04-298-11/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add pnp_init_resources(struct pnp_dev *) to replace pnp_init_resource_table(), which takes a pointer to the pnp_resource_table itself. Passing only the pnp_dev * reduces the possibility for error in the caller and removes the pnp_resource_table implementation detail from the interface. Even though pnp_init_resource_table() is exported, I did not export pnp_init_resources() because it is used only by the PNP core. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Acked-By: Rene Herman <rene.herman@gmail.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNP: add debug when assigning PNP resourcesBjorn Helgaas2008-04-293-20/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds code to dump PNP resources before and after assigning resources and before writing them to the device. This is enabled by CONFIG_PNP_DEBUG=y. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNP: add debug output to encodersBjorn Helgaas2008-04-295-43/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add debug output to encoders (enabled by CONFIG_PNP_DEBUG). This uses dev_printk, so I had to add pnp_dev arguments at the same time. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Acked-By: Rene Herman <rene.herman@gmail.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNP: remove more pnp_resource_table argumentsBjorn Helgaas2008-04-297-71/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop passing around struct pnp_resource_table pointers. In most cases, the caller doesn't need to know how the resources are stored inside the struct pnp_dev. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Acked-By: Rene Herman <rene.herman@gmail.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNP: remove pnp_resource_table from internal get/set interfacesBjorn Helgaas2008-04-296-21/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we call protocol->get() and protocol->set() methods, we currently supply pointers to both the pnp_dev and the pnp_resource_table even though the pnp_resource_table should always be the one associated with the pnp_dev. This removes the pnp_resource_table arguments to make it clear that these methods only operate on the specified pnp_dev. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Acked-By: Rene Herman <rene.herman@gmail.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNP: add debug output to option registrationBjorn Helgaas2008-04-295-84/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add debug output to resource option registration functions (enabled by CONFIG_PNP_DEBUG). This uses dev_printk, so I had to add pnp_dev arguments at the same time. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Acked-By: Rene Herman <rene.herman@gmail.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNPACPI: pass pnp_dev instead of acpi_handleBjorn Helgaas2008-04-293-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass the pnp_dev pointer when possible instead of the acpi_handle. This allows better error messages and reduces the chance of error in the caller. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Acked-By: Rene Herman <rene.herman@gmail.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNPACPI: extend irq_flags() to set IORESOURCE_IRQ_SHAREABLE when appropriateBjorn Helgaas2008-04-291-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This simplifies IRQ resource parsing slightly by computing all the IORESOURCE_IRQ_* flags at the same time. This also keeps track of shareability information when parsing options from _PRS. Previously we ignored shareability in _PRS. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Acked-By: Rene Herman <rene.herman@gmail.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNPACPI: hoist dma_flags() out of pnpacpi_parse_allocated_dmaresource()Bjorn Helgaas2008-04-291-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hoist dma_flags() out of pnpacpi_parse_allocated_dmaresource() into its caller. This makes pnpacpi_parse_allocated_dmaresource() more similar to pnpbios_parse_allocated_dmaresource(). Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Acked-By: Rene Herman <rene.herman@gmail.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNPACPI: use temporaries to reduce repetitionBjorn Helgaas2008-04-291-73/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | No functional change, just fewer words and fewer chances for transcription errors. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Acked-By: Rene Herman <rene.herman@gmail.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNPACPI: pnpacpi_encode_ext_irq() wrongly set "irq" instead of "extended_irq"Bjorn Helgaas2008-04-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pnpacpi_encode_ext_irq() should set resource->data.extended_irq, not resource->data.irq. This has been wrong since at least 2.6.12. I haven't seen any bug reports, but it's clearly incorrect. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNP: add pnp_alloc_card()Bjorn Helgaas2008-04-293-11/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add pnp_alloc_card() to allocate a struct pnp_card and fill in the protocol, instance number, and initial PNP ID. Now it is always valid to use dev_printk() on any pnp_card pointer. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Acked-By: Rene Herman <rene.herman@gmail.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * ISAPNP: pull pnp_add_card_id() out of isapnp_parse_card_id()Bjorn Helgaas2008-04-291-22/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split the pnp_add_card_id() part from the PNPID conversion part so we can move the initial add_id() into the pnp_card allocation. This makes the PNPID conversion generic so we can use the same one for both devices and cards. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Acked-By: Rene Herman <rene.herman@gmail.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * PNP: change pnp_add_card_id() to allocate its own pnp_id structuresBjorn Helgaas2008-04-293-17/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | This moves some of the pnp_id knowledge out of the backends and into the PNP core. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Acked-By: Rene Herman <rene.herman@gmail.com> Signed-off-by: Len Brown <len.brown@intel.com>
OpenPOWER on IntegriCloud