Commit fe027ff9 authored by Ondrej Zary's avatar Ondrej Zary Committed by Damien Le Moal

ata: pata_parport: move pata_parport.h to drivers/ata/pata_parport

Now that paride is gone, pata_parport.h does not need to be in
include/linux. Move it to drivers/ata/pata_parport.
Reviewed-by: default avatarSergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: default avatarOndrej Zary <linux@zary.sk>
Signed-off-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
parent 01985290
...@@ -16,8 +16,7 @@ ...@@ -16,8 +16,7 @@
#include <linux/wait.h> #include <linux/wait.h>
#include <linux/types.h> #include <linux/types.h>
#include <asm/io.h> #include <asm/io.h>
#include "pata_parport.h"
#include <linux/pata_parport.h>
#define j44(a,b) ((((a>>4)&0x0f)|(b&0xf0))^0x88) #define j44(a,b) ((((a>>4)&0x0f)|(b&0xf0))^0x88)
......
...@@ -14,8 +14,7 @@ ...@@ -14,8 +14,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <asm/io.h> #include <asm/io.h>
#include "pata_parport.h"
#include <linux/pata_parport.h>
#undef r2 #undef r2
#undef w2 #undef w2
......
...@@ -18,9 +18,8 @@ ...@@ -18,9 +18,8 @@
#include <linux/types.h> #include <linux/types.h>
#include <asm/io.h> #include <asm/io.h>
#include <linux/parport.h> #include <linux/parport.h>
#include "ppc6lnx.c" #include "ppc6lnx.c"
#include <linux/pata_parport.h> #include "pata_parport.h"
#define PPCSTRUCT(pi) ((Interface *)(pi->private)) #define PPCSTRUCT(pi) ((Interface *)(pi->private))
......
...@@ -15,8 +15,7 @@ ...@@ -15,8 +15,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <asm/io.h> #include <asm/io.h>
#include "pata_parport.h"
#include <linux/pata_parport.h>
/* mode codes: 0 nybble reads, 8-bit writes /* mode codes: 0 nybble reads, 8-bit writes
1 8-bit reads and writes 1 8-bit reads and writes
......
...@@ -14,8 +14,7 @@ ...@@ -14,8 +14,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <asm/io.h> #include <asm/io.h>
#include "pata_parport.h"
#include <linux/pata_parport.h>
/* mode codes: 0 nybble reads, 8-bit writes /* mode codes: 0 nybble reads, 8-bit writes
1 8-bit reads and writes 1 8-bit reads and writes
......
...@@ -16,8 +16,7 @@ ...@@ -16,8 +16,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <asm/io.h> #include <asm/io.h>
#include "pata_parport.h"
#include <linux/pata_parport.h>
#define j44(a,b) (((a>>4)&0x0f)+(b&0xf0)) #define j44(a,b) (((a>>4)&0x0f)+(b&0xf0))
#define j53(a,b) (((a>>3)&0x1f)+((b<<4)&0xe0)) #define j53(a,b) (((a>>3)&0x1f)+((b<<4)&0xe0))
......
...@@ -17,8 +17,7 @@ ...@@ -17,8 +17,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <asm/io.h> #include <asm/io.h>
#include "pata_parport.h"
#include <linux/pata_parport.h>
/* mode codes: 0 nybble reads on port 1, 8-bit writes /* mode codes: 0 nybble reads on port 1, 8-bit writes
1 5/3 reads on ports 1 & 2, 8-bit writes 1 5/3 reads on ports 1 & 2, 8-bit writes
......
...@@ -20,8 +20,7 @@ ...@@ -20,8 +20,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <asm/io.h> #include <asm/io.h>
#include "pata_parport.h"
#include <linux/pata_parport.h>
#define j44(a,b) (((a>>4)&0x0f)|(b&0xf0)) #define j44(a,b) (((a>>4)&0x0f)|(b&0xf0))
......
...@@ -24,8 +24,7 @@ ...@@ -24,8 +24,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <asm/io.h> #include <asm/io.h>
#include "pata_parport.h"
#include <linux/pata_parport.h>
#define j44(a,b) (((a>>3)&0x0f)|((b<<1)&0xf0)) #define j44(a,b) (((a>>3)&0x0f)|((b<<1)&0xf0))
......
...@@ -27,8 +27,7 @@ ...@@ -27,8 +27,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <asm/io.h> #include <asm/io.h>
#include "pata_parport.h"
#include <linux/pata_parport.h>
#define CMD(x) w2(4);w0(0xff);w0(0xff);w0(0x73);w0(0x73);\ #define CMD(x) w2(4);w0(0xff);w0(0xff);w0(0x73);w0(0x73);\
w0(0xc9);w0(0xc9);w0(0x26);w0(0x26);w0(x);w0(x); w0(0xc9);w0(0xc9);w0(0x26);w0(0x26);w0(x);w0(x);
......
...@@ -20,8 +20,7 @@ ...@@ -20,8 +20,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <asm/io.h> #include <asm/io.h>
#include "pata_parport.h"
#include <linux/pata_parport.h>
#define cec4 w2(0xc);w2(0xe);w2(0xe);w2(0xc);w2(4);w2(4);w2(4); #define cec4 w2(0xc);w2(0xe);w2(0xe);w2(0xc);w2(4);w2(4);w2(4);
#define j44(l,h) (((l>>4)&0x0f)|(h&0xf0)) #define j44(l,h) (((l>>4)&0x0f)|(h&0xf0))
......
...@@ -19,8 +19,7 @@ ...@@ -19,8 +19,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <asm/io.h> #include <asm/io.h>
#include "pata_parport.h"
#include <linux/pata_parport.h>
#define r12w() (delay_p,inw(pi->port+1)&0xffff) #define r12w() (delay_p,inw(pi->port+1)&0xffff)
......
...@@ -16,8 +16,7 @@ ...@@ -16,8 +16,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <asm/io.h> #include <asm/io.h>
#include "pata_parport.h"
#include <linux/pata_parport.h>
#define j44(a,b) (((a>>4)&0x0f)|(b&0xf0)) #define j44(a,b) (((a>>4)&0x0f)|(b&0xf0))
......
...@@ -13,8 +13,7 @@ ...@@ -13,8 +13,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <asm/io.h> #include <asm/io.h>
#include "pata_parport.h"
#include <linux/pata_parport.h>
#define op(f) w2(4);w0(f);w2(5);w2(0xd);w2(5);w2(0xd);w2(5);w2(4); #define op(f) w2(4);w0(f);w2(5);w2(0xd);w2(5);w2(0xd);w2(5);w2(4);
#define vl(v) w2(4);w0(v);w2(5);w2(7);w2(5);w2(4); #define vl(v) w2(4);w0(v);w2(5);w2(7);w2(5);w2(4);
......
...@@ -14,8 +14,7 @@ ...@@ -14,8 +14,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <asm/io.h> #include <asm/io.h>
#include "pata_parport.h"
#include <linux/pata_parport.h>
/* mode codes: 0 nybble reads, 8-bit writes /* mode codes: 0 nybble reads, 8-bit writes
1 8-bit reads and writes 1 8-bit reads and writes
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/parport.h> #include <linux/parport.h>
#include <linux/pata_parport.h> #include "pata_parport.h"
#define DRV_NAME "pata_parport" #define DRV_NAME "pata_parport"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment