@@ -558,7 +558,7 @@ static void tda998x_hpd(struct work_struct *work)
struct tda998x_priv *priv =
container_of(dwork, struct tda998x_priv, dwork);
- if (priv->encoder && priv->encoder->dev)
+ if (priv->encoder->dev)
drm_kms_helper_hotplug_event(priv->encoder->dev);
}
@@ -570,8 +570,6 @@ static irqreturn_t tda998x_irq_thread(int irq, void *data)
struct tda998x_priv *priv = data;
u8 sta, cec, lvl, flag0, flag1, flag2;
- if (!priv)
- return IRQ_HANDLED;
sta = cec_read(priv, REG_CEC_INTSTATUS);
cec = cec_read(priv, REG_CEC_RXSHPDINT);
lvl = cec_read(priv, REG_CEC_RXSHPDLEV);
There is no way 'priv' can be NULL in tda998x_irq_thread() - this can only happen if request_threaded_irq() was passed a NULL priv pointer, and we would have crashed long before then if that was the case. We also always ensure that priv->encoder is correctly setup, which must have been initialised prior to the interrupt being claimed, so we can remove this check as well. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> --- drivers/gpu/drm/i2c/tda998x_drv.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)