lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ARM] 4971/1: pxaficp_ir: provide startup and shutdown hooks

Browse Source 
Let platform do some specific initialisation and cleanup
things during pxaficp_ir probing and removing. E.g. this
can be usefull to request/free gpios used by the platform
to control the transceiver.

Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Dmitry Baryshkov
2008-04-12 20:08:16 +01:00
committed by Russell King
parent e21e2d467a
commit baf1c5d2a0
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/irda/pxaficp_ir.c
View File

@@ -832,6 +832,11 @@ static int pxa_irda_probe(struct platform_device *pdev)
if (err) if (err)
goto err_mem_5; goto err_mem_5;
if (si->pdata->startup)
err = si->pdata->startup(si->dev);
if (err)
goto err_startup;
dev->hard_start_xmit = pxa_irda_hard_xmit; dev->hard_start_xmit = pxa_irda_hard_xmit;
dev->open = pxa_irda_start; dev->open = pxa_irda_start;
dev->stop = pxa_irda_stop; dev->stop = pxa_irda_stop;
@@ -857,6 +862,9 @@ static int pxa_irda_probe(struct platform_device *pdev)
dev_set_drvdata(&pdev->dev, dev); dev_set_drvdata(&pdev->dev, dev);
if (err) { if (err) {
if (si->pdata->shutdown)
si->pdata->shutdown(si->dev);
err_startup:
kfree(si->tx_buff.head); kfree(si->tx_buff.head);
err_mem_5: err_mem_5:
kfree(si->rx_buff.head); kfree(si->rx_buff.head);
@@ -882,6 +890,8 @@ static int pxa_irda_remove(struct platform_device *_dev)
if (dev) { if (dev) {
struct pxa_irda *si = netdev_priv(dev); struct pxa_irda *si = netdev_priv(dev);
unregister_netdev(dev); unregister_netdev(dev);
if (si->pdata->shutdown)
si->pdata->shutdown(si->dev);
kfree(si->tx_buff.head); kfree(si->tx_buff.head);
kfree(si->rx_buff.head); kfree(si->rx_buff.head);
clk_put(si->fir_clk); clk_put(si->fir_clk);

2
include/asm-arm/arch-pxa/irda.h
View File

@@ -10,6 +10,8 @@
struct pxaficp_platform_data { struct pxaficp_platform_data {
int transceiver_cap; int transceiver_cap;
void (*transceiver_mode)(struct device *dev, int mode); void (*transceiver_mode)(struct device *dev, int mode);
int (*startup)(struct device *dev);
void (*shutdown)(struct device *dev);
}; };
extern void pxa_set_ficp_info(struct pxaficp_platform_data *info); extern void pxa_set_ficp_info(struct pxaficp_platform_data *info);