[PATCH] openfirmware: generate device table for userspace
This converts the usage of struct of_match to struct of_device_id, similar to pci_device_id. This allows a device table to be generated, which can be parsed by depmod(8) to generate a map file for module loading. In order for hotplug to work with macio devices, patches to module-init-tools and hotplug must be applied. Those patches are available at: ftp://ftp.suse.com/pub/people/jeffm/linux/macio-hotplug/ Signed-off-by: Jeff Mahoney <jeffm@suse.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
@@ -1419,7 +1419,7 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif)
|
||||
* Attach to a macio probed interface
|
||||
*/
|
||||
static int __devinit
|
||||
pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_match *match)
|
||||
pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match)
|
||||
{
|
||||
void __iomem *base;
|
||||
unsigned long regbase;
|
||||
@@ -1637,27 +1637,19 @@ pmac_ide_pci_resume(struct pci_dev *pdev)
|
||||
return rc;
|
||||
}
|
||||
|
||||
static struct of_match pmac_ide_macio_match[] =
|
||||
static struct of_device_id pmac_ide_macio_match[] =
|
||||
{
|
||||
{
|
||||
.name = "IDE",
|
||||
.type = OF_ANY_MATCH,
|
||||
.compatible = OF_ANY_MATCH
|
||||
},
|
||||
{
|
||||
.name = "ATA",
|
||||
.type = OF_ANY_MATCH,
|
||||
.compatible = OF_ANY_MATCH
|
||||
},
|
||||
{
|
||||
.name = OF_ANY_MATCH,
|
||||
.type = "ide",
|
||||
.compatible = OF_ANY_MATCH
|
||||
},
|
||||
{
|
||||
.name = OF_ANY_MATCH,
|
||||
.type = "ata",
|
||||
.compatible = OF_ANY_MATCH
|
||||
},
|
||||
{},
|
||||
};
|
||||
|
Reference in New Issue
Block a user