| Message ID | 1408184238-1733-1-git-send-email-arjun024@gmail.com |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
Hello, On Sat, Aug 16, 2014 at 03:47:17PM +0530, Arjun Sreedharan wrote: > scc_bus_softreset not necessarily should return zero. > Propagate the error code. > Signed-off-by: Arjun Sreedharan <arjun024@gmail.com> > --- > drivers/ata/pata_scc.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c > index 4e006d7..5618c4518 100644 > --- a/drivers/ata/pata_scc.c > +++ b/drivers/ata/pata_scc.c > @@ -585,7 +585,7 @@ static int scc_wait_after_reset(struct ata_link *link, unsigned int devmask, > * Note: Original code is ata_bus_softreset(). > */ > > -static unsigned int scc_bus_softreset(struct ata_port *ap, unsigned int devmask, > +static int scc_bus_softreset(struct ata_port *ap, unsigned int devmask, > unsigned long deadline) > { > struct ata_ioports *ioaddr = &ap->ioaddr; > @@ -599,9 +599,7 @@ static unsigned int scc_bus_softreset(struct ata_port *ap, unsigned int devmask, scc_bus_softreset() should return int too, right? > udelay(20); > out_be32(ioaddr->ctl_addr, ap->ctl); > > - scc_wait_after_reset(&ap->link, devmask, deadline); > - > - return 0; > + return scc_wait_after_reset(&ap->link, devmask, deadline); > } > > /** > @@ -618,7 +616,8 @@ static int scc_softreset(struct ata_link *link, unsigned int *classes, > { > struct ata_port *ap = link->ap; > unsigned int slave_possible = ap->flags & ATA_FLAG_SLAVE_POSS; > - unsigned int devmask = 0, err_mask; > + unsigned int devmask = 0; > + int err_mask; @rc or @ret would be a better name for it. Thanks.
On 16 August 2014 17:07, Tejun Heo <tj@kernel.org> wrote: > Hello, > > On Sat, Aug 16, 2014 at 03:47:17PM +0530, Arjun Sreedharan wrote: >> scc_bus_softreset not necessarily should return zero. >> Propagate the error code. >> Signed-off-by: Arjun Sreedharan <arjun024@gmail.com> >> --- >> drivers/ata/pata_scc.c | 9 ++++----- >> 1 file changed, 4 insertions(+), 5 deletions(-) >> >> diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c >> index 4e006d7..5618c4518 100644 >> --- a/drivers/ata/pata_scc.c >> +++ b/drivers/ata/pata_scc.c >> @@ -585,7 +585,7 @@ static int scc_wait_after_reset(struct ata_link *link, unsigned int devmask, >> * Note: Original code is ata_bus_softreset(). >> */ >> >> -static unsigned int scc_bus_softreset(struct ata_port *ap, unsigned int devmask, >> +static int scc_bus_softreset(struct ata_port *ap, unsigned int devmask, >> unsigned long deadline) >> { >> struct ata_ioports *ioaddr = &ap->ioaddr; >> @@ -599,9 +599,7 @@ static unsigned int scc_bus_softreset(struct ata_port *ap, unsigned int devmask, > > scc_bus_softreset() should return int too, right? I have changed it from unsigned int to int for better clarity since scc_wait_after_reset() could return negative errnos. Any issues ?? > >> udelay(20); >> out_be32(ioaddr->ctl_addr, ap->ctl); >> >> - scc_wait_after_reset(&ap->link, devmask, deadline); >> - >> - return 0; >> + return scc_wait_after_reset(&ap->link, devmask, deadline); >> } >> >> /** >> @@ -618,7 +616,8 @@ static int scc_softreset(struct ata_link *link, unsigned int *classes, >> { >> struct ata_port *ap = link->ap; >> unsigned int slave_possible = ap->flags & ATA_FLAG_SLAVE_POSS; >> - unsigned int devmask = 0, err_mask; >> + unsigned int devmask = 0; >> + int err_mask; > > @rc or @ret would be a better name for it. rc would be better. yes. will do. > > Thanks. > > -- > tejun -- 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
On Sat, Aug 16, 2014 at 05:34:31PM +0530, Arjun Sreedharan wrote: > On 16 August 2014 17:07, Tejun Heo <tj@kernel.org> wrote: > > Hello, > > > > On Sat, Aug 16, 2014 at 03:47:17PM +0530, Arjun Sreedharan wrote: > >> scc_bus_softreset not necessarily should return zero. > >> Propagate the error code. > >> Signed-off-by: Arjun Sreedharan <arjun024@gmail.com> > >> --- > >> drivers/ata/pata_scc.c | 9 ++++----- > >> 1 file changed, 4 insertions(+), 5 deletions(-) > >> > >> diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c > >> index 4e006d7..5618c4518 100644 > >> --- a/drivers/ata/pata_scc.c > >> +++ b/drivers/ata/pata_scc.c > >> @@ -585,7 +585,7 @@ static int scc_wait_after_reset(struct ata_link *link, unsigned int devmask, > >> * Note: Original code is ata_bus_softreset(). > >> */ > >> > >> -static unsigned int scc_bus_softreset(struct ata_port *ap, unsigned int devmask, > >> +static int scc_bus_softreset(struct ata_port *ap, unsigned int devmask, > >> unsigned long deadline) > >> { > >> struct ata_ioports *ioaddr = &ap->ioaddr; > >> @@ -599,9 +599,7 @@ static unsigned int scc_bus_softreset(struct ata_port *ap, unsigned int devmask, > > > > scc_bus_softreset() should return int too, right? > > I have changed it from unsigned int to int for better clarity since > scc_wait_after_reset() could > return negative errnos. Any issues ?? Oh, I missed the previous chunk which changes it from uint to int. Sorry about that. Thanks.
On 16 August 2014 17:51, Tejun Heo <tj@kernel.org> wrote: > On Sat, Aug 16, 2014 at 05:34:31PM +0530, Arjun Sreedharan wrote: >> On 16 August 2014 17:07, Tejun Heo <tj@kernel.org> wrote: >> > Hello, >> > >> > On Sat, Aug 16, 2014 at 03:47:17PM +0530, Arjun Sreedharan wrote: >> >> scc_bus_softreset not necessarily should return zero. >> >> Propagate the error code. >> >> Signed-off-by: Arjun Sreedharan <arjun024@gmail.com> >> >> --- >> >> drivers/ata/pata_scc.c | 9 ++++----- >> >> 1 file changed, 4 insertions(+), 5 deletions(-) >> >> >> >> diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c >> >> index 4e006d7..5618c4518 100644 >> >> --- a/drivers/ata/pata_scc.c >> >> +++ b/drivers/ata/pata_scc.c >> >> @@ -585,7 +585,7 @@ static int scc_wait_after_reset(struct ata_link *link, unsigned int devmask, >> >> * Note: Original code is ata_bus_softreset(). >> >> */ >> >> >> >> -static unsigned int scc_bus_softreset(struct ata_port *ap, unsigned int devmask, >> >> +static int scc_bus_softreset(struct ata_port *ap, unsigned int devmask, >> >> unsigned long deadline) >> >> { >> >> struct ata_ioports *ioaddr = &ap->ioaddr; >> >> @@ -599,9 +599,7 @@ static unsigned int scc_bus_softreset(struct ata_port *ap, unsigned int devmask, >> > >> > scc_bus_softreset() should return int too, right? >> >> I have changed it from unsigned int to int for better clarity since >> scc_wait_after_reset() could >> return negative errnos. Any issues ?? > > Oh, I missed the previous chunk which changes it from uint to int. > Sorry about that. OK. i will resend the patch. > > Thanks. > > -- > tejun -- 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
diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c index 4e006d7..5618c4518 100644 --- a/drivers/ata/pata_scc.c +++ b/drivers/ata/pata_scc.c @@ -585,7 +585,7 @@ static int scc_wait_after_reset(struct ata_link *link, unsigned int devmask, * Note: Original code is ata_bus_softreset(). */ -static unsigned int scc_bus_softreset(struct ata_port *ap, unsigned int devmask, +static int scc_bus_softreset(struct ata_port *ap, unsigned int devmask, unsigned long deadline) { struct ata_ioports *ioaddr = &ap->ioaddr; @@ -599,9 +599,7 @@ static unsigned int scc_bus_softreset(struct ata_port *ap, unsigned int devmask, udelay(20); out_be32(ioaddr->ctl_addr, ap->ctl); - scc_wait_after_reset(&ap->link, devmask, deadline); - - return 0; + return scc_wait_after_reset(&ap->link, devmask, deadline); } /** @@ -618,7 +616,8 @@ static int scc_softreset(struct ata_link *link, unsigned int *classes, { struct ata_port *ap = link->ap; unsigned int slave_possible = ap->flags & ATA_FLAG_SLAVE_POSS; - unsigned int devmask = 0, err_mask; + unsigned int devmask = 0; + int err_mask; u8 err; DPRINTK("ENTER\n");
scc_bus_softreset not necessarily should return zero. Propagate the error code. Signed-off-by: Arjun Sreedharan <arjun024@gmail.com> --- drivers/ata/pata_scc.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)