diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-11 12:52:32 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-27 07:38:23 -0500 |
commit | e0d8b13ae1e3ea747620580b6f777992148de182 (patch) | |
tree | f3d9e65a8d52f3e273b91ddfcd397c1d8438e558 /drivers | |
parent | 8c3abc7d903df492a7394b0adae4349d9a381aaf (diff) |
[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: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/i2c/busses/i2c-pxa.c | 2 | ||||
-rw-r--r-- | drivers/input/keyboard/pxa27x_keypad.c | 2 | ||||
-rw-r--r-- | drivers/media/video/pxa_camera.c | 2 | ||||
-rw-r--r-- | drivers/mmc/host/pxamci.c | 2 | ||||
-rw-r--r-- | drivers/mtd/nand/pxa3xx_nand.c | 2 | ||||
-rw-r--r-- | drivers/serial/pxa.c | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/pxa25x_udc.c | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/pxa27x_udc.c | 2 | ||||
-rw-r--r-- | drivers/usb/host/ohci-pxa27x.c | 2 | ||||
-rw-r--r-- | drivers/video/pxafb.c | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index 906f9b9d715d..587f5b2380d4 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c | |||
@@ -1016,7 +1016,7 @@ static int i2c_pxa_probe(struct platform_device *dev) | |||
1016 | snprintf(i2c->adap.name, sizeof(i2c->adap.name), "pxa_i2c-i2c.%u", | 1016 | snprintf(i2c->adap.name, sizeof(i2c->adap.name), "pxa_i2c-i2c.%u", |
1017 | i2c->adap.nr); | 1017 | i2c->adap.nr); |
1018 | 1018 | ||
1019 | i2c->clk = clk_get(&dev->dev, "I2CCLK"); | 1019 | i2c->clk = clk_get(&dev->dev, NULL); |
1020 | if (IS_ERR(i2c->clk)) { | 1020 | if (IS_ERR(i2c->clk)) { |
1021 | ret = PTR_ERR(i2c->clk); | 1021 | ret = PTR_ERR(i2c->clk); |
1022 | goto eclk; | 1022 | goto eclk; |
diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c index 6d30c6d334c3..0d2fc64a5e1c 100644 --- a/drivers/input/keyboard/pxa27x_keypad.c +++ b/drivers/input/keyboard/pxa27x_keypad.c | |||
@@ -475,7 +475,7 @@ static int __devinit pxa27x_keypad_probe(struct platform_device *pdev) | |||
475 | goto failed_free_mem; | 475 | goto failed_free_mem; |
476 | } | 476 | } |
477 | 477 | ||
478 | keypad->clk = clk_get(&pdev->dev, "KBDCLK"); | 478 | keypad->clk = clk_get(&pdev->dev, NULL); |
479 | if (IS_ERR(keypad->clk)) { | 479 | if (IS_ERR(keypad->clk)) { |
480 | dev_err(&pdev->dev, "failed to get keypad clock\n"); | 480 | dev_err(&pdev->dev, "failed to get keypad clock\n"); |
481 | error = PTR_ERR(keypad->clk); | 481 | error = PTR_ERR(keypad->clk); |
diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c index eb6be5802928..6586f0b13363 100644 --- a/drivers/media/video/pxa_camera.c +++ b/drivers/media/video/pxa_camera.c | |||
@@ -1071,7 +1071,7 @@ static int pxa_camera_probe(struct platform_device *pdev) | |||
1071 | goto exit; | 1071 | goto exit; |
1072 | } | 1072 | } |
1073 | 1073 | ||
1074 | pcdev->clk = clk_get(&pdev->dev, "CAMCLK"); | 1074 | pcdev->clk = clk_get(&pdev->dev, NULL); |
1075 | if (IS_ERR(pcdev->clk)) { | 1075 | if (IS_ERR(pcdev->clk)) { |
1076 | err = PTR_ERR(pcdev->clk); | 1076 | err = PTR_ERR(pcdev->clk); |
1077 | goto exit_kfree; | 1077 | goto exit_kfree; |
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c index ebfaa9960939..a1700a80e2fd 100644 --- a/drivers/mmc/host/pxamci.c +++ b/drivers/mmc/host/pxamci.c | |||
@@ -533,7 +533,7 @@ static int pxamci_probe(struct platform_device *pdev) | |||
533 | host->pdata = pdev->dev.platform_data; | 533 | host->pdata = pdev->dev.platform_data; |
534 | host->clkrt = CLKRT_OFF; | 534 | host->clkrt = CLKRT_OFF; |
535 | 535 | ||
536 | host->clk = clk_get(&pdev->dev, "MMCCLK"); | 536 | host->clk = clk_get(&pdev->dev, NULL); |
537 | if (IS_ERR(host->clk)) { | 537 | if (IS_ERR(host->clk)) { |
538 | ret = PTR_ERR(host->clk); | 538 | ret = PTR_ERR(host->clk); |
539 | host->clk = NULL; | 539 | host->clk = NULL; |
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index c0fa9c9edf08..61c922a8356f 100644 --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c | |||
@@ -1079,7 +1079,7 @@ static int pxa3xx_nand_probe(struct platform_device *pdev) | |||
1079 | this = &info->nand_chip; | 1079 | this = &info->nand_chip; |
1080 | mtd->priv = info; | 1080 | mtd->priv = info; |
1081 | 1081 | ||
1082 | info->clk = clk_get(&pdev->dev, "NANDCLK"); | 1082 | info->clk = clk_get(&pdev->dev, NULL); |
1083 | if (IS_ERR(info->clk)) { | 1083 | if (IS_ERR(info->clk)) { |
1084 | dev_err(&pdev->dev, "failed to get nand clock\n"); | 1084 | dev_err(&pdev->dev, "failed to get nand clock\n"); |
1085 | ret = PTR_ERR(info->clk); | 1085 | ret = PTR_ERR(info->clk); |
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c index abc00be55433..8ea314bc00c1 100644 --- a/drivers/serial/pxa.c +++ b/drivers/serial/pxa.c | |||
@@ -766,7 +766,7 @@ static int serial_pxa_probe(struct platform_device *dev) | |||
766 | if (!sport) | 766 | if (!sport) |
767 | return -ENOMEM; | 767 | return -ENOMEM; |
768 | 768 | ||
769 | sport->clk = clk_get(&dev->dev, "UARTCLK"); | 769 | sport->clk = clk_get(&dev->dev, NULL); |
770 | if (IS_ERR(sport->clk)) { | 770 | if (IS_ERR(sport->clk)) { |
771 | ret = PTR_ERR(sport->clk); | 771 | ret = PTR_ERR(sport->clk); |
772 | goto err_free; | 772 | goto err_free; |
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c index da6e93c201d2..a4790f3c7cd3 100644 --- a/drivers/usb/gadget/pxa25x_udc.c +++ b/drivers/usb/gadget/pxa25x_udc.c | |||
@@ -2145,7 +2145,7 @@ static int __init pxa25x_udc_probe(struct platform_device *pdev) | |||
2145 | if (irq < 0) | 2145 | if (irq < 0) |
2146 | return -ENODEV; | 2146 | return -ENODEV; |
2147 | 2147 | ||
2148 | dev->clk = clk_get(&pdev->dev, "UDCCLK"); | 2148 | dev->clk = clk_get(&pdev->dev, NULL); |
2149 | if (IS_ERR(dev->clk)) { | 2149 | if (IS_ERR(dev->clk)) { |
2150 | retval = PTR_ERR(dev->clk); | 2150 | retval = PTR_ERR(dev->clk); |
2151 | goto err_clk; | 2151 | goto err_clk; |
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c index caa37c95802c..944e4ff641df 100644 --- a/drivers/usb/gadget/pxa27x_udc.c +++ b/drivers/usb/gadget/pxa27x_udc.c | |||
@@ -2226,7 +2226,7 @@ static int __init pxa_udc_probe(struct platform_device *pdev) | |||
2226 | udc->dev = &pdev->dev; | 2226 | udc->dev = &pdev->dev; |
2227 | udc->mach = pdev->dev.platform_data; | 2227 | udc->mach = pdev->dev.platform_data; |
2228 | 2228 | ||
2229 | udc->clk = clk_get(&pdev->dev, "UDCCLK"); | 2229 | udc->clk = clk_get(&pdev->dev, NULL); |
2230 | if (IS_ERR(udc->clk)) { | 2230 | if (IS_ERR(udc->clk)) { |
2231 | retval = PTR_ERR(udc->clk); | 2231 | retval = PTR_ERR(udc->clk); |
2232 | goto err_clk; | 2232 | goto err_clk; |
diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c index e294d430733b..e44dc2cbca24 100644 --- a/drivers/usb/host/ohci-pxa27x.c +++ b/drivers/usb/host/ohci-pxa27x.c | |||
@@ -296,7 +296,7 @@ int usb_hcd_pxa27x_probe (const struct hc_driver *driver, struct platform_device | |||
296 | return -ENXIO; | 296 | return -ENXIO; |
297 | } | 297 | } |
298 | 298 | ||
299 | usb_clk = clk_get(&pdev->dev, "USBCLK"); | 299 | usb_clk = clk_get(&pdev->dev, NULL); |
300 | if (IS_ERR(usb_clk)) | 300 | if (IS_ERR(usb_clk)) |
301 | return PTR_ERR(usb_clk); | 301 | return PTR_ERR(usb_clk); |
302 | 302 | ||
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c index cc59c52e1103..0bc2c5a127b9 100644 --- a/drivers/video/pxafb.c +++ b/drivers/video/pxafb.c | |||
@@ -1429,7 +1429,7 @@ static struct pxafb_info * __devinit pxafb_init_fbinfo(struct device *dev) | |||
1429 | memset(fbi, 0, sizeof(struct pxafb_info)); | 1429 | memset(fbi, 0, sizeof(struct pxafb_info)); |
1430 | fbi->dev = dev; | 1430 | fbi->dev = dev; |
1431 | 1431 | ||
1432 | fbi->clk = clk_get(dev, "LCDCLK"); | 1432 | fbi->clk = clk_get(dev, NULL); |
1433 | if (IS_ERR(fbi->clk)) { | 1433 | if (IS_ERR(fbi->clk)) { |
1434 | kfree(fbi); | 1434 | kfree(fbi); |
1435 | return NULL; | 1435 | return NULL; |