On Wed, 3 Apr 2019 00:03:21 -0700 Andrey Smirnov <[email protected]> wrote:
> Replace combination of pr_err()/dev_name() with an equivalent call for > dev_err(). > > Signed-off-by: Andrey Smirnov <[email protected]> > Cc: Jonathan Cameron <[email protected]> > Cc: Hartmut Knaack <[email protected]> > Cc: Lars-Peter Clausen <[email protected]> > Cc: Peter Meerwald-Stadler <[email protected]> > Cc: Chris Healy <[email protected]> > Cc: [email protected] > Cc: [email protected] Applied, thanks, Jonathan > --- > drivers/iio/adc/imx7d_adc.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/iio/adc/imx7d_adc.c b/drivers/iio/adc/imx7d_adc.c > index 3bbd657409d5..72cfe9834bcb 100644 > --- a/drivers/iio/adc/imx7d_adc.c > +++ b/drivers/iio/adc/imx7d_adc.c > @@ -388,8 +388,9 @@ static irqreturn_t imx7d_adc_isr(int irq, void *dev_id) > * timeout flags. > */ > if (status & IMX7D_REG_ADC_INT_STATUS_CHANNEL_CONV_TIME_OUT) { > - pr_err("%s: ADC got conversion time out interrupt: 0x%08x\n", > - dev_name(info->dev), status); > + dev_err(info->dev, > + "ADC got conversion time out interrupt: 0x%08x\n", > + status); > status &= ~IMX7D_REG_ADC_INT_STATUS_CHANNEL_CONV_TIME_OUT; > writel(status, info->regs + IMX7D_REG_ADC_INT_STATUS); > }
