diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 07:46:23 -0400 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 07:46:23 -0400 |
| commit | f94116aeec7a299640dd692128e1d22178affa8d (patch) | |
| tree | e73b4ec980f50d3f4aaaa50f58bfc9607507e037 /drivers | |
| parent | 09a3e79187c56842d509430267ece5b82216baee (diff) | |
ide: cleanup <asm-m68k/ide.h>
* Remove superfluous <asm/macints.h> include.
* No need to re-define in/out*() macros as they are no longer used
by m68k host drivers.
* readl() and writel() are not used by core IDE code.
* Use raw_*_swapw() directly in {falcon,q40}ide.c and remove
{in,out}sw_swapw() macros.
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Michael Schmitz <schmitz@debian.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ide/falconide.c | 4 | ||||
| -rw-r--r-- | drivers/ide/q40ide.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/falconide.c b/drivers/ide/falconide.c index 27a569520743..bb0c86e976e4 100644 --- a/drivers/ide/falconide.c +++ b/drivers/ide/falconide.c | |||
| @@ -70,7 +70,7 @@ static void falconide_input_data(ide_drive_t *drive, struct request *rq, | |||
| 70 | if (drive->media == ide_disk && rq && rq->cmd_type == REQ_TYPE_FS) | 70 | if (drive->media == ide_disk && rq && rq->cmd_type == REQ_TYPE_FS) |
| 71 | return insw(data_addr, buf, (len + 1) / 2); | 71 | return insw(data_addr, buf, (len + 1) / 2); |
| 72 | 72 | ||
| 73 | insw_swapw(data_addr, buf, (len + 1) / 2); | 73 | raw_insw_swapw((u16 *)data_addr, buf, (len + 1) / 2); |
| 74 | } | 74 | } |
| 75 | 75 | ||
| 76 | static void falconide_output_data(ide_drive_t *drive, struct request *rq, | 76 | static void falconide_output_data(ide_drive_t *drive, struct request *rq, |
| @@ -81,7 +81,7 @@ static void falconide_output_data(ide_drive_t *drive, struct request *rq, | |||
| 81 | if (drive->media == ide_disk && rq && rq->cmd_type == REQ_TYPE_FS) | 81 | if (drive->media == ide_disk && rq && rq->cmd_type == REQ_TYPE_FS) |
| 82 | return outsw(data_addr, buf, (len + 1) / 2); | 82 | return outsw(data_addr, buf, (len + 1) / 2); |
| 83 | 83 | ||
| 84 | outsw_swapw(data_addr, buf, (len + 1) / 2); | 84 | raw_outsw_swapw((u16 *)data_addr, buf, (len + 1) / 2); |
| 85 | } | 85 | } |
| 86 | 86 | ||
| 87 | /* Atari has a byte-swapped IDE interface */ | 87 | /* Atari has a byte-swapped IDE interface */ |
diff --git a/drivers/ide/q40ide.c b/drivers/ide/q40ide.c index fa8922ef3c65..ebd576df2d84 100644 --- a/drivers/ide/q40ide.c +++ b/drivers/ide/q40ide.c | |||
| @@ -80,7 +80,7 @@ static void q40ide_input_data(ide_drive_t *drive, struct request *rq, | |||
| 80 | if (drive->media == ide_disk && rq && rq->cmd_type == REQ_TYPE_FS) | 80 | if (drive->media == ide_disk && rq && rq->cmd_type == REQ_TYPE_FS) |
| 81 | return insw(data_addr, buf, (len + 1) / 2); | 81 | return insw(data_addr, buf, (len + 1) / 2); |
| 82 | 82 | ||
| 83 | insw_swapw(data_addr, buf, (len + 1) / 2); | 83 | raw_insw_swapw((u16 *)data_addr, buf, (len + 1) / 2); |
| 84 | } | 84 | } |
| 85 | 85 | ||
| 86 | static void q40ide_output_data(ide_drive_t *drive, struct request *rq, | 86 | static void q40ide_output_data(ide_drive_t *drive, struct request *rq, |
| @@ -91,7 +91,7 @@ static void q40ide_output_data(ide_drive_t *drive, struct request *rq, | |||
| 91 | if (drive->media == ide_disk && rq && rq->cmd_type == REQ_TYPE_FS) | 91 | if (drive->media == ide_disk && rq && rq->cmd_type == REQ_TYPE_FS) |
| 92 | return outsw(data_addr, buf, (len + 1) / 2); | 92 | return outsw(data_addr, buf, (len + 1) / 2); |
| 93 | 93 | ||
| 94 | outsw_swapw(data_addr, buf, (len + 1) / 2); | 94 | raw_outsw_swapw((u16 *)data_addr, buf, (len + 1) / 2); |
| 95 | } | 95 | } |
| 96 | 96 | ||
| 97 | /* Q40 has a byte-swapped IDE interface */ | 97 | /* Q40 has a byte-swapped IDE interface */ |