| Message ID | 20220825224519.369685-1-damien.lemoal@opensource.wdc.com |
|---|---|
| State | New |
| Headers | show |
| Series | ata: libata-core: Simplify ata_dev_set_xfermode() | expand |
On Fri, Aug 26, 2022 at 07:45:19AM +0900, Damien Le Moal wrote: > The err_mask variable is not useful. Remove it. > > Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com> > --- > drivers/ata/libata-core.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c > index 0b62fa14a74c..d0242c75aac5 100644 > --- a/drivers/ata/libata-core.c > +++ b/drivers/ata/libata-core.c > @@ -4295,7 +4295,6 @@ static void ata_dev_xfermask(struct ata_device *dev) > static unsigned int ata_dev_set_xfermode(struct ata_device *dev) > { > struct ata_taskfile tf; > - unsigned int err_mask; > > /* set up set-features taskfile */ > ata_dev_dbg(dev, "set features - xfer mode\n"); > @@ -4317,10 +4316,11 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev) > else /* In the ancient relic department - skip all of this */ > return 0; > > - /* On some disks, this command causes spin-up, so we need longer timeout */ > - err_mask = ata_exec_internal(dev, &tf, NULL, DMA_NONE, NULL, 0, 15000); > - > - return err_mask; > + /* > + * On some disks, this command causes spin-up, so we need longer > + * timeout. > + */ > + return ata_exec_internal(dev, &tf, NULL, DMA_NONE, NULL, 0, 15000); > } > > /** > -- > 2.37.2 > Reviewed-by: Niklas Cassel <niklas.cassel@wdc.com>
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 0b62fa14a74c..d0242c75aac5 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -4295,7 +4295,6 @@ static void ata_dev_xfermask(struct ata_device *dev) static unsigned int ata_dev_set_xfermode(struct ata_device *dev) { struct ata_taskfile tf; - unsigned int err_mask; /* set up set-features taskfile */ ata_dev_dbg(dev, "set features - xfer mode\n"); @@ -4317,10 +4316,11 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev) else /* In the ancient relic department - skip all of this */ return 0; - /* On some disks, this command causes spin-up, so we need longer timeout */ - err_mask = ata_exec_internal(dev, &tf, NULL, DMA_NONE, NULL, 0, 15000); - - return err_mask; + /* + * On some disks, this command causes spin-up, so we need longer + * timeout. + */ + return ata_exec_internal(dev, &tf, NULL, DMA_NONE, NULL, 0, 15000); } /**
The err_mask variable is not useful. Remove it. Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com> --- drivers/ata/libata-core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)