On Thursday July 12, [EMAIL PROTECTED] wrote:
> On Thu, Jul 12 2007, Robert P. J. Day wrote:
> >
> > Signed-off-by: Robert P. J. Day <[EMAIL PROTECTED]>
>
> Looks fine to me, I remember this being brought up a long time ago, but
> apparently it never got merged. Neil?
Yes,
Acked-by: NeilBrown <[EMAIL PROTECTED]>
It is at best a half-hearted attempt at implementing memory mapping of
the device.
Will pass it on upstream?
While your at it, I'm sure I've sent this patch to Andrew twice, and
it seems to have been silently ignored... Maybe you will have better
luck (if it looks OK to you)??
Thanks,
NeilBrown
---------------------------------
Fix match of pci_ids in umem driver.
the pci device list for umem was not using PCI_DEVICE, so the
subvendor/subdevice fields were not set to ANY, so matching
didn't work properly.
Change to use PCI_DEVICE.
Signed-off-by: Neil Brown <[EMAIL PROTECTED]>
### Diffstat output
./drivers/block/umem.c | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff .prev/drivers/block/umem.c ./drivers/block/umem.c
--- .prev/drivers/block/umem.c 2007-03-28 11:59:36.000000000 +1000
+++ ./drivers/block/umem.c 2007-03-23 11:15:24.000000000 +1100
@@ -1134,23 +1134,18 @@ static void mm_pci_remove(struct pci_dev
blk_cleanup_queue(card->queue);
}
-static const struct pci_device_id mm_pci_ids[] = { {
- .vendor = PCI_VENDOR_ID_MICRO_MEMORY,
- .device = PCI_DEVICE_ID_MICRO_MEMORY_5415CN,
- }, {
- .vendor = PCI_VENDOR_ID_MICRO_MEMORY,
- .device = PCI_DEVICE_ID_MICRO_MEMORY_5425CN,
- }, {
- .vendor = PCI_VENDOR_ID_MICRO_MEMORY,
- .device = PCI_DEVICE_ID_MICRO_MEMORY_6155,
- }, {
+static const struct pci_device_id mm_pci_ids[] = {
+ {PCI_DEVICE(PCI_VENDOR_ID_MICRO_MEMORY,PCI_DEVICE_ID_MICRO_MEMORY_5415CN)},
+ {PCI_DEVICE(PCI_VENDOR_ID_MICRO_MEMORY,PCI_DEVICE_ID_MICRO_MEMORY_5425CN)},
+ {PCI_DEVICE(PCI_VENDOR_ID_MICRO_MEMORY,PCI_DEVICE_ID_MICRO_MEMORY_6155)},
+ {
.vendor = 0x8086,
.device = 0xB555,
.subvendor= 0x1332,
.subdevice= 0x5460,
.class = 0x050000,
.class_mask= 0,
- }, { /* end: all zeroes */ }
+ }, { /* end: all zeroes */ }
};
MODULE_DEVICE_TABLE(pci, mm_pci_ids);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
