git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
ide
/
ide-dma.c
diff --git
a/drivers/ide/ide-dma.c
b/drivers/ide/ide-dma.c
index
2d2eefb
..
c481be8
100644
(file)
--- a/
drivers/ide/ide-dma.c
+++ b/
drivers/ide/ide-dma.c
@@
-90,11
+90,6
@@
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/io.h>
#include <asm/irq.h>
-struct drive_list_entry {
- const char *id_model;
- const char *id_firmware;
-};
-
static const struct drive_list_entry drive_whitelist [] = {
{ "Micropolis 2112A" , "ALL" },
static const struct drive_list_entry drive_whitelist [] = {
{ "Micropolis 2112A" , "ALL" },
@@
-132,7
+127,6
@@
static const struct drive_list_entry drive_blacklist [] = {
{ "SAMSUNG CD-ROM SC-148C", "ALL" },
{ "SAMSUNG CD-ROM SC", "ALL" },
{ "SanDisk SDP3B-64" , "ALL" },
{ "SAMSUNG CD-ROM SC-148C", "ALL" },
{ "SAMSUNG CD-ROM SC", "ALL" },
{ "SanDisk SDP3B-64" , "ALL" },
- { "SAMSUNG CD-ROM SN-124", "ALL" },
{ "ATAPI CD-ROM DRIVE 40X MAXIMUM", "ALL" },
{ "_NEC DV5800A", "ALL" },
{ NULL , NULL }
{ "ATAPI CD-ROM DRIVE 40X MAXIMUM", "ALL" },
{ "_NEC DV5800A", "ALL" },
{ NULL , NULL }
@@
-140,7
+134,7
@@
static const struct drive_list_entry drive_blacklist [] = {
};
/**
};
/**
- * i
n_drive_list
- look for drive in black/white list
+ * i
de_in_drive_list
- look for drive in black/white list
* @id: drive identifier
* @drive_table: list to inspect
*
* @id: drive identifier
* @drive_table: list to inspect
*
@@
-148,7
+142,7
@@
static const struct drive_list_entry drive_blacklist [] = {
* Returns 1 if the drive is found in the table.
*/
* Returns 1 if the drive is found in the table.
*/
-
static int
in_drive_list(struct hd_driveid *id, const struct drive_list_entry *drive_table)
+
int ide_
in_drive_list(struct hd_driveid *id, const struct drive_list_entry *drive_table)
{
for ( ; drive_table->id_model ; drive_table++)
if ((!strcmp(drive_table->id_model, id->model)) &&
{
for ( ; drive_table->id_model ; drive_table++)
if ((!strcmp(drive_table->id_model, id->model)) &&
@@
-158,6
+152,8
@@
static int in_drive_list(struct hd_driveid *id, const struct drive_list_entry *d
return 0;
}
return 0;
}
+EXPORT_SYMBOL_GPL(ide_in_drive_list);
+
/**
* ide_dma_intr - IDE DMA interrupt handler
* @drive: the drive the interrupt is for
/**
* ide_dma_intr - IDE DMA interrupt handler
* @drive: the drive the interrupt is for
@@
-179,7
+175,7
@@
ide_startstop_t ide_dma_intr (ide_drive_t *drive)
if (rq->rq_disk) {
ide_driver_t *drv;
if (rq->rq_disk) {
ide_driver_t *drv;
- drv = *(ide_driver_t **)rq->rq_disk->private_data;
;
+ drv = *(ide_driver_t **)rq->rq_disk->private_data;
drv->end_request(drive, 1, rq->nr_sectors);
} else
ide_end_request(drive, 1, rq->nr_sectors);
drv->end_request(drive, 1, rq->nr_sectors);
} else
ide_end_request(drive, 1, rq->nr_sectors);
@@
-664,7
+660,7
@@
int __ide_dma_bad_drive (ide_drive_t *drive)
{
struct hd_driveid *id = drive->id;
{
struct hd_driveid *id = drive->id;
- int blacklist = in_drive_list(id, drive_blacklist);
+ int blacklist = i
de_i
n_drive_list(id, drive_blacklist);
if (blacklist) {
printk(KERN_WARNING "%s: Disabling (U)DMA for %s (blacklisted)\n",
drive->name, id->model);
if (blacklist) {
printk(KERN_WARNING "%s: Disabling (U)DMA for %s (blacklisted)\n",
drive->name, id->model);
@@
-678,7
+674,7
@@
EXPORT_SYMBOL(__ide_dma_bad_drive);
int __ide_dma_good_drive (ide_drive_t *drive)
{
struct hd_driveid *id = drive->id;
int __ide_dma_good_drive (ide_drive_t *drive)
{
struct hd_driveid *id = drive->id;
- return in_drive_list(id, drive_whitelist);
+ return i
de_i
n_drive_list(id, drive_whitelist);
}
EXPORT_SYMBOL(__ide_dma_good_drive);
}
EXPORT_SYMBOL(__ide_dma_good_drive);