Misc qcom geni i2c driver fixes
Subsystems (3)
v2 cover Misc qcom geni i2c driver fixes
Here's a small collection of qcom geni i2c driver fixes that simplify the code and aid debugging.
Changes from v1;
- Simplified code some more and commented about platform_get_irq() in commit text for patch 2
- Picked up reviewed by tags
- Fixed first patch to use &pdev->dev so it keeps compiling
- Rebased to v5.6-rc5
Stephen Boyd (3):
i2c: qcom-geni: Let firmware specify irq trigger flags
i2c: qcom-geni: Grow a dev pointer to simplify code
i2c: qcom-geni: Drop of_platform.h include
drivers/i2c/busses/i2c-qcom-geni.c | 58 ++++++++++++++---------------- 1 file changed, 26 insertions(+), 32 deletions(-)
base-commit: 2c523b344dfa65a3738e7039832044aa133c75fb
Signature · 1 line
Sent by a computer, using git, on the internet
PATCH v2 1/3 i2c: qcom-geni: Let firmware specify irq trigger flags
We don't need to force IRQF_TRIGGER_HIGH here as the DT or ACPI tables should take care of this for us. Just use 0 instead so that we use the flags from the firmware. Also, remove specify dev_name() for the irq name so that we can get better information in /proc/interrupts about which device is generating interrupts.
--- drivers/i2c/busses/i2c-qcom-geni.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/i2c/busses/i2c-qcom-geni.c +2 -2
@@ -549,8 +549,8 @@ static int geni_i2c_probe(struct platform_device *pdev)init_completion (&gi2c->done);spin_lock_init (&gi2c->lock);platform_set_drvdata (pdev, gi2c); - ret =devm_request_irq (&pdev->dev, gi2c->irq, geni_i2c_irq, -IRQF_TRIGGER_HIGH ,"i2c_geni" , gi2c); + ret =devm_request_irq (&pdev->dev, gi2c->irq, geni_i2c_irq,0 , +dev_name (&pdev->dev), gi2c);if (ret) {dev_err (&pdev->dev,"Request_irq failed:%d: err:%d\n" , gi2c->irq, ret);
Signature · 1 line
Sent by a computer, using git, on the internet
Re: [PATCH v2 1/3] i2c: qcom-geni: Let firmware specify irq trigger flags
Quoted 9 lines · Stephen Boyd
We don't need to force
IRQF_TRIGGER_HIGHhere as the DT or ACPI tables should take care of this for us. Just use 0 instead so that we use the flags from the firmware. Also, remove specifydev_name()for the irq name so that we can get better information in/proc/interruptsabout which device is generating interrupts.Cc Alok Chauhan <[email protected]>Reviewed-by Douglas Anderson <[email protected]>Reviewed-by Brendan Higgins <[email protected]>
Quoted 23 lines
Signed-off-by Stephen Boyd <[email protected]>--- drivers/i2c/busses/i2c-qcom-geni.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/i2c/busses/i2c-qcom-geni.c +2
-2@@ -549,8 +549,8 @@ static int geni_i2c_probe(struct platform_device *pdev)init_completion (&gi2c->done);spin_lock_init (&gi2c->lock);platform_set_drvdata (pdev, gi2c); - ret =devm_request_irq (&pdev->dev, gi2c->irq, geni_i2c_irq, -IRQF_TRIGGER_HIGH ,"i2c_geni" , gi2c); + ret =devm_request_irq (&pdev->dev, gi2c->irq, geni_i2c_irq,0 , +dev_name (&pdev->dev), gi2c);if (ret) {dev_err (&pdev->dev,"Request_irq failed:%d: err:%d\n" , gi2c->irq, ret);Signature · 1 line
Sent by a computer, using git, on the internet
Re: [PATCH v2 1/3] i2c: qcom-geni: Let firmware specify irq trigger flags
In reply to Stephen BoydQuoted 7 lines · Stephen Boyd
We don't need to force
IRQF_TRIGGER_HIGHhere as the DT or ACPI tables should take care of this for us. Just use 0 instead so that we use the flags from the firmware. Also, remove specifydev_name()for the irq name so that we can get better information in/proc/interruptsabout which device is generating interrupts.
Quoted 26 lines
Cc Alok Chauhan <[email protected]>Reviewed-by Douglas Anderson <[email protected]>Reviewed-by Brendan Higgins <[email protected]>Signed-off-by Stephen Boyd <[email protected]>--- drivers/i2c/busses/i2c-qcom-geni.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/i2c/busses/i2c-qcom-geni.c +2
-3@@ -549,8 +549,8 @@ static int geni_i2c_probe(struct platform_device *pdev)init_completion (&gi2c->done);spin_lock_init (&gi2c->lock);platform_set_drvdata (pdev, gi2c); - ret =devm_request_irq (&pdev->dev, gi2c->irq, geni_i2c_irq, -IRQF_TRIGGER_HIGH ,"i2c_geni" , gi2c); + ret =devm_request_irq (&pdev->dev, gi2c->irq, geni_i2c_irq,0 , +dev_name (&pdev->dev), gi2c);if (ret) {dev_err (&pdev->dev,"Request_irq failed:%d: err:%d\n" , gi2c->irq, ret); --Sent by a computer, using git, on the internet
Wolfram Sang
AppliedRe: [PATCH v2 1/3] i2c: qcom-geni: Let firmware specify irq trigger flags
In reply to Stephen BoydQuoted 10 lines · Stephen Boyd
We don't need to force
IRQF_TRIGGER_HIGHhere as the DT or ACPI tables should take care of this for us. Just use 0 instead so that we use the flags from the firmware. Also, remove specifydev_name()for the irq name so that we can get better information in/proc/interruptsabout which device is generating interrupts.Cc Alok Chauhan <[email protected]>Reviewed-by Douglas Anderson <[email protected]>Reviewed-by Brendan Higgins <[email protected]>Signed-off-by Stephen Boyd <[email protected]>
Applied to for-next, thanks!
PATCH v2 2/3 i2c: qcom-geni: Grow a dev pointer to simplify code
In reply to Stephen BoydSome lines are long here. Use a struct dev pointer to shorten lines and simplify code. The clk_get() call can fail because of EPROBE_DEFER problems too, so just remove the error print message because it isn't useful. Finally, platform_get_irq() already prints an error so just remove that error message.
--- drivers/i2c/busses/i2c-qcom-geni.c | 57 ++++++++++++++---------------- 1 file changed, 26 insertions(+), 31 deletions(-)
drivers/i2c/busses/i2c-qcom-geni.c +26 -31
@@ -502,45 +502,40 @@ static int geni_i2c_probe(struct platform_device *pdev)struct resource *res;u32 proto, tx_depth;int ret; +struct device *dev = &pdev->dev; - gi2c =devm_kzalloc (&pdev->dev,sizeof (*gi2c),GFP_KERNEL ); + gi2c =devm_kzalloc (dev,sizeof (*gi2c),GFP_KERNEL );if (!gi2c)return -ENOMEM ; - gi2c->se.dev = &pdev->dev; - gi2c->se.wrapper =dev_get_drvdata (pdev->dev.parent); + gi2c->se.dev = dev; + gi2c->se.wrapper =dev_get_drvdata (dev->parent); res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); - gi2c->se.base =devm_ioremap_resource (&pdev->dev, res); + gi2c->se.base =devm_ioremap_resource (dev, res);if (IS_ERR (gi2c->se.base))return PTR_ERR (gi2c->se.base); - gi2c->se.clk =devm_clk_get (&pdev->dev,"se" ); -if (IS_ERR (gi2c->se.clk) && !has_acpi_companion (&pdev->dev)) { - ret =PTR_ERR (gi2c->se.clk); -dev_err (&pdev->dev,"Err getting SE Core clk %d\n" , ret); -return ret; - } + gi2c->se.clk =devm_clk_get (dev,"se" ); +if (IS_ERR (gi2c->se.clk) && !has_acpi_companion (dev)) +return PTR_ERR (gi2c->se.clk); - ret =device_property_read_u32 (&pdev->dev,"clock-frequency" , - &gi2c->clk_freq_out); + ret =device_property_read_u32 (dev,"clock-frequency" , + &gi2c->clk_freq_out);if (ret) { -dev_info (&pdev->dev, -"Bus frequency not specified, default to 100kHz.\n" ); +dev_info (dev,"Bus frequency not specified, default to 100kHz.\n" ); gi2c->clk_freq_out =KHZ (100 ); } -if (has_acpi_companion (&pdev->dev)) -ACPI_COMPANION_SET (&gi2c->adap.dev,ACPI_COMPANION (&pdev->dev)); +if (has_acpi_companion (dev)) +ACPI_COMPANION_SET (&gi2c->adap.dev,ACPI_COMPANION (dev)); gi2c->irq =platform_get_irq (pdev,0 ); -if (gi2c->irq <0 ) { -dev_err (&pdev->dev,"IRQ error for i2c-geni\n" ); +if (gi2c->irq <0 )return gi2c->irq; - } ret =geni_i2c_clk_map_idx (gi2c);if (ret) { -dev_err (&pdev->dev,"Invalid clk frequency %d Hz: %d\n" , +dev_err (dev,"Invalid clk frequency %d Hz: %d\n" , gi2c->clk_freq_out, ret);return ret; }
@@ -549,29 +544,29 @@ static int geni_i2c_probe(struct platform_device *pdev)init_completion (&gi2c->done);spin_lock_init (&gi2c->lock);platform_set_drvdata (pdev, gi2c); - ret =devm_request_irq (&pdev->dev, gi2c->irq, geni_i2c_irq,0 , -dev_name (&pdev->dev), gi2c); + ret =devm_request_irq (dev, gi2c->irq, geni_i2c_irq,0 , +dev_name (dev), gi2c);if (ret) { -dev_err (&pdev->dev,"Request_irq failed:%d: err:%d\n" , +dev_err (dev,"Request_irq failed:%d: err:%d\n" , gi2c->irq, ret);return ret; }/* Disable the interrupt so that the system can enter low-power mode */ disable_irq (gi2c->irq);i2c_set_adapdata (&gi2c->adap, gi2c); - gi2c->adap.dev.parent = &pdev->dev; - gi2c->adap.dev.of_node = pdev->dev.of_node; + gi2c->adap.dev.parent = dev; + gi2c->adap.dev.of_node = dev->of_node;strlcpy (gi2c->adap.name,"Geni-I2C" ,sizeof (gi2c->adap.name)); ret =geni_se_resources_on (&gi2c->se);if (ret) { -dev_err (&pdev->dev,"Error turning on resources %d\n" , ret); +dev_err (dev,"Error turning on resources %d\n" , ret);return ret; } proto =geni_se_read_proto (&gi2c->se); tx_depth =geni_se_get_tx_fifo_depth (&gi2c->se);if (proto !=GENI_SE_I2C ) { -dev_err (&pdev->dev,"Invalid proto %d\n" , proto); +dev_err (dev,"Invalid proto %d\n" , proto);geni_se_resources_off (&gi2c->se);return -ENXIO ; }
@@ -581,11 +576,11 @@ static int geni_i2c_probe(struct platform_device *pdev) true, true, true); ret =geni_se_resources_off (&gi2c->se);if (ret) { -dev_err (&pdev->dev,"Error turning off resources %d\n" , ret); +dev_err (dev,"Error turning off resources %d\n" , ret);return ret; } -dev_dbg (&pdev->dev,"i2c fifo/se-dma mode. fifo depth:%d\n" , tx_depth); +dev_dbg (dev,"i2c fifo/se-dma mode. fifo depth:%d\n" , tx_depth); gi2c->suspended =1 ;pm_runtime_set_suspended (gi2c->se.dev);
@@ -595,12 +590,12 @@ static int geni_i2c_probe(struct platform_device *pdev) ret =i2c_add_adapter (&gi2c->adap);if (ret) { -dev_err (&pdev->dev,"Error adding i2c adapter %d\n" , ret); +dev_err (dev,"Error adding i2c adapter %d\n" , ret);pm_runtime_disable (gi2c->se.dev);return ret; } -dev_dbg (&pdev->dev,"Geni-I2C adaptor successfully added\n" ); +dev_dbg (dev,"Geni-I2C adaptor successfully added\n" );return 0 ; }
Signature · 1 line
Sent by a computer, using git, on the internet
Re: [PATCH v2 2/3] i2c: qcom-geni: Grow a dev pointer to simplify code
Quoted 33 lines · Stephen Boyd
Some lines are long here. Use a struct dev pointer to shorten lines and simplify code. The
clk_get()call can fail because ofEPROBE_DEFERproblems too, so just remove the error print message because it isn't useful. Finally,platform_get_irq()already prints an error so just remove that error message.Cc Alok Chauhan <[email protected]>Reviewed-by Douglas Anderson <[email protected]>Reviewed-by Brendan Higgins <[email protected]>Signed-off-by Stephen Boyd <[email protected]>--- drivers/i2c/busses/i2c-qcom-geni.c | 57 ++++++++++++++---------------- 1 file changed, 26 insertions(+), 31 deletions(-)drivers/i2c/busses/i2c-qcom-geni.c +4
-3@@ -502,45 +502,40 @@ static int geni_i2c_probe(struct platform_device *pdev)struct resource *res;u32 proto, tx_depth;int ret; +struct device *dev = &pdev->dev; - gi2c =devm_kzalloc (&pdev->dev,sizeof (*gi2c),GFP_KERNEL ); + gi2c =devm_kzalloc (dev,sizeof (*gi2c),GFP_KERNEL );if (!gi2c)return -ENOMEM ; - gi2c->se.dev = &pdev->dev; - gi2c->se.wrapper =dev_get_drvdata (pdev->dev.parent); + gi2c->se.dev = dev; + gi2c->se.wrapper =dev_get_drvdata (dev->parent);
drivers/i2c/busses/i2c-qcom-geni.c static int geni_i2c_probe(struct platform_device *pdev) · line 520
Quoted 10 lines
drivers/i2c/busses/i2c-qcom-geni.c +1
-5res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); - gi2c->se.base =devm_ioremap_resource (&pdev->dev, res); + gi2c->se.base =devm_ioremap_resource (dev, res);if (IS_ERR (gi2c->se.base))return PTR_ERR (gi2c->se.base); - gi2c->se.clk =devm_clk_get (&pdev->dev,"se" ); -if (IS_ERR (gi2c->se.clk) && !has_acpi_companion (&pdev->dev)) { - ret =PTR_ERR (gi2c->se.clk); -dev_err (&pdev->dev,"Err getting SE Core clk %d\n" , ret);
Afaict this line would still be useful, although it might need the usual probe deferral exception(?)
Regards,
Bjorn
Quoted 105 lines
drivers/i2c/busses/i2c-qcom-geni.c +21
-23-return ret; - } + gi2c->se.clk =devm_clk_get (dev,"se" ); +if (IS_ERR (gi2c->se.clk) && !has_acpi_companion (dev)) +return PTR_ERR (gi2c->se.clk); - ret =device_property_read_u32 (&pdev->dev,"clock-frequency" , - &gi2c->clk_freq_out); + ret =device_property_read_u32 (dev,"clock-frequency" , + &gi2c->clk_freq_out);if (ret) { -dev_info (&pdev->dev, -"Bus frequency not specified, default to 100kHz.\n" ); +dev_info (dev,"Bus frequency not specified, default to 100kHz.\n" ); gi2c->clk_freq_out =KHZ (100 ); } -if (has_acpi_companion (&pdev->dev)) -ACPI_COMPANION_SET (&gi2c->adap.dev,ACPI_COMPANION (&pdev->dev)); +if (has_acpi_companion (dev)) +ACPI_COMPANION_SET (&gi2c->adap.dev,ACPI_COMPANION (dev)); gi2c->irq =platform_get_irq (pdev,0 ); -if (gi2c->irq <0 ) { -dev_err (&pdev->dev,"IRQ error for i2c-geni\n" ); +if (gi2c->irq <0 )return gi2c->irq; - } ret =geni_i2c_clk_map_idx (gi2c);if (ret) { -dev_err (&pdev->dev,"Invalid clk frequency %d Hz: %d\n" , +dev_err (dev,"Invalid clk frequency %d Hz: %d\n" , gi2c->clk_freq_out, ret);return ret; }@@ -549,29 +544,29 @@ static int geni_i2c_probe(struct platform_device *pdev)init_completion (&gi2c->done);spin_lock_init (&gi2c->lock);platform_set_drvdata (pdev, gi2c); - ret =devm_request_irq (&pdev->dev, gi2c->irq, geni_i2c_irq,0 , -dev_name (&pdev->dev), gi2c); + ret =devm_request_irq (dev, gi2c->irq, geni_i2c_irq,0 , +dev_name (dev), gi2c);if (ret) { -dev_err (&pdev->dev,"Request_irq failed:%d: err:%d\n" , +dev_err (dev,"Request_irq failed:%d: err:%d\n" , gi2c->irq, ret);return ret; }/* Disable the interrupt so that the system can enter low-power mode */ disable_irq (gi2c->irq);i2c_set_adapdata (&gi2c->adap, gi2c); - gi2c->adap.dev.parent = &pdev->dev; - gi2c->adap.dev.of_node = pdev->dev.of_node; + gi2c->adap.dev.parent = dev; + gi2c->adap.dev.of_node = dev->of_node;strlcpy (gi2c->adap.name,"Geni-I2C" ,sizeof (gi2c->adap.name)); ret =geni_se_resources_on (&gi2c->se);if (ret) { -dev_err (&pdev->dev,"Error turning on resources %d\n" , ret); +dev_err (dev,"Error turning on resources %d\n" , ret);return ret; } proto =geni_se_read_proto (&gi2c->se); tx_depth =geni_se_get_tx_fifo_depth (&gi2c->se);if (proto !=GENI_SE_I2C ) { -dev_err (&pdev->dev,"Invalid proto %d\n" , proto); +dev_err (dev,"Invalid proto %d\n" , proto);geni_se_resources_off (&gi2c->se);return -ENXIO ; }@@ -581,11 +576,11 @@ static int geni_i2c_probe(struct platform_device *pdev) true, true, true); ret =geni_se_resources_off (&gi2c->se);if (ret) { -dev_err (&pdev->dev,"Error turning off resources %d\n" , ret); +dev_err (dev,"Error turning off resources %d\n" , ret);return ret; } -dev_dbg (&pdev->dev,"i2c fifo/se-dma mode. fifo depth:%d\n" , tx_depth); +dev_dbg (dev,"i2c fifo/se-dma mode. fifo depth:%d\n" , tx_depth); gi2c->suspended =1 ;pm_runtime_set_suspended (gi2c->se.dev);@@ -595,12 +590,12 @@ static int geni_i2c_probe(struct platform_device *pdev) ret =i2c_add_adapter (&gi2c->adap);if (ret) { -dev_err (&pdev->dev,"Error adding i2c adapter %d\n" , ret); +dev_err (dev,"Error adding i2c adapter %d\n" , ret);pm_runtime_disable (gi2c->se.dev);return ret; } -dev_dbg (&pdev->dev,"Geni-I2C adaptor successfully added\n" ); +dev_dbg (dev,"Geni-I2C adaptor successfully added\n" );return 0 ; }Signature · 1 line
Sent by a computer, using git, on the internet
Re: [PATCH v2 2/3] i2c: qcom-geni: Grow a dev pointer to simplify code
In reply to Stephen BoydQuoted 7 lines · Stephen Boyd
Some lines are long here. Use a struct dev pointer to shorten lines and simplify code. The
clk_get()call can fail because ofEPROBE_DEFERproblems too, so just remove the error print message because it isn't useful. Finally,platform_get_irq()already prints an error so just remove that error message.
Quoted 142 lines
Cc Alok Chauhan <[email protected]>Reviewed-by Douglas Anderson <[email protected]>Reviewed-by Brendan Higgins <[email protected]>Signed-off-by Stephen Boyd <[email protected]>--- drivers/i2c/busses/i2c-qcom-geni.c | 57 ++++++++++++++---------------- 1 file changed, 26 insertions(+), 31 deletions(-)drivers/i2c/busses/i2c-qcom-geni.c +26
-32@@ -502,45 +502,40 @@ static int geni_i2c_probe(struct platform_device *pdev)struct resource *res;u32 proto, tx_depth;int ret; +struct device *dev = &pdev->dev; - gi2c =devm_kzalloc (&pdev->dev,sizeof (*gi2c),GFP_KERNEL ); + gi2c =devm_kzalloc (dev,sizeof (*gi2c),GFP_KERNEL );if (!gi2c)return -ENOMEM ; - gi2c->se.dev = &pdev->dev; - gi2c->se.wrapper =dev_get_drvdata (pdev->dev.parent); + gi2c->se.dev = dev; + gi2c->se.wrapper =dev_get_drvdata (dev->parent); res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); - gi2c->se.base =devm_ioremap_resource (&pdev->dev, res); + gi2c->se.base =devm_ioremap_resource (dev, res);if (IS_ERR (gi2c->se.base))return PTR_ERR (gi2c->se.base); - gi2c->se.clk =devm_clk_get (&pdev->dev,"se" ); -if (IS_ERR (gi2c->se.clk) && !has_acpi_companion (&pdev->dev)) { - ret =PTR_ERR (gi2c->se.clk); -dev_err (&pdev->dev,"Err getting SE Core clk %d\n" , ret); -return ret; - } + gi2c->se.clk =devm_clk_get (dev,"se" ); +if (IS_ERR (gi2c->se.clk) && !has_acpi_companion (dev)) +return PTR_ERR (gi2c->se.clk); - ret =device_property_read_u32 (&pdev->dev,"clock-frequency" , - &gi2c->clk_freq_out); + ret =device_property_read_u32 (dev,"clock-frequency" , + &gi2c->clk_freq_out);if (ret) { -dev_info (&pdev->dev, -"Bus frequency not specified, default to 100kHz.\n" ); +dev_info (dev,"Bus frequency not specified, default to 100kHz.\n" ); gi2c->clk_freq_out =KHZ (100 ); } -if (has_acpi_companion (&pdev->dev)) -ACPI_COMPANION_SET (&gi2c->adap.dev,ACPI_COMPANION (&pdev->dev)); +if (has_acpi_companion (dev)) +ACPI_COMPANION_SET (&gi2c->adap.dev,ACPI_COMPANION (dev)); gi2c->irq =platform_get_irq (pdev,0 ); -if (gi2c->irq <0 ) { -dev_err (&pdev->dev,"IRQ error for i2c-geni\n" ); +if (gi2c->irq <0 )return gi2c->irq; - } ret =geni_i2c_clk_map_idx (gi2c);if (ret) { -dev_err (&pdev->dev,"Invalid clk frequency %d Hz: %d\n" , +dev_err (dev,"Invalid clk frequency %d Hz: %d\n" , gi2c->clk_freq_out, ret);return ret; }@@ -549,29 +544,29 @@ static int geni_i2c_probe(struct platform_device *pdev)init_completion (&gi2c->done);spin_lock_init (&gi2c->lock);platform_set_drvdata (pdev, gi2c); - ret =devm_request_irq (&pdev->dev, gi2c->irq, geni_i2c_irq,0 , -dev_name (&pdev->dev), gi2c); + ret =devm_request_irq (dev, gi2c->irq, geni_i2c_irq,0 , +dev_name (dev), gi2c);if (ret) { -dev_err (&pdev->dev,"Request_irq failed:%d: err:%d\n" , +dev_err (dev,"Request_irq failed:%d: err:%d\n" , gi2c->irq, ret);return ret; }/* Disable the interrupt so that the system can enter low-power mode */ disable_irq (gi2c->irq);i2c_set_adapdata (&gi2c->adap, gi2c); - gi2c->adap.dev.parent = &pdev->dev; - gi2c->adap.dev.of_node = pdev->dev.of_node; + gi2c->adap.dev.parent = dev; + gi2c->adap.dev.of_node = dev->of_node;strlcpy (gi2c->adap.name,"Geni-I2C" ,sizeof (gi2c->adap.name)); ret =geni_se_resources_on (&gi2c->se);if (ret) { -dev_err (&pdev->dev,"Error turning on resources %d\n" , ret); +dev_err (dev,"Error turning on resources %d\n" , ret);return ret; } proto =geni_se_read_proto (&gi2c->se); tx_depth =geni_se_get_tx_fifo_depth (&gi2c->se);if (proto !=GENI_SE_I2C ) { -dev_err (&pdev->dev,"Invalid proto %d\n" , proto); +dev_err (dev,"Invalid proto %d\n" , proto);geni_se_resources_off (&gi2c->se);return -ENXIO ; }@@ -581,11 +576,11 @@ static int geni_i2c_probe(struct platform_device *pdev) true, true, true); ret =geni_se_resources_off (&gi2c->se);if (ret) { -dev_err (&pdev->dev,"Error turning off resources %d\n" , ret); +dev_err (dev,"Error turning off resources %d\n" , ret);return ret; } -dev_dbg (&pdev->dev,"i2c fifo/se-dma mode. fifo depth:%d\n" , tx_depth); +dev_dbg (dev,"i2c fifo/se-dma mode. fifo depth:%d\n" , tx_depth); gi2c->suspended =1 ;pm_runtime_set_suspended (gi2c->se.dev);@@ -595,12 +590,12 @@ static int geni_i2c_probe(struct platform_device *pdev) ret =i2c_add_adapter (&gi2c->adap);if (ret) { -dev_err (&pdev->dev,"Error adding i2c adapter %d\n" , ret); +dev_err (dev,"Error adding i2c adapter %d\n" , ret);pm_runtime_disable (gi2c->se.dev);return ret; } -dev_dbg (&pdev->dev,"Geni-I2C adaptor successfully added\n" ); +dev_dbg (dev,"Geni-I2C adaptor successfully added\n" );return 0 ; } --Sent by a computer, using git, on the internet
Wolfram Sang
AppliedRe: [PATCH v2 2/3] i2c: qcom-geni: Grow a dev pointer to simplify code
In reply to Stephen BoydQuoted 10 lines · Stephen Boyd
Some lines are long here. Use a struct dev pointer to shorten lines and simplify code. The
clk_get()call can fail because ofEPROBE_DEFERproblems too, so just remove the error print message because it isn't useful. Finally,platform_get_irq()already prints an error so just remove that error message.Cc Alok Chauhan <[email protected]>Reviewed-by Douglas Anderson <[email protected]>Reviewed-by Brendan Higgins <[email protected]>Signed-off-by Stephen Boyd <[email protected]>
Applied to for-next, thanks!
PATCH v2 3/3 i2c: qcom-geni: Drop of_platform.h include
In reply to Stephen BoydThis driver doesn't call any DT platform functions like of_platform_*(). Remove the include as it isn't used.
--- drivers/i2c/busses/i2c-qcom-geni.c | 1 - 1 file changed, 1 deletion(-)
drivers/i2c/busses/i2c-qcom-geni.c +0 -1
@@ -10,7 +10,6 @@#include <linux/io.h> #include <linux/module.h> #include <linux/of.h> -#include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/qcom-geni-se.h>
Signature · 1 line
Sent by a computer, using git, on the internet
Re: [PATCH v2 3/3] i2c: qcom-geni: Drop of_platform.h include
Quoted 6 lines · Stephen Boyd
This driver doesn't call any DT platform functions like of_platform_*(). Remove the include as it isn't used.
Cc Alok Chauhan <[email protected]>Reviewed-by Douglas Anderson <[email protected]>Reviewed-by Brendan Higgins <[email protected]>
Quoted 20 lines
Signed-off-by Stephen Boyd <[email protected]>--- drivers/i2c/busses/i2c-qcom-geni.c | 1 - 1 file changed, 1 deletion(-)drivers/i2c/busses/i2c-qcom-geni.c +0
-1@@ -10,7 +10,6 @@#include <linux/io.h> #include <linux/module.h> #include <linux/of.h> -#include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/qcom-geni-se.h> Signature · 1 line
Sent by a computer, using git, on the internet
Re: [PATCH v2 3/3] i2c: qcom-geni: Drop of_platform.h include
In reply to Stephen BoydQuoted 4 lines · Stephen Boyd
This driver doesn't call any DT platform functions like of_platform_*(). Remove the include as it isn't used.
Quoted 23 lines
Cc Alok Chauhan <[email protected]>Reviewed-by Douglas Anderson <[email protected]>Reviewed-by Brendan Higgins <[email protected]>Signed-off-by Stephen Boyd <[email protected]>--- drivers/i2c/busses/i2c-qcom-geni.c | 1 - 1 file changed, 1 deletion(-)drivers/i2c/busses/i2c-qcom-geni.c +0
-2@@ -10,7 +10,6 @@#include <linux/io.h> #include <linux/module.h> #include <linux/of.h> -#include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/qcom-geni-se.h> --Sent by a computer, using git, on the internet
Wolfram Sang
AppliedRe: [PATCH v2 3/3] i2c: qcom-geni: Drop of_platform.h include
In reply to Stephen BoydQuoted 7 lines · Stephen Boyd
This driver doesn't call any DT platform functions like of_platform_*(). Remove the include as it isn't used.
Cc Alok Chauhan <[email protected]>Reviewed-by Douglas Anderson <[email protected]>Reviewed-by Brendan Higgins <[email protected]>Signed-off-by Stephen Boyd <[email protected]>
Applied to for-next, thanks!