HID: amd_sfh: Move interrupt handling to common interface

basuamd · Jiri Kosina · commit 014730c40b79 · 2022-07-21T13:44:02.000+02:00
Interrupt handling can be used in multiple files to support all
AMD SOCs. Hence move interrupt handling to common interface.

Signed-off-by: Basavaraj Natikar &lt;Basavaraj.Natikar@amd.com&gt;
Signed-off-by: Jiri Kosina &lt;jkosina@suse.cz&gt;
diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_client.c b/drivers/hid/amd-sfh-hid/amd_sfh_client.c
@@ -178,8 +178,7 @@ static void amd_sfh_resume(struct amd_mp2_dev *mp2)
 	}
 
 	schedule_delayed_work(&cl_data->work_buffer, msecs_to_jiffies(AMD_SFH_IDLE_LOOP));
-	if (mp2->mp2_ops->clear_intr)
-		mp2->mp2_ops->clear_intr(mp2);
+	amd_sfh_clear_intr(mp2);
 }
 
 static void amd_sfh_suspend(struct amd_mp2_dev *mp2)
@@ -202,8 +201,7 @@ static void amd_sfh_suspend(struct amd_mp2_dev *mp2)
 	}
 
 	cancel_delayed_work_sync(&cl_data->work_buffer);
-	if (mp2->mp2_ops->clear_intr)
-		mp2->mp2_ops->clear_intr(mp2);
+	amd_sfh_clear_intr(mp2);
 }
 
 int amd_sfh_hid_client_init(struct amd_mp2_dev *privdata)
diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_common.h b/drivers/hid/amd-sfh-hid/amd_sfh_common.h
@@ -66,4 +66,8 @@ struct amd_mp2_ops {
 
 void amd_sfh_work(struct work_struct *work);
 void amd_sfh_work_buffer(struct work_struct *work);
+void amd_sfh_clear_intr_v2(struct amd_mp2_dev *privdata);
+int amd_sfh_irq_init_v2(struct amd_mp2_dev *privdata);
+void amd_sfh_clear_intr(struct amd_mp2_dev *privdata);
+int amd_sfh_irq_init(struct amd_mp2_dev *privdata);
 #endif
diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
@@ -92,15 +92,15 @@ static void amd_stop_all_sensor_v2(struct amd_mp2_dev *privdata)
 	writel(cmd_base.ul, privdata->mmio + AMD_C2P_MSG0);
 }
 
-static void amd_sfh_clear_intr_v2(struct amd_mp2_dev *privdata)
+void amd_sfh_clear_intr_v2(struct amd_mp2_dev *privdata)
 {
 	if (readl(privdata->mmio + AMD_P2C_MSG(4))) {
 		writel(0, privdata->mmio + AMD_P2C_MSG(4));
 		writel(0xf, privdata->mmio + AMD_P2C_MSG(5));
 	}
 }
 
-static void amd_sfh_clear_intr(struct amd_mp2_dev *privdata)
+void amd_sfh_clear_intr(struct amd_mp2_dev *privdata)
 {
 	if (privdata->mp2_ops->clear_intr)
 		privdata->mp2_ops->clear_intr(privdata);
@@ -113,7 +113,7 @@ static irqreturn_t amd_sfh_irq_handler(int irq, void *data)
 	return IRQ_HANDLED;
 }
 
-static int amd_sfh_irq_init_v2(struct amd_mp2_dev *privdata)
+int amd_sfh_irq_init_v2(struct amd_mp2_dev *privdata)
 {
 	int rc;
 
@@ -279,7 +279,7 @@ static void mp2_select_ops(struct amd_mp2_dev *privdata)
 	}
 }
 
-static int amd_sfh_irq_init(struct amd_mp2_dev *privdata)
+int amd_sfh_irq_init(struct amd_mp2_dev *privdata)
 {
 	if (privdata->mp2_ops->init_intr)
 		return privdata->mp2_ops->init_intr(privdata);

Original file line number	Diff line number	Diff line change
`@@ -178,8 +178,7 @@ static void amd_sfh_resume(struct amd_mp2_dev *mp2)`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`schedule_delayed_work(&cl_data->work_buffer, msecs_to_jiffies(AMD_SFH_IDLE_LOOP));`
`181`		`- if (mp2->mp2_ops->clear_intr)`
`182`		`- mp2->mp2_ops->clear_intr(mp2);`
	`181`	`+ amd_sfh_clear_intr(mp2);`
`183`	`182`	`}`
`184`	`183`
`185`	`184`	`static void amd_sfh_suspend(struct amd_mp2_dev *mp2)`
`@@ -202,8 +201,7 @@ static void amd_sfh_suspend(struct amd_mp2_dev *mp2)`
`202`	`201`	`}`
`203`	`202`
`204`	`203`	`cancel_delayed_work_sync(&cl_data->work_buffer);`
`205`		`- if (mp2->mp2_ops->clear_intr)`
`206`		`- mp2->mp2_ops->clear_intr(mp2);`
	`204`	`+ amd_sfh_clear_intr(mp2);`
`207`	`205`	`}`
`208`	`206`
`209`	`207`	`int amd_sfh_hid_client_init(struct amd_mp2_dev *privdata)`
Original file line number	Diff line number	Diff line change
`@@ -92,15 +92,15 @@ static void amd_stop_all_sensor_v2(struct amd_mp2_dev *privdata)`
`92`	`92`	`writel(cmd_base.ul, privdata->mmio + AMD_C2P_MSG0);`
`93`	`93`	`}`
`94`	`94`
`95`		`-static void amd_sfh_clear_intr_v2(struct amd_mp2_dev *privdata)`
	`95`	`+void amd_sfh_clear_intr_v2(struct amd_mp2_dev *privdata)`
`96`	`96`	`{`
`97`	`97`	`if (readl(privdata->mmio + AMD_P2C_MSG(4))) {`
`98`	`98`	`writel(0, privdata->mmio + AMD_P2C_MSG(4));`
`99`	`99`	`writel(0xf, privdata->mmio + AMD_P2C_MSG(5));`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`
`103`		`-static void amd_sfh_clear_intr(struct amd_mp2_dev *privdata)`
	`103`	`+void amd_sfh_clear_intr(struct amd_mp2_dev *privdata)`
`104`	`104`	`{`
`105`	`105`	`if (privdata->mp2_ops->clear_intr)`
`106`	`106`	`privdata->mp2_ops->clear_intr(privdata);`
`@@ -113,7 +113,7 @@ static irqreturn_t amd_sfh_irq_handler(int irq, void *data)`
`113`	`113`	`return IRQ_HANDLED;`
`114`	`114`	`}`
`115`	`115`
`116`		`-static int amd_sfh_irq_init_v2(struct amd_mp2_dev *privdata)`
	`116`	`+int amd_sfh_irq_init_v2(struct amd_mp2_dev *privdata)`
`117`	`117`	`{`
`118`	`118`	`int rc;`
`119`	`119`
`@@ -279,7 +279,7 @@ static void mp2_select_ops(struct amd_mp2_dev *privdata)`
`279`	`279`	`}`
`280`	`280`	`}`
`281`	`281`
`282`		`-static int amd_sfh_irq_init(struct amd_mp2_dev *privdata)`
	`282`	`+int amd_sfh_irq_init(struct amd_mp2_dev *privdata)`
`283`	`283`	`{`
`284`	`284`	`if (privdata->mp2_ops->init_intr)`
`285`	`285`	`return privdata->mp2_ops->init_intr(privdata);`