| Message ID | c3045427-da42-4f7c-8a96-3c4756646cd0@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | eeprom: at24: Use pm_runtime_resume_and_get to simplify the code | expand |
On Wed, Dec 20, 2023 at 4:11 PM Heiner Kallweit <hkallweit1@gmail.com> wrote: > > Use helper pm_runtime_resume_and_get() to simplify the code. > > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> > --- This looks good, but I had already sent out my PR to Wolfram when you sent it, so I'll queue it for v6.9. Bart
On 05.01.2024 10:22, Bartosz Golaszewski wrote: > On Wed, Dec 20, 2023 at 4:11 PM Heiner Kallweit <hkallweit1@gmail.com> wrote: >> >> Use helper pm_runtime_resume_and_get() to simplify the code. >> >> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> >> --- > > This looks good, but I had already sent out my PR to Wolfram when you > sent it, so I'll queue it for v6.9. > I just received an automated note from Greg that he applied this patch via the char-misc tree. The same applies to "eeprom: at24: Probe for DDR3 thermal sensor in the SPD case" > Bart Heiner
On Fri, Jan 5, 2024 at 10:32 AM Heiner Kallweit <hkallweit1@gmail.com> wrote: > > On 05.01.2024 10:22, Bartosz Golaszewski wrote: > > On Wed, Dec 20, 2023 at 4:11 PM Heiner Kallweit <hkallweit1@gmail.com> wrote: > >> > >> Use helper pm_runtime_resume_and_get() to simplify the code. > >> > >> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> > >> --- > > > > This looks good, but I had already sent out my PR to Wolfram when you > > sent it, so I'll queue it for v6.9. > > > I just received an automated note from Greg that he applied this patch > via the char-misc tree. The same applies to "eeprom: at24: Probe for > DDR3 thermal sensor in the SPD case" > > > Bart > Heiner > Huh? Greg, I typically pick up patches for at24 and send them through the I2C tree (as per the MAINTAINERS file). Bart
On Fri, Jan 05, 2024 at 10:35:18AM +0100, Bartosz Golaszewski wrote: > On Fri, Jan 5, 2024 at 10:32 AM Heiner Kallweit <hkallweit1@gmail.com> wrote: > > > > On 05.01.2024 10:22, Bartosz Golaszewski wrote: > > > On Wed, Dec 20, 2023 at 4:11 PM Heiner Kallweit <hkallweit1@gmail.com> wrote: > > >> > > >> Use helper pm_runtime_resume_and_get() to simplify the code. > > >> > > >> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> > > >> --- > > > > > > This looks good, but I had already sent out my PR to Wolfram when you > > > sent it, so I'll queue it for v6.9. > > > > > I just received an automated note from Greg that he applied this patch > > via the char-misc tree. The same applies to "eeprom: at24: Probe for > > DDR3 thermal sensor in the SPD case" > > > > > Bart > > Heiner > > > > Huh? Greg, I typically pick up patches for at24 and send them through > the I2C tree (as per the MAINTAINERS file). Sorry about that, I caught this in my sweep of patches sent to me. As you wanted it applied anyway, all should be good, git can handle the merge just fine. thanks, greg k-h
diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c index 5712bf1c3..070673368 100644 --- a/drivers/misc/eeprom/at24.c +++ b/drivers/misc/eeprom/at24.c @@ -440,12 +440,9 @@ static int at24_read(void *priv, unsigned int off, void *val, size_t count) if (off + count > at24->byte_len) return -EINVAL; - ret = pm_runtime_get_sync(dev); - if (ret < 0) { - pm_runtime_put_noidle(dev); + ret = pm_runtime_resume_and_get(dev); + if (ret) return ret; - } - /* * Read data from chip, protecting against concurrent updates * from this host, but not from other I2C masters. @@ -487,12 +484,9 @@ static int at24_write(void *priv, unsigned int off, void *val, size_t count) if (off + count > at24->byte_len) return -EINVAL; - ret = pm_runtime_get_sync(dev); - if (ret < 0) { - pm_runtime_put_noidle(dev); + ret = pm_runtime_resume_and_get(dev); + if (ret) return ret; - } - /* * Write data to chip, protecting against concurrent updates * from this host, but not from other I2C masters.
Use helper pm_runtime_resume_and_get() to simplify the code. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> --- drivers/misc/eeprom/at24.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)