Skip to contentSkip to conversation

media: intel/ipu6: minor cleanups

PATCH New Stanislaw Gruszka 1 participant 4 messages Mar 13, 2025

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v2 cover media: intel/ipu6: minor cleanups

Few small cleanups.

v1 -> v2: fix coding style in patch 3

Stanislaw Gruszka (3):
media: intel/ipu6: Remove unused IPU6_BUS_NAME
media: intel/ipu6: Remove ipu6_buttress_ctrl started field
media: intel/ipu6: Constify ipu6_buttress_ctrl structure

 drivers/media/pci/intel/ipu6/ipu6-bus.c      | 2 +-
 drivers/media/pci/intel/ipu6/ipu6-bus.h      | 6 ++----
 drivers/media/pci/intel/ipu6/ipu6-buttress.c | 6 ++----
 drivers/media/pci/intel/ipu6/ipu6-buttress.h | 5 ++---
 4 files changed, 7 insertions(+), 12 deletions(-)
Signature · 1 line
2.34.1
#1 lore raw

PATCH v2 1/3 media: intel/ipu6: Remove unused IPU6_BUS_NAME

Remove unused define.

---
 drivers/media/pci/intel/ipu6/ipu6-bus.h | 2 --
 1 file changed, 2 deletions(-)
drivers/media/pci/intel/ipu6/ipu6-bus.h +0 -2
index bb4926dfdf08..ebf470806a74 100644
@@ -15,8 +15,6 @@
 struct firmware;
 struct pci_dev;
 
-#define IPU6_BUS_NAME	IPU6_NAME "-bus"
-
 struct ipu6_buttress_ctrl;
 
 struct ipu6_bus_device {
Signature · 1 line
2.34.1
#2 lore raw

PATCH v2 2/3 media: intel/ipu6: Remove ipu6_buttress_ctrl started field

In reply to Stanislaw Gruszka

We assign to ->started field but newer read back, the field can be removed.

---
 drivers/media/pci/intel/ipu6/ipu6-buttress.c | 2 --
 drivers/media/pci/intel/ipu6/ipu6-buttress.h | 1 -
 2 files changed, 3 deletions(-)
drivers/media/pci/intel/ipu6/ipu6-buttress.c +0 -2
index d8db5aa5d528..787fcbd1df09 100644
@@ -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;
drivers/media/pci/intel/ipu6/ipu6-buttress.h +0 -1
index 482978c2a09d..4b9763acdfdd 100644
@@ -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 {
Signature · 1 line
2.34.1
#3 lore raw

PATCH v2 3/3 media: intel/ipu6: Constify ipu6_buttress_ctrl structure

In reply to Stanislaw Gruszka

Make ipu6_buttress_ctrl constant since it is not modified any longer.

---
 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(-)
drivers/media/pci/intel/ipu6/ipu6-bus.c +1 -1
index 37d88ddb6ee7..5cee2748983b 100644
@@ -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;
drivers/media/pci/intel/ipu6/ipu6-bus.h +2 -2
index ebf470806a74..b790f9cc37e3 100644
@@ -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);
drivers/media/pci/intel/ipu6/ipu6-buttress.c +2 -2
index 787fcbd1df09..103386c4f6ae 100644
@@ -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;
drivers/media/pci/intel/ipu6/ipu6-buttress.h +2 -2
index 4b9763acdfdd..51e5ad48db82 100644
@@ -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);
Signature · 1 line
2.34.1