github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-22 12:44:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

power sequencing updates for v7.3-rc1

Browse Source 
- rename pwrseq_power_on/off() to pwrseq_enable/disable() tree-wide
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEkeUTLeW1Rh17omX8BZ0uy/82hMMFAmqOn6AACgkQBZ0uy/82
 hMMikg/9Hmh3JJ8mx9o3BYTDRRJXsTcuvIGH7zdjYNqgt8wOrBjqqF3dMn8XMBUJ
 N/jAjXeUogToXN50htKgMDiVDvJHHnEOVVEu9/jXSBx96Oesq0TNfdBfhOgYx1a7
 H1dtstw0JHxHWmt8P+q0p0Bm6dS3dMS7/YBZA91ACodYS1imqMfxAk4Z5Wemv6uQ
 1yqjuJNLQ3/8YCXW3t3CT+BPbO6PHWSF+6lL9tuSvWMQU6roUdLS99bExJADNAa9
 kIHN/5c0kSAfqkp/LQCpTkA1upeaU3eZbYVBVOjmqhdTczKGAD5P8/LRMHFf4/oz
 sx7Yai8d62owP21GxZ7mDnmOLLKWBkTEVENFkOduvDqg2rLNR+Mi5qu0apinmvaA
 ZuhnuGRYhJ6YaT+cJMkIEchDdTEsbzFcN7l4T47HwJ2pdBQ2Mi3V5YuJO69wEPaY
 5eNa+CrMOw58OD0McYbWH26pKxbba93ihDZRyT/uuu+pijs/4iF3xBhC0D1zpK9p
 iV4bfnRHn5r5iePO/8aT270CX+0zy1mQc3gEduUbhs9oy6x3juvMd9huV0aprdhe
 iNWQYZhehfq2YVRcnSDfOH9FPgCk1ERnlGXNiEAAvwHzlcqNJg6xTbGQRiaexmEc
 H26qFD+WBMW/173aF/I93H2IIu7FdvRxmf1s0lsVKyaqeV73BkI=
 =6NL2
 -----END PGP SIGNATURE-----

Merge tag 'pwrseq-updates-for-v7.3-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux

Pull another power sequencing update from Bartosz Golaszewski:
 "A single tree-wide rename of two of the public functions to better
  reflect their actual semantics:

   - rename pwrseq_power_on/off() to pwrseq_enable/disable() tree-wide"

* tag 'pwrseq-updates-for-v7.3-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
  power: sequencing: rename pwrseq_power_on/off() to pwrseq_enable/disable()
This commit is contained in:
Linus Torvalds 2026-08-26 08:45:09 -07:00
commit a5218c6474
9 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/driver-api/pwrseq.rst
View File

@ -50,9 +50,9 @@ Consumer interface
The consumer API is aimed to be as simple as possible. The driver interested in
getting a descriptor from the power sequencer should call pwrseq_get() and
specify the name of the target it wants to reach in the sequence after calling
pwrseq_power_up(). The descriptor can be released by calling pwrseq_put() and
pwrseq_enable(). The descriptor can be released by calling pwrseq_put() and
the consumer can request the powering down of its target with
pwrseq_power_off(). Note that there is no guarantee that pwrseq_power_off()
pwrseq_disable(). Note that there is no guarantee that pwrseq_disable()
will have any effect as there may be multiple users of the underlying resources
who may keep them active.

2
drivers/bluetooth/btnxpuart.c
View File

@ -1872,7 +1872,7 @@ static int nxp_serdev_probe(struct serdev_device *serdev)
"failed to get pwrseq\n");
nxpdev->pwrseq = pwrseq;
err = pwrseq_power_on(pwrseq);
err = pwrseq_enable(pwrseq);
if (err)
goto err_pwrseq_put;
}

4
drivers/bluetooth/hci_qca.c
View File

@ -2259,7 +2259,7 @@ static void qca_power_off(struct hci_uart *hu)
}
if (power && power->pwrseq) {
pwrseq_power_off(power->pwrseq);
pwrseq_disable(power->pwrseq);
set_bit(QCA_BT_OFF, &qca->flags);
return;
}
@ -2319,7 +2319,7 @@ static int qca_regulator_enable(struct qca_serdev *qcadev)
int ret;
if (power->pwrseq)
return pwrseq_power_on(power->pwrseq);
return pwrseq_enable(power->pwrseq);
/* Already enabled */
if (power->vregs_on)

4
drivers/gpu/drm/imagination/pvr_power.c
View File

@ -352,12 +352,12 @@ static int pvr_power_init_pwrseq(struct pvr_device *pvr_dev)
static int pvr_power_on_sequence_pwrseq(struct pvr_device *pvr_dev)
{
return pwrseq_power_on(pvr_dev->pwrseq);
return pwrseq_enable(pvr_dev->pwrseq);
}
static int pvr_power_off_sequence_pwrseq(struct pvr_device *pvr_dev)
{
return pwrseq_power_off(pvr_dev->pwrseq);
return pwrseq_disable(pvr_dev->pwrseq);
}
const struct pvr_power_sequence_ops pvr_power_sequence_ops_pwrseq = {

6
drivers/net/wireless/ath/ath10k/snoc.c
View File

@ -1026,7 +1026,7 @@ static int ath10k_hw_power_on(struct ath10k *ar)
ath10k_dbg(ar, ATH10K_DBG_SNOC, "soc power on\n");
ret = pwrseq_power_on(ar_snoc->pwrseq);
ret = pwrseq_enable(ar_snoc->pwrseq);
if (ret)
return ret;
@ -1043,7 +1043,7 @@ static int ath10k_hw_power_on(struct ath10k *ar)
vreg_off:
regulator_bulk_disable(ar_snoc->num_vregs, ar_snoc->vregs);
pwrseq_off:
pwrseq_power_off(ar_snoc->pwrseq);
pwrseq_disable(ar_snoc->pwrseq);
return ret;
}
@ -1061,7 +1061,7 @@ static int ath10k_hw_power_off(struct ath10k *ar)
ret_vreg = regulator_bulk_disable(ar_snoc->num_vregs, ar_snoc->vregs);
if (ar_snoc->pwrseq)
ret_seq = pwrseq_power_off(ar_snoc->pwrseq);
ret_seq = pwrseq_disable(ar_snoc->pwrseq);
return ret_vreg ? : ret_seq;
}

4
drivers/pci/pwrctrl/generic.c
View File

@ -29,7 +29,7 @@ static int slot_pwrctrl_power_on(struct pci_pwrctrl *pwrctrl)
int ret;
if (slot->pwrseq) {
pwrseq_power_on(slot->pwrseq);
pwrseq_enable(slot->pwrseq);
return 0;
}
@ -48,7 +48,7 @@ static int slot_pwrctrl_power_off(struct pci_pwrctrl *pwrctrl)
struct slot_pwrctrl, pwrctrl);
if (slot->pwrseq) {
pwrseq_power_off(slot->pwrseq);
pwrseq_disable(slot->pwrseq);
return 0;
}

4
drivers/pci/pwrctrl/pci-pwrctrl-pwrseq.c
View File

@ -56,7 +56,7 @@ static int pwrseq_pwrctrl_power_on(struct pci_pwrctrl *pwrctrl)
struct pwrseq_pwrctrl *pwrseq = container_of(pwrctrl,
struct pwrseq_pwrctrl, pwrctrl);
return pwrseq_power_on(pwrseq->pwrseq);
return pwrseq_enable(pwrseq->pwrseq);
}
static int pwrseq_pwrctrl_power_off(struct pci_pwrctrl *pwrctrl)
@ -64,7 +64,7 @@ static int pwrseq_pwrctrl_power_off(struct pci_pwrctrl *pwrctrl)
struct pwrseq_pwrctrl *pwrseq = container_of(pwrctrl,
struct pwrseq_pwrctrl, pwrctrl);
return pwrseq_power_off(pwrseq->pwrseq);
return pwrseq_disable(pwrseq->pwrseq);
}
static int pwrseq_pwrctrl_probe(struct platform_device *pdev)

16
drivers/power/sequencing/core.c
View File

@ -708,7 +708,7 @@ void pwrseq_put(struct pwrseq_desc *desc)
pwrseq = desc->pwrseq;
if (desc->powered_on)
pwrseq_power_off(desc);
pwrseq_disable(desc);
kfree(desc);
module_put(pwrseq->owner);
@ -874,7 +874,7 @@ static int pwrseq_unit_disable(struct pwrseq_device *pwrseq,
}
/**
* pwrseq_power_on() - Issue a power-on request on behalf of the consumer
* pwrseq_enable() - Issue a power-on request on behalf of the consumer
* device.
* @desc: Descriptor referencing the power sequencer.
*
@ -887,7 +887,7 @@ static int pwrseq_unit_disable(struct pwrseq_device *pwrseq,
* Returns:
* 0 on success, negative error number on failure.
*/
int pwrseq_power_on(struct pwrseq_desc *desc)
int pwrseq_enable(struct pwrseq_desc *desc)
{
struct pwrseq_device *pwrseq;
struct pwrseq_target *target;
@ -925,14 +925,14 @@ int pwrseq_power_on(struct pwrseq_desc *desc)
return ret;
}
EXPORT_SYMBOL_GPL(pwrseq_power_on);
EXPORT_SYMBOL_GPL(pwrseq_enable);
/**
* pwrseq_power_off() - Issue a power-off request on behalf of the consumer
* pwrseq_disable() - Issue a power-off request on behalf of the consumer
* device.
* @desc: Descriptor referencing the power sequencer.
*
* This undoes the effects of pwrseq_power_on(). It issues a power-off request
* This undoes the effects of pwrseq_enable(). It issues a power-off request
* on behalf of the consumer and when the last remaining user does so, the
* power-down sequence will be started. If one is in progress, the function
* will block until it's complete and then return.
@ -940,7 +940,7 @@ EXPORT_SYMBOL_GPL(pwrseq_power_on);
* Returns:
* 0 on success, negative error number on failure.
*/
int pwrseq_power_off(struct pwrseq_desc *desc)
int pwrseq_disable(struct pwrseq_desc *desc)
{
struct pwrseq_device *pwrseq;
struct pwrseq_unit *unit;
@ -966,7 +966,7 @@ int pwrseq_power_off(struct pwrseq_desc *desc)
return ret;
}
EXPORT_SYMBOL_GPL(pwrseq_power_off);
EXPORT_SYMBOL_GPL(pwrseq_disable);
/**
* pwrseq_to_device() - Get the pwrseq device pointer from a descriptor.

8
include/linux/pwrseq/consumer.h
View File

@ -20,8 +20,8 @@ void pwrseq_put(struct pwrseq_desc *desc);
struct pwrseq_desc * __must_check
devm_pwrseq_get(struct device *dev, const char *target);
int pwrseq_power_on(struct pwrseq_desc *desc);
int pwrseq_power_off(struct pwrseq_desc *desc);
int pwrseq_enable(struct pwrseq_desc *desc);
int pwrseq_disable(struct pwrseq_desc *desc);
struct device *pwrseq_to_device(struct pwrseq_desc *desc);
@ -43,12 +43,12 @@ devm_pwrseq_get(struct device *dev, const char *target)
return ERR_PTR(-ENOSYS);
}
static inline int pwrseq_power_on(struct pwrseq_desc *desc)
static inline int pwrseq_enable(struct pwrseq_desc *desc)
{
return -ENOSYS;
}
static inline int pwrseq_power_off(struct pwrseq_desc *desc)
static inline int pwrseq_disable(struct pwrseq_desc *desc)
{
return -ENOSYS;
}