lkml.org 
[lkml]   [2023]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 18/18] pata_parport: move pata_parport.h to drivers/ata/pata_parport
    Date
    Now that paride is gone, pata_parport.h does not need to be in
    include/linux. Move it to drivers/ata/pata_parport.

    Signed-off-by: Ondrej Zary <linux@zary.sk>
    ---
    drivers/ata/pata_parport/aten.c | 3 +--
    drivers/ata/pata_parport/bpck.c | 3 +--
    drivers/ata/pata_parport/bpck6.c | 3 +--
    drivers/ata/pata_parport/comm.c | 3 +--
    drivers/ata/pata_parport/dstr.c | 3 +--
    drivers/ata/pata_parport/epat.c | 3 +--
    drivers/ata/pata_parport/epia.c | 3 +--
    drivers/ata/pata_parport/fit2.c | 3 +--
    drivers/ata/pata_parport/fit3.c | 3 +--
    drivers/ata/pata_parport/friq.c | 3 +--
    drivers/ata/pata_parport/frpw.c | 3 +--
    drivers/ata/pata_parport/kbic.c | 3 +--
    drivers/ata/pata_parport/ktti.c | 3 +--
    drivers/ata/pata_parport/on20.c | 3 +--
    drivers/ata/pata_parport/on26.c | 3 +--
    drivers/ata/pata_parport/pata_parport.c | 2 +-
    {include/linux => drivers/ata/pata_parport}/pata_parport.h | 0
    17 files changed, 16 insertions(+), 31 deletions(-)
    rename {include/linux => drivers/ata/pata_parport}/pata_parport.h (100%)

    diff --git a/drivers/ata/pata_parport/aten.c b/drivers/ata/pata_parport/aten.c
    index f0d63b8513e0..1bd248c42f8b 100644
    --- a/drivers/ata/pata_parport/aten.c
    +++ b/drivers/ata/pata_parport/aten.c
    @@ -16,8 +16,7 @@
    #include <linux/wait.h>
    #include <linux/types.h>
    #include <asm/io.h>
    -
    -#include <linux/pata_parport.h>
    +#include "pata_parport.h"

    #define j44(a,b) ((((a>>4)&0x0f)|(b&0xf0))^0x88)

    diff --git a/drivers/ata/pata_parport/bpck.c b/drivers/ata/pata_parport/bpck.c
    index 472029a21d59..1c5035a09554 100644
    --- a/drivers/ata/pata_parport/bpck.c
    +++ b/drivers/ata/pata_parport/bpck.c
    @@ -14,8 +14,7 @@
    #include <linux/types.h>
    #include <linux/wait.h>
    #include <asm/io.h>
    -
    -#include <linux/pata_parport.h>
    +#include "pata_parport.h"

    #undef r2
    #undef w2
    diff --git a/drivers/ata/pata_parport/bpck6.c b/drivers/ata/pata_parport/bpck6.c
    index 683a11131acd..964bc688e280 100644
    --- a/drivers/ata/pata_parport/bpck6.c
    +++ b/drivers/ata/pata_parport/bpck6.c
    @@ -18,9 +18,8 @@
    #include <linux/types.h>
    #include <asm/io.h>
    #include <linux/parport.h>
    -
    #include "ppc6lnx.c"
    -#include <linux/pata_parport.h>
    +#include "pata_parport.h"

    #define PPCSTRUCT(pi) ((Interface *)(pi->private))

    diff --git a/drivers/ata/pata_parport/comm.c b/drivers/ata/pata_parport/comm.c
    index 0483caa80544..4c2f9ad60ad8 100644
    --- a/drivers/ata/pata_parport/comm.c
    +++ b/drivers/ata/pata_parport/comm.c
    @@ -15,8 +15,7 @@
    #include <linux/types.h>
    #include <linux/wait.h>
    #include <asm/io.h>
    -
    -#include <linux/pata_parport.h>
    +#include "pata_parport.h"

    /* mode codes: 0 nybble reads, 8-bit writes
    1 8-bit reads and writes
    diff --git a/drivers/ata/pata_parport/dstr.c b/drivers/ata/pata_parport/dstr.c
    index c5af7a5fa636..2524684be206 100644
    --- a/drivers/ata/pata_parport/dstr.c
    +++ b/drivers/ata/pata_parport/dstr.c
    @@ -14,8 +14,7 @@
    #include <linux/types.h>
    #include <linux/wait.h>
    #include <asm/io.h>
    -
    -#include <linux/pata_parport.h>
    +#include "pata_parport.h"

    /* mode codes: 0 nybble reads, 8-bit writes
    1 8-bit reads and writes
    diff --git a/drivers/ata/pata_parport/epat.c b/drivers/ata/pata_parport/epat.c
    index b7085a448301..0e4369dbe48e 100644
    --- a/drivers/ata/pata_parport/epat.c
    +++ b/drivers/ata/pata_parport/epat.c
    @@ -16,8 +16,7 @@
    #include <linux/types.h>
    #include <linux/wait.h>
    #include <asm/io.h>
    -
    -#include <linux/pata_parport.h>
    +#include "pata_parport.h"

    #define j44(a,b) (((a>>4)&0x0f)+(b&0xf0))
    #define j53(a,b) (((a>>3)&0x1f)+((b<<4)&0xe0))
    diff --git a/drivers/ata/pata_parport/epia.c b/drivers/ata/pata_parport/epia.c
    index 63e74c1facba..7821e363b143 100644
    --- a/drivers/ata/pata_parport/epia.c
    +++ b/drivers/ata/pata_parport/epia.c
    @@ -17,8 +17,7 @@
    #include <linux/types.h>
    #include <linux/wait.h>
    #include <asm/io.h>
    -
    -#include <linux/pata_parport.h>
    +#include "pata_parport.h"

    /* mode codes: 0 nybble reads on port 1, 8-bit writes
    1 5/3 reads on ports 1 & 2, 8-bit writes
    diff --git a/drivers/ata/pata_parport/fit2.c b/drivers/ata/pata_parport/fit2.c
    index 3536d8c07955..fd3b2ce426a5 100644
    --- a/drivers/ata/pata_parport/fit2.c
    +++ b/drivers/ata/pata_parport/fit2.c
    @@ -20,8 +20,7 @@
    #include <linux/types.h>
    #include <linux/wait.h>
    #include <asm/io.h>
    -
    -#include <linux/pata_parport.h>
    +#include "pata_parport.h"

    #define j44(a,b) (((a>>4)&0x0f)|(b&0xf0))

    diff --git a/drivers/ata/pata_parport/fit3.c b/drivers/ata/pata_parport/fit3.c
    index 9f5320c750e2..75df656ac472 100644
    --- a/drivers/ata/pata_parport/fit3.c
    +++ b/drivers/ata/pata_parport/fit3.c
    @@ -24,8 +24,7 @@
    #include <linux/types.h>
    #include <linux/wait.h>
    #include <asm/io.h>
    -
    -#include <linux/pata_parport.h>
    +#include "pata_parport.h"

    #define j44(a,b) (((a>>3)&0x0f)|((b<<1)&0xf0))

    diff --git a/drivers/ata/pata_parport/friq.c b/drivers/ata/pata_parport/friq.c
    index ce605f665ab1..b48bfabd1759 100644
    --- a/drivers/ata/pata_parport/friq.c
    +++ b/drivers/ata/pata_parport/friq.c
    @@ -27,8 +27,7 @@
    #include <linux/types.h>
    #include <linux/wait.h>
    #include <asm/io.h>
    -
    -#include <linux/pata_parport.h>
    +#include "pata_parport.h"

    #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);
    diff --git a/drivers/ata/pata_parport/frpw.c b/drivers/ata/pata_parport/frpw.c
    index 257ad13dec09..5d4bba371b8e 100644
    --- a/drivers/ata/pata_parport/frpw.c
    +++ b/drivers/ata/pata_parport/frpw.c
    @@ -20,8 +20,7 @@
    #include <linux/types.h>
    #include <linux/wait.h>
    #include <asm/io.h>
    -
    -#include <linux/pata_parport.h>
    +#include "pata_parport.h"

    #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))
    diff --git a/drivers/ata/pata_parport/kbic.c b/drivers/ata/pata_parport/kbic.c
    index 29f4f1e14d21..8213e62f8f00 100644
    --- a/drivers/ata/pata_parport/kbic.c
    +++ b/drivers/ata/pata_parport/kbic.c
    @@ -19,8 +19,7 @@
    #include <linux/types.h>
    #include <linux/wait.h>
    #include <asm/io.h>
    -
    -#include <linux/pata_parport.h>
    +#include "pata_parport.h"

    #define r12w() (delay_p,inw(pi->port+1)&0xffff)

    diff --git a/drivers/ata/pata_parport/ktti.c b/drivers/ata/pata_parport/ktti.c
    index 742051f6ea10..4890b1f12348 100644
    --- a/drivers/ata/pata_parport/ktti.c
    +++ b/drivers/ata/pata_parport/ktti.c
    @@ -16,8 +16,7 @@
    #include <linux/types.h>
    #include <linux/wait.h>
    #include <asm/io.h>
    -
    -#include <linux/pata_parport.h>
    +#include "pata_parport.h"

    #define j44(a,b) (((a>>4)&0x0f)|(b&0xf0))

    diff --git a/drivers/ata/pata_parport/on20.c b/drivers/ata/pata_parport/on20.c
    index 6956b91efb47..276ace12d490 100644
    --- a/drivers/ata/pata_parport/on20.c
    +++ b/drivers/ata/pata_parport/on20.c
    @@ -13,8 +13,7 @@
    #include <linux/types.h>
    #include <linux/wait.h>
    #include <asm/io.h>
    -
    -#include <linux/pata_parport.h>
    +#include "pata_parport.h"

    #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);
    diff --git a/drivers/ata/pata_parport/on26.c b/drivers/ata/pata_parport/on26.c
    index 1d90eb9b541e..dc47a54b121f 100644
    --- a/drivers/ata/pata_parport/on26.c
    +++ b/drivers/ata/pata_parport/on26.c
    @@ -14,8 +14,7 @@
    #include <linux/types.h>
    #include <linux/wait.h>
    #include <asm/io.h>
    -
    -#include <linux/pata_parport.h>
    +#include "pata_parport.h"

    /* mode codes: 0 nybble reads, 8-bit writes
    1 8-bit reads and writes
    diff --git a/drivers/ata/pata_parport/pata_parport.c b/drivers/ata/pata_parport/pata_parport.c
    index 77a3e5a3f062..a1dc639665dc 100644
    --- a/drivers/ata/pata_parport/pata_parport.c
    +++ b/drivers/ata/pata_parport/pata_parport.c
    @@ -6,7 +6,7 @@
    #include <linux/kernel.h>
    #include <linux/module.h>
    #include <linux/parport.h>
    -#include <linux/pata_parport.h>
    +#include "pata_parport.h"

    #define DRV_NAME "pata_parport"

    diff --git a/include/linux/pata_parport.h b/drivers/ata/pata_parport/pata_parport.h
    similarity index 100%
    rename from include/linux/pata_parport.h
    rename to drivers/ata/pata_parport/pata_parport.h
    --
    Ondrej Zary
    \
     
     \ /
      Last update: 2023-03-27 00:23    [W:3.296 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site