* [PATCH v2 2/3] media: intel/ipu6: Remove ipu6_buttress_ctrl started field
2025-03-13 10:17 [PATCH v2 0/3] media: intel/ipu6: minor cleanups Stanislaw Gruszka
2025-03-13 10:17 ` [PATCH v2 1/3] media: intel/ipu6: Remove unused IPU6_BUS_NAME Stanislaw Gruszka
@ 2025-03-13 10:17 ` Stanislaw Gruszka
2025-03-13 10:17 ` [PATCH v2 3/3] media: intel/ipu6: Constify ipu6_buttress_ctrl structure Stanislaw Gruszka
2 siblings, 0 replies; 4+ messages in thread
From: Stanislaw Gruszka @ 2025-03-13 10:17 UTC (permalink / raw)
To: linux-media; +Cc: Sakari Ailus, Bingbu Cao, Hans de Goede
We assign to ->started field but newer read back, the field can be removed.
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
---
drivers/media/pci/intel/ipu6/ipu6-buttress.c | 2 --
drivers/media/pci/intel/ipu6/ipu6-buttress.h | 1 -
2 files changed, 3 deletions(-)
diff --git a/drivers/media/pci/intel/ipu6/ipu6-buttress.c b/drivers/media/pci/intel/ipu6/ipu6-buttress.c
index d8db5aa5d528..787fcbd1df09 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-buttress.c
+++ b/drivers/media/pci/intel/ipu6/ipu6-buttress.c
@@ -478,8 +478,6 @@ int ipu6_buttress_power(struct device *dev, struct ipu6_buttress_ctrl *ctrl,
dev_err(&isp->pdev->dev,
"Change power status timeout with 0x%x\n", val);
- ctrl->started = !ret && on;
-
mutex_unlock(&isp->buttress.power_mutex);
return ret;
diff --git a/drivers/media/pci/intel/ipu6/ipu6-buttress.h b/drivers/media/pci/intel/ipu6/ipu6-buttress.h
index 482978c2a09d..4b9763acdfdd 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-buttress.h
+++ b/drivers/media/pci/intel/ipu6/ipu6-buttress.h
@@ -26,7 +26,6 @@ struct ipu6_buttress_ctrl {
u32 freq_ctl, pwr_sts_shift, pwr_sts_mask, pwr_sts_on, pwr_sts_off;
unsigned int ratio;
unsigned int qos_floor;
- bool started;
};
struct ipu6_buttress_ipc {
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH v2 3/3] media: intel/ipu6: Constify ipu6_buttress_ctrl structure
2025-03-13 10:17 [PATCH v2 0/3] media: intel/ipu6: minor cleanups Stanislaw Gruszka
2025-03-13 10:17 ` [PATCH v2 1/3] media: intel/ipu6: Remove unused IPU6_BUS_NAME Stanislaw Gruszka
2025-03-13 10:17 ` [PATCH v2 2/3] media: intel/ipu6: Remove ipu6_buttress_ctrl started field Stanislaw Gruszka
@ 2025-03-13 10:17 ` Stanislaw Gruszka
2 siblings, 0 replies; 4+ messages in thread
From: Stanislaw Gruszka @ 2025-03-13 10:17 UTC (permalink / raw)
To: linux-media; +Cc: Sakari Ailus, Bingbu Cao, Hans de Goede
Make ipu6_buttress_ctrl constant since it is not modified any longer.
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
---
drivers/media/pci/intel/ipu6/ipu6-bus.c | 2 +-
drivers/media/pci/intel/ipu6/ipu6-bus.h | 4 ++--
drivers/media/pci/intel/ipu6/ipu6-buttress.c | 4 ++--
drivers/media/pci/intel/ipu6/ipu6-buttress.h | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/media/pci/intel/ipu6/ipu6-bus.c b/drivers/media/pci/intel/ipu6/ipu6-bus.c
index 37d88ddb6ee7..5cee2748983b 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-bus.c
+++ b/drivers/media/pci/intel/ipu6/ipu6-bus.c
@@ -82,7 +82,7 @@ static void ipu6_bus_release(struct device *dev)
struct ipu6_bus_device *
ipu6_bus_initialize_device(struct pci_dev *pdev, struct device *parent,
- void *pdata, struct ipu6_buttress_ctrl *ctrl,
+ void *pdata, const struct ipu6_buttress_ctrl *ctrl,
char *name)
{
struct auxiliary_device *auxdev;
diff --git a/drivers/media/pci/intel/ipu6/ipu6-bus.h b/drivers/media/pci/intel/ipu6/ipu6-bus.h
index ebf470806a74..b790f9cc37e3 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-bus.h
+++ b/drivers/media/pci/intel/ipu6/ipu6-bus.h
@@ -25,7 +25,7 @@ struct ipu6_bus_device {
void *pdata;
struct ipu6_mmu *mmu;
struct ipu6_device *isp;
- struct ipu6_buttress_ctrl *ctrl;
+ const struct ipu6_buttress_ctrl *ctrl;
u64 dma_mask;
const struct firmware *fw;
struct sg_table fw_sgt;
@@ -48,7 +48,7 @@ struct ipu6_auxdrv_data {
struct ipu6_bus_device *
ipu6_bus_initialize_device(struct pci_dev *pdev, struct device *parent,
- void *pdata, struct ipu6_buttress_ctrl *ctrl,
+ void *pdata, const struct ipu6_buttress_ctrl *ctrl,
char *name);
int ipu6_bus_add_device(struct ipu6_bus_device *adev);
void ipu6_bus_del_devices(struct pci_dev *pdev);
diff --git a/drivers/media/pci/intel/ipu6/ipu6-buttress.c b/drivers/media/pci/intel/ipu6/ipu6-buttress.c
index 787fcbd1df09..103386c4f6ae 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-buttress.c
+++ b/drivers/media/pci/intel/ipu6/ipu6-buttress.c
@@ -443,8 +443,8 @@ irqreturn_t ipu6_buttress_isr_threaded(int irq, void *isp_ptr)
return ret;
}
-int ipu6_buttress_power(struct device *dev, struct ipu6_buttress_ctrl *ctrl,
- bool on)
+int ipu6_buttress_power(struct device *dev,
+ const struct ipu6_buttress_ctrl *ctrl, bool on)
{
struct ipu6_device *isp = to_ipu6_bus_device(dev)->isp;
u32 pwr_sts, val;
diff --git a/drivers/media/pci/intel/ipu6/ipu6-buttress.h b/drivers/media/pci/intel/ipu6/ipu6-buttress.h
index 4b9763acdfdd..51e5ad48db82 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-buttress.h
+++ b/drivers/media/pci/intel/ipu6/ipu6-buttress.h
@@ -65,8 +65,8 @@ int ipu6_buttress_map_fw_image(struct ipu6_bus_device *sys,
struct sg_table *sgt);
void ipu6_buttress_unmap_fw_image(struct ipu6_bus_device *sys,
struct sg_table *sgt);
-int ipu6_buttress_power(struct device *dev, struct ipu6_buttress_ctrl *ctrl,
- bool on);
+int ipu6_buttress_power(struct device *dev,
+ const struct ipu6_buttress_ctrl *ctrl, bool on);
bool ipu6_buttress_get_secure_mode(struct ipu6_device *isp);
int ipu6_buttress_authenticate(struct ipu6_device *isp);
int ipu6_buttress_reset_authentication(struct ipu6_device *isp);
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread