2008-01-28 22:11:42

by Adrian Bunk

Subject: [2.6 patch] ata_piix.c: make piix_merge_scr() static

piix_merge_scr() can become static.

Signed-off-by: Adrian Bunk <[email protected]>

---
f272ad2ac4274a59f0b43cfd65488c51855132d4
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index a65c8ae..1a5c3bf 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -1068,7 +1068,7 @@ static void piix_sidpr_write(struct ata_device *dev, unsigned int reg, u32 val)
iowrite32(val, hpriv->sidpr + PIIX_SIDPR_DATA);
}

-u32 piix_merge_scr(u32 val0, u32 val1, const int * const *merge_tbl)
+static u32 piix_merge_scr(u32 val0, u32 val1, const int * const *merge_tbl)
{
u32 val = 0;
int i, mi;

2008-01-28 23:03:10

by Tejun Heo

Subject: Re: [2.6 patch] ata_piix.c: make piix_merge_scr() static

Adrian Bunk wrote:
> piix_merge_scr() can become static.
>
> Signed-off-by: Adrian Bunk <[email protected]>
>
> ---
> f272ad2ac4274a59f0b43cfd65488c51855132d4
> diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
> index a65c8ae..1a5c3bf 100644
> --- a/drivers/ata/ata_piix.c
> +++ b/drivers/ata/ata_piix.c
> @@ -1068,7 +1068,7 @@ static void piix_sidpr_write(struct ata_device *dev, unsigned int reg, u32 val)
> iowrite32(val, hpriv->sidpr + PIIX_SIDPR_DATA);
> }
>
> -u32 piix_merge_scr(u32 val0, u32 val1, const int * const *merge_tbl)
> +static u32 piix_merge_scr(u32 val0, u32 val1, const int * const *merge_tbl)
> {
> u32 val = 0;
> int i, mi;

Ah.. right. Thanks. I somehow forgot static in front of it.

Acked-by: Tejun Heo <[email protected]>

--
tejun

2008-02-01 16:55:54

by Jeff Garzik

Subject: Re: [2.6 patch] ata_piix.c: make piix_merge_scr() static

Adrian Bunk wrote:
> piix_merge_scr() can become static.
>
> Signed-off-by: Adrian Bunk <[email protected]>

applied