Patchwork [v4,1/2] ata: pata_at91.c bugfix for initial_timing initialisation

login
register
mail settings
Submitter Igor Plyatov
Date March 28, 2011, 12:56 p.m.
Message ID <1301316975-27761-1-git-send-email-plyatov@gmail.com>
Download mbox | patch
Permalink /patch/88598/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

Igor Plyatov - March 28, 2011, 12:56 p.m.
The "struct ata_timing" must contain 10 members, but ".dmack_hold" member was
forgotten for "initial_timing" initialisation. This patch fixes such a problem.

Signed-off-by: Igor Plyatov <plyatov@gmail.com>
---
 drivers/ata/pata_at91.c |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)
Sergei Shtylyov - March 28, 2011, 4:14 p.m.
Hello.

Igor Plyatov wrote:

> The "struct ata_timing" must contain 10 members, but ".dmack_hold" member was
> forgotten for "initial_timing" initialisation. This patch fixes such a problem.

> Signed-off-by: Igor Plyatov <plyatov@gmail.com>
> ---
>  drivers/ata/pata_at91.c |   14 ++++++++++++--
>  1 files changed, 12 insertions(+), 2 deletions(-)

> diff --git a/drivers/ata/pata_at91.c b/drivers/ata/pata_at91.c
> index 0da0dcc..0267d54 100644
> --- a/drivers/ata/pata_at91.c
> +++ b/drivers/ata/pata_at91.c
> @@ -49,8 +49,18 @@ struct at91_ide_info {
>  	void __iomem *alt_addr;
>  };
>  
> -static const struct ata_timing initial_timing =
> -	{XFER_PIO_0, 70, 290, 240, 600, 165, 150, 600, 0};
> +static const struct ata_timing initial_timing = {
> +	.mode		= XFER_PIO_0,
> +	.setup		= 70,
> +	.act8b		= 290,
> +	.rec8b		= 240,
> +	.cyc8b		= 600,
> +	.active		= 165,
> +	.recover	= 150,
> +	.dmack_hold	= 0,
> +	.cycle		= 600,
> +	.udma		= 0
> +};

   There's no need to explicitly initialize to 0.

MBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Igor Plyatov - March 28, 2011, 4:31 p.m.
Hello Sergei!

> Hello.
> 
> Igor Plyatov wrote:
> 
> > The "struct ata_timing" must contain 10 members, but ".dmack_hold" member was
> > forgotten for "initial_timing" initialisation. This patch fixes such a problem.
> 
> > Signed-off-by: Igor Plyatov <plyatov@gmail.com>
> > ---
> >  drivers/ata/pata_at91.c |   14 ++++++++++++--
> >  1 files changed, 12 insertions(+), 2 deletions(-)
> 
> > diff --git a/drivers/ata/pata_at91.c b/drivers/ata/pata_at91.c
> > index 0da0dcc..0267d54 100644
> > --- a/drivers/ata/pata_at91.c
> > +++ b/drivers/ata/pata_at91.c
> > @@ -49,8 +49,18 @@ struct at91_ide_info {
> >  	void __iomem *alt_addr;
> >  };
> >  
> > -static const struct ata_timing initial_timing =
> > -	{XFER_PIO_0, 70, 290, 240, 600, 165, 150, 600, 0};
> > +static const struct ata_timing initial_timing = {
> > +	.mode		= XFER_PIO_0,
> > +	.setup		= 70,
> > +	.act8b		= 290,
> > +	.rec8b		= 240,
> > +	.cyc8b		= 600,
> > +	.active		= 165,
> > +	.recover	= 150,
> > +	.dmack_hold	= 0,
> > +	.cycle		= 600,
> > +	.udma		= 0
> > +};
> 
>    There's no need to explicitly initialize to 0.
> 
> MBR, Sergei

It's much better to explicitly initialise, then use old wrong code,
where .dmack_hold member was equal to 600.

Best regards!
--
Igor Plyatov


--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/ata/pata_at91.c b/drivers/ata/pata_at91.c
index 0da0dcc..0267d54 100644
--- a/drivers/ata/pata_at91.c
+++ b/drivers/ata/pata_at91.c
@@ -49,8 +49,18 @@  struct at91_ide_info {
 	void __iomem *alt_addr;
 };
 
-static const struct ata_timing initial_timing =
-	{XFER_PIO_0, 70, 290, 240, 600, 165, 150, 600, 0};
+static const struct ata_timing initial_timing = {
+	.mode		= XFER_PIO_0,
+	.setup		= 70,
+	.act8b		= 290,
+	.rec8b		= 240,
+	.cyc8b		= 600,
+	.active		= 165,
+	.recover	= 150,
+	.dmack_hold	= 0,
+	.cycle		= 600,
+	.udma		= 0
+};
 
 static unsigned long calc_mck_cycles(unsigned long ns, unsigned long mck_hz)
 {