Commit e0d8b13a authored by Russell King's avatar Russell King Committed by Russell King

[ARM] pxa: don't pass a consumer clock name for devices with unique clocks

Where devices only have one consumer, passing a consumer clock ID
has no real benefit.  Remove it.
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 8c3abc7d
...@@ -173,7 +173,7 @@ static struct pwm_device *pwm_probe(struct platform_device *pdev, ...@@ -173,7 +173,7 @@ static struct pwm_device *pwm_probe(struct platform_device *pdev,
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
} }
pwm->clk = clk_get(&pdev->dev, "PWMCLK"); pwm->clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(pwm->clk)) { if (IS_ERR(pwm->clk)) {
ret = PTR_ERR(pwm->clk); ret = PTR_ERR(pwm->clk);
goto err_free; goto err_free;
......
...@@ -356,7 +356,7 @@ static int __devinit ssp_probe(struct platform_device *pdev, int type) ...@@ -356,7 +356,7 @@ static int __devinit ssp_probe(struct platform_device *pdev, int type)
} }
ssp->pdev = pdev; ssp->pdev = pdev;
ssp->clk = clk_get(&pdev->dev, "SSPCLK"); ssp->clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(ssp->clk)) { if (IS_ERR(ssp->clk)) {
ret = PTR_ERR(ssp->clk); ret = PTR_ERR(ssp->clk);
goto err_free; goto err_free;
......
...@@ -1016,7 +1016,7 @@ static int i2c_pxa_probe(struct platform_device *dev) ...@@ -1016,7 +1016,7 @@ static int i2c_pxa_probe(struct platform_device *dev)
snprintf(i2c->adap.name, sizeof(i2c->adap.name), "pxa_i2c-i2c.%u", snprintf(i2c->adap.name, sizeof(i2c->adap.name), "pxa_i2c-i2c.%u",
i2c->adap.nr); i2c->adap.nr);
i2c->clk = clk_get(&dev->dev, "I2CCLK"); i2c->clk = clk_get(&dev->dev, NULL);
if (IS_ERR(i2c->clk)) { if (IS_ERR(i2c->clk)) {
ret = PTR_ERR(i2c->clk); ret = PTR_ERR(i2c->clk);
goto eclk; goto eclk;
......
...@@ -475,7 +475,7 @@ static int __devinit pxa27x_keypad_probe(struct platform_device *pdev) ...@@ -475,7 +475,7 @@ static int __devinit pxa27x_keypad_probe(struct platform_device *pdev)
goto failed_free_mem; goto failed_free_mem;
} }
keypad->clk = clk_get(&pdev->dev, "KBDCLK"); keypad->clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(keypad->clk)) { if (IS_ERR(keypad->clk)) {
dev_err(&pdev->dev, "failed to get keypad clock\n"); dev_err(&pdev->dev, "failed to get keypad clock\n");
error = PTR_ERR(keypad->clk); error = PTR_ERR(keypad->clk);
......
...@@ -1071,7 +1071,7 @@ static int pxa_camera_probe(struct platform_device *pdev) ...@@ -1071,7 +1071,7 @@ static int pxa_camera_probe(struct platform_device *pdev)
goto exit; goto exit;
} }
pcdev->clk = clk_get(&pdev->dev, "CAMCLK"); pcdev->clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(pcdev->clk)) { if (IS_ERR(pcdev->clk)) {
err = PTR_ERR(pcdev->clk); err = PTR_ERR(pcdev->clk);
goto exit_kfree; goto exit_kfree;
......
...@@ -533,7 +533,7 @@ static int pxamci_probe(struct platform_device *pdev) ...@@ -533,7 +533,7 @@ static int pxamci_probe(struct platform_device *pdev)
host->pdata = pdev->dev.platform_data; host->pdata = pdev->dev.platform_data;
host->clkrt = CLKRT_OFF; host->clkrt = CLKRT_OFF;
host->clk = clk_get(&pdev->dev, "MMCCLK"); host->clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(host->clk)) { if (IS_ERR(host->clk)) {
ret = PTR_ERR(host->clk); ret = PTR_ERR(host->clk);
host->clk = NULL; host->clk = NULL;
......
...@@ -1079,7 +1079,7 @@ static int pxa3xx_nand_probe(struct platform_device *pdev) ...@@ -1079,7 +1079,7 @@ static int pxa3xx_nand_probe(struct platform_device *pdev)
this = &info->nand_chip; this = &info->nand_chip;
mtd->priv = info; mtd->priv = info;
info->clk = clk_get(&pdev->dev, "NANDCLK"); info->clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(info->clk)) { if (IS_ERR(info->clk)) {
dev_err(&pdev->dev, "failed to get nand clock\n"); dev_err(&pdev->dev, "failed to get nand clock\n");
ret = PTR_ERR(info->clk); ret = PTR_ERR(info->clk);
......
...@@ -766,7 +766,7 @@ static int serial_pxa_probe(struct platform_device *dev) ...@@ -766,7 +766,7 @@ static int serial_pxa_probe(struct platform_device *dev)
if (!sport) if (!sport)
return -ENOMEM; return -ENOMEM;
sport->clk = clk_get(&dev->dev, "UARTCLK"); sport->clk = clk_get(&dev->dev, NULL);
if (IS_ERR(sport->clk)) { if (IS_ERR(sport->clk)) {
ret = PTR_ERR(sport->clk); ret = PTR_ERR(sport->clk);
goto err_free; goto err_free;
......
...@@ -2145,7 +2145,7 @@ static int __init pxa25x_udc_probe(struct platform_device *pdev) ...@@ -2145,7 +2145,7 @@ static int __init pxa25x_udc_probe(struct platform_device *pdev)
if (irq < 0) if (irq < 0)
return -ENODEV; return -ENODEV;
dev->clk = clk_get(&pdev->dev, "UDCCLK"); dev->clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(dev->clk)) { if (IS_ERR(dev->clk)) {
retval = PTR_ERR(dev->clk); retval = PTR_ERR(dev->clk);
goto err_clk; goto err_clk;
......
...@@ -2226,7 +2226,7 @@ static int __init pxa_udc_probe(struct platform_device *pdev) ...@@ -2226,7 +2226,7 @@ static int __init pxa_udc_probe(struct platform_device *pdev)
udc->dev = &pdev->dev; udc->dev = &pdev->dev;
udc->mach = pdev->dev.platform_data; udc->mach = pdev->dev.platform_data;
udc->clk = clk_get(&pdev->dev, "UDCCLK"); udc->clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(udc->clk)) { if (IS_ERR(udc->clk)) {
retval = PTR_ERR(udc->clk); retval = PTR_ERR(udc->clk);
goto err_clk; goto err_clk;
......
...@@ -296,7 +296,7 @@ int usb_hcd_pxa27x_probe (const struct hc_driver *driver, struct platform_device ...@@ -296,7 +296,7 @@ int usb_hcd_pxa27x_probe (const struct hc_driver *driver, struct platform_device
return -ENXIO; return -ENXIO;
} }
usb_clk = clk_get(&pdev->dev, "USBCLK"); usb_clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(usb_clk)) if (IS_ERR(usb_clk))
return PTR_ERR(usb_clk); return PTR_ERR(usb_clk);
......
...@@ -1429,7 +1429,7 @@ static struct pxafb_info * __devinit pxafb_init_fbinfo(struct device *dev) ...@@ -1429,7 +1429,7 @@ static struct pxafb_info * __devinit pxafb_init_fbinfo(struct device *dev)
memset(fbi, 0, sizeof(struct pxafb_info)); memset(fbi, 0, sizeof(struct pxafb_info));
fbi->dev = dev; fbi->dev = dev;
fbi->clk = clk_get(dev, "LCDCLK"); fbi->clk = clk_get(dev, NULL);
if (IS_ERR(fbi->clk)) { if (IS_ERR(fbi->clk)) {
kfree(fbi); kfree(fbi);
return NULL; return NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment