linux-kernel - linux-next: manual merge of the pwm tree with the driver-core tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20121129162730.57ed3756a11ceb2f93f08cdd@canb.auug.org.au>
Date:	Thu, 29 Nov 2012 16:27:30 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Thierry Reding <thierry.reding@...onic-design.de>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Bill Pemberton <wfp5p@...ginia.edu>, Greg KH <greg@...ah.com>,
	"Philip, Avinash" <avinashphilip@...com>
Subject: linux-next: manual merge of the pwm tree with the driver-core tree

Hi Thierry,

Today's linux-next merge of the pwm tree got a conflict in
drivers/pwm/pwm-tiehrpwm.c between commit 3e9fe83d278c ("pwm: remove use
of __devinit") from the driver-core tree and commit 53ad9e8d3703 ("pwm:
tiehrpwm: Add device-tree binding") from the pwm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/pwm/pwm-tiehrpwm.c
index 9ffd389,542d5f3..0000000
--- a/drivers/pwm/pwm-tiehrpwm.c
+++ b/drivers/pwm/pwm-tiehrpwm.c
@@@ -392,7 -403,13 +403,13 @@@ static const struct pwm_ops ehrpwm_pwm_
  	.owner		= THIS_MODULE,
  };
  
+ static const struct of_device_id ehrpwm_of_match[] = {
+ 	{ .compatible	= "ti,am33xx-ehrpwm" },
+ 	{},
+ };
+ MODULE_DEVICE_TABLE(of, ehrpwm_of_match);
+ 
 -static int __devinit ehrpwm_pwm_probe(struct platform_device *pdev)
 +static int ehrpwm_pwm_probe(struct platform_device *pdev)
  {
  	int ret;
  	struct resource *r;
@@@ -439,11 -471,29 +471,29 @@@
  	}
  
  	pm_runtime_enable(&pdev->dev);
+ 	pm_runtime_get_sync(&pdev->dev);
+ 
+ 	status = pwmss_submodule_state_change(pdev->dev.parent,
+ 			PWMSS_EPWMCLK_EN);
+ 	if (!(status & PWMSS_EPWMCLK_EN_ACK)) {
+ 		dev_err(&pdev->dev, "PWMSS config space clock enable failed\n");
+ 		ret = -EINVAL;
+ 		goto pwmss_clk_failure;
+ 	}
+ 
+ 	pm_runtime_put_sync(&pdev->dev);
+ 
  	platform_set_drvdata(pdev, pc);
  	return 0;
+ 
+ pwmss_clk_failure:
+ 	pm_runtime_put_sync(&pdev->dev);
+ 	pm_runtime_disable(&pdev->dev);
+ 	pwmchip_remove(&pc->chip);
+ 	return ret;
  }
  
 -static int __devexit ehrpwm_pwm_remove(struct platform_device *pdev)
 +static int ehrpwm_pwm_remove(struct platform_device *pdev)
  {
  	struct ehrpwm_pwm_chip *pc = platform_get_drvdata(pdev);
  
@@@ -454,10 -512,12 +512,12 @@@
  
  static struct platform_driver ehrpwm_pwm_driver = {
  	.driver = {
- 		.name = "ehrpwm",
+ 		.name	= "ehrpwm",
+ 		.owner	= THIS_MODULE,
+ 		.of_match_table = ehrpwm_of_match,
  	},
  	.probe = ehrpwm_pwm_probe,
 -	.remove = __devexit_p(ehrpwm_pwm_remove),
 +	.remove = ehrpwm_pwm_remove,
  };
  
  module_platform_driver(ehrpwm_pwm_driver);

Content of type "application/pgp-signature" skipped