mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel
This commit is contained in:
Linus Torvalds
commit
5643f000c1
95 changed files with 1501 additions and 1416 deletions
|
|
@ -398,13 +398,19 @@ static struct mca_driver depca_mca_driver = {
|
|||
};
|
||||
#endif
|
||||
|
||||
static int depca_isa_probe (struct device *);
|
||||
static int depca_isa_probe (struct platform_device *);
|
||||
|
||||
static struct device_driver depca_isa_driver = {
|
||||
.name = depca_string,
|
||||
.bus = &platform_bus_type,
|
||||
static int __devexit depca_isa_remove(struct platform_device *pdev)
|
||||
{
|
||||
return depca_device_remove(&pdev->dev);
|
||||
}
|
||||
|
||||
static struct platform_driver depca_isa_driver = {
|
||||
.probe = depca_isa_probe,
|
||||
.remove = __devexit_p(depca_device_remove),
|
||||
.remove = __devexit_p(depca_isa_remove),
|
||||
.driver = {
|
||||
.name = depca_string,
|
||||
},
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
@ -1525,7 +1531,7 @@ static enum depca_type __init depca_shmem_probe (ulong *mem_start)
|
|||
return adapter;
|
||||
}
|
||||
|
||||
static int __init depca_isa_probe (struct device *device)
|
||||
static int __init depca_isa_probe (struct platform_device *device)
|
||||
{
|
||||
struct net_device *dev;
|
||||
struct depca_private *lp;
|
||||
|
|
@ -1533,7 +1539,7 @@ static int __init depca_isa_probe (struct device *device)
|
|||
enum depca_type adapter = unknown;
|
||||
int status = 0;
|
||||
|
||||
ioaddr = (u_long) device->platform_data;
|
||||
ioaddr = (u_long) device->dev.platform_data;
|
||||
|
||||
if ((status = depca_common_init (ioaddr, &dev)))
|
||||
goto out;
|
||||
|
|
@ -1553,7 +1559,7 @@ static int __init depca_isa_probe (struct device *device)
|
|||
lp->adapter = adapter;
|
||||
lp->mem_start = mem_start;
|
||||
|
||||
if ((status = depca_hw_init(dev, device)))
|
||||
if ((status = depca_hw_init(dev, &device->dev)))
|
||||
goto out_free;
|
||||
|
||||
return 0;
|
||||
|
|
@ -2082,7 +2088,7 @@ static int __init depca_module_init (void)
|
|||
#ifdef CONFIG_EISA
|
||||
err |= eisa_driver_register (&depca_eisa_driver);
|
||||
#endif
|
||||
err |= driver_register (&depca_isa_driver);
|
||||
err |= platform_driver_register (&depca_isa_driver);
|
||||
depca_platform_probe ();
|
||||
|
||||
return err;
|
||||
|
|
@ -2097,7 +2103,7 @@ static void __exit depca_module_exit (void)
|
|||
#ifdef CONFIG_EISA
|
||||
eisa_driver_unregister (&depca_eisa_driver);
|
||||
#endif
|
||||
driver_unregister (&depca_isa_driver);
|
||||
platform_driver_unregister (&depca_isa_driver);
|
||||
|
||||
for (i = 0; depca_io_ports[i].iobase; i++) {
|
||||
if (depca_io_ports[i].device) {
|
||||
|
|
|
|||
|
|
@ -148,7 +148,7 @@ typedef struct board_info {
|
|||
} board_info_t;
|
||||
|
||||
/* function declaration ------------------------------------- */
|
||||
static int dm9000_probe(struct device *);
|
||||
static int dm9000_probe(struct platform_device *);
|
||||
static int dm9000_open(struct net_device *);
|
||||
static int dm9000_start_xmit(struct sk_buff *, struct net_device *);
|
||||
static int dm9000_stop(struct net_device *);
|
||||
|
|
@ -378,9 +378,8 @@ dm9000_release_board(struct platform_device *pdev, struct board_info *db)
|
|||
* Search DM9000 board, allocate space and register it
|
||||
*/
|
||||
static int
|
||||
dm9000_probe(struct device *dev)
|
||||
dm9000_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct platform_device *pdev = to_platform_device(dev);
|
||||
struct dm9000_plat_data *pdata = pdev->dev.platform_data;
|
||||
struct board_info *db; /* Point a board information structure */
|
||||
struct net_device *ndev;
|
||||
|
|
@ -398,7 +397,7 @@ dm9000_probe(struct device *dev)
|
|||
}
|
||||
|
||||
SET_MODULE_OWNER(ndev);
|
||||
SET_NETDEV_DEV(ndev, dev);
|
||||
SET_NETDEV_DEV(ndev, &pdev->dev);
|
||||
|
||||
PRINTK2("dm9000_probe()");
|
||||
|
||||
|
|
@ -569,7 +568,7 @@ dm9000_probe(struct device *dev)
|
|||
printk("%s: Invalid ethernet MAC address. Please "
|
||||
"set using ifconfig\n", ndev->name);
|
||||
|
||||
dev_set_drvdata(dev, ndev);
|
||||
platform_set_drvdata(pdev, ndev);
|
||||
ret = register_netdev(ndev);
|
||||
|
||||
if (ret == 0) {
|
||||
|
|
@ -1140,9 +1139,9 @@ dm9000_phy_write(struct net_device *dev, int phyaddr_unused, int reg, int value)
|
|||
}
|
||||
|
||||
static int
|
||||
dm9000_drv_suspend(struct device *dev, pm_message_t state)
|
||||
dm9000_drv_suspend(struct platform_device *dev, pm_message_t state)
|
||||
{
|
||||
struct net_device *ndev = dev_get_drvdata(dev);
|
||||
struct net_device *ndev = platform_get_drvdata(dev);
|
||||
|
||||
if (ndev) {
|
||||
if (netif_running(ndev)) {
|
||||
|
|
@ -1154,9 +1153,9 @@ dm9000_drv_suspend(struct device *dev, pm_message_t state)
|
|||
}
|
||||
|
||||
static int
|
||||
dm9000_drv_resume(struct device *dev)
|
||||
dm9000_drv_resume(struct platform_device *dev)
|
||||
{
|
||||
struct net_device *ndev = dev_get_drvdata(dev);
|
||||
struct net_device *ndev = platform_get_drvdata(dev);
|
||||
board_info_t *db = (board_info_t *) ndev->priv;
|
||||
|
||||
if (ndev) {
|
||||
|
|
@ -1172,12 +1171,11 @@ dm9000_drv_resume(struct device *dev)
|
|||
}
|
||||
|
||||
static int
|
||||
dm9000_drv_remove(struct device *dev)
|
||||
dm9000_drv_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct platform_device *pdev = to_platform_device(dev);
|
||||
struct net_device *ndev = dev_get_drvdata(dev);
|
||||
struct net_device *ndev = platform_get_drvdata(pdev);
|
||||
|
||||
dev_set_drvdata(dev, NULL);
|
||||
platform_set_drvdata(pdev, NULL);
|
||||
|
||||
unregister_netdev(ndev);
|
||||
dm9000_release_board(pdev, (board_info_t *) ndev->priv);
|
||||
|
|
@ -1188,13 +1186,14 @@ dm9000_drv_remove(struct device *dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static struct device_driver dm9000_driver = {
|
||||
.name = "dm9000",
|
||||
.bus = &platform_bus_type,
|
||||
static struct platform_driver dm9000_driver = {
|
||||
.probe = dm9000_probe,
|
||||
.remove = dm9000_drv_remove,
|
||||
.suspend = dm9000_drv_suspend,
|
||||
.resume = dm9000_drv_resume,
|
||||
.driver = {
|
||||
.name = "dm9000",
|
||||
},
|
||||
};
|
||||
|
||||
static int __init
|
||||
|
|
@ -1202,13 +1201,13 @@ dm9000_init(void)
|
|||
{
|
||||
printk(KERN_INFO "%s Ethernet Driver\n", CARDNAME);
|
||||
|
||||
return driver_register(&dm9000_driver); /* search board and register */
|
||||
return platform_driver_register(&dm9000_driver); /* search board and register */
|
||||
}
|
||||
|
||||
static void __exit
|
||||
dm9000_cleanup(void)
|
||||
{
|
||||
driver_unregister(&dm9000_driver);
|
||||
platform_driver_unregister(&dm9000_driver);
|
||||
}
|
||||
|
||||
module_init(dm9000_init);
|
||||
|
|
|
|||
|
|
@ -126,8 +126,8 @@ static irqreturn_t gfar_interrupt(int irq, void *dev_id, struct pt_regs *regs);
|
|||
static void adjust_link(struct net_device *dev);
|
||||
static void init_registers(struct net_device *dev);
|
||||
static int init_phy(struct net_device *dev);
|
||||
static int gfar_probe(struct device *device);
|
||||
static int gfar_remove(struct device *device);
|
||||
static int gfar_probe(struct platform_device *pdev);
|
||||
static int gfar_remove(struct platform_device *pdev);
|
||||
static void free_skb_resources(struct gfar_private *priv);
|
||||
static void gfar_set_multi(struct net_device *dev);
|
||||
static void gfar_set_hash_for_addr(struct net_device *dev, u8 *addr);
|
||||
|
|
@ -156,12 +156,11 @@ int gfar_uses_fcb(struct gfar_private *priv)
|
|||
|
||||
/* Set up the ethernet device structure, private data,
|
||||
* and anything else we need before we start */
|
||||
static int gfar_probe(struct device *device)
|
||||
static int gfar_probe(struct platform_device *pdev)
|
||||
{
|
||||
u32 tempval;
|
||||
struct net_device *dev = NULL;
|
||||
struct gfar_private *priv = NULL;
|
||||
struct platform_device *pdev = to_platform_device(device);
|
||||
struct gianfar_platform_data *einfo;
|
||||
struct resource *r;
|
||||
int idx;
|
||||
|
|
@ -208,7 +207,7 @@ static int gfar_probe(struct device *device)
|
|||
|
||||
spin_lock_init(&priv->lock);
|
||||
|
||||
dev_set_drvdata(device, dev);
|
||||
platform_set_drvdata(pdev, dev);
|
||||
|
||||
/* Stop the DMA engine now, in case it was running before */
|
||||
/* (The firmware could have used it, and left it running). */
|
||||
|
|
@ -245,7 +244,7 @@ static int gfar_probe(struct device *device)
|
|||
dev->base_addr = (unsigned long) (priv->regs);
|
||||
|
||||
SET_MODULE_OWNER(dev);
|
||||
SET_NETDEV_DEV(dev, device);
|
||||
SET_NETDEV_DEV(dev, &pdev->dev);
|
||||
|
||||
/* Fill in the dev structure */
|
||||
dev->open = gfar_enet_open;
|
||||
|
|
@ -377,12 +376,12 @@ regs_fail:
|
|||
return err;
|
||||
}
|
||||
|
||||
static int gfar_remove(struct device *device)
|
||||
static int gfar_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct net_device *dev = dev_get_drvdata(device);
|
||||
struct net_device *dev = platform_get_drvdata(pdev);
|
||||
struct gfar_private *priv = netdev_priv(dev);
|
||||
|
||||
dev_set_drvdata(device, NULL);
|
||||
platform_set_drvdata(pdev, NULL);
|
||||
|
||||
iounmap((void *) priv->regs);
|
||||
free_netdev(dev);
|
||||
|
|
@ -1861,11 +1860,12 @@ static irqreturn_t gfar_error(int irq, void *dev_id, struct pt_regs *regs)
|
|||
}
|
||||
|
||||
/* Structure for a device driver */
|
||||
static struct device_driver gfar_driver = {
|
||||
.name = "fsl-gianfar",
|
||||
.bus = &platform_bus_type,
|
||||
static struct platform_driver gfar_driver = {
|
||||
.probe = gfar_probe,
|
||||
.remove = gfar_remove,
|
||||
.driver = {
|
||||
.name = "fsl-gianfar",
|
||||
},
|
||||
};
|
||||
|
||||
static int __init gfar_init(void)
|
||||
|
|
@ -1875,7 +1875,7 @@ static int __init gfar_init(void)
|
|||
if (err)
|
||||
return err;
|
||||
|
||||
err = driver_register(&gfar_driver);
|
||||
err = platform_driver_register(&gfar_driver);
|
||||
|
||||
if (err)
|
||||
gfar_mdio_exit();
|
||||
|
|
@ -1885,7 +1885,7 @@ static int __init gfar_init(void)
|
|||
|
||||
static void __exit gfar_exit(void)
|
||||
{
|
||||
driver_unregister(&gfar_driver);
|
||||
platform_driver_unregister(&gfar_driver);
|
||||
gfar_mdio_exit();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -291,9 +291,9 @@ static void sa1100_irda_shutdown(struct sa1100_irda *si)
|
|||
/*
|
||||
* Suspend the IrDA interface.
|
||||
*/
|
||||
static int sa1100_irda_suspend(struct device *_dev, pm_message_t state)
|
||||
static int sa1100_irda_suspend(struct platform_device *pdev, pm_message_t state)
|
||||
{
|
||||
struct net_device *dev = dev_get_drvdata(_dev);
|
||||
struct net_device *dev = platform_get_drvdata(pdev);
|
||||
struct sa1100_irda *si;
|
||||
|
||||
if (!dev)
|
||||
|
|
@ -316,9 +316,9 @@ static int sa1100_irda_suspend(struct device *_dev, pm_message_t state)
|
|||
/*
|
||||
* Resume the IrDA interface.
|
||||
*/
|
||||
static int sa1100_irda_resume(struct device *_dev)
|
||||
static int sa1100_irda_resume(struct platform_device *pdev)
|
||||
{
|
||||
struct net_device *dev = dev_get_drvdata(_dev);
|
||||
struct net_device *dev = platform_get_drvdata(pdev);
|
||||
struct sa1100_irda *si;
|
||||
|
||||
if (!dev)
|
||||
|
|
@ -886,9 +886,8 @@ static int sa1100_irda_init_iobuf(iobuff_t *io, int size)
|
|||
return io->head ? 0 : -ENOMEM;
|
||||
}
|
||||
|
||||
static int sa1100_irda_probe(struct device *_dev)
|
||||
static int sa1100_irda_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct platform_device *pdev = to_platform_device(_dev);
|
||||
struct net_device *dev;
|
||||
struct sa1100_irda *si;
|
||||
unsigned int baudrate_mask;
|
||||
|
|
@ -967,7 +966,7 @@ static int sa1100_irda_probe(struct device *_dev)
|
|||
|
||||
err = register_netdev(dev);
|
||||
if (err == 0)
|
||||
dev_set_drvdata(&pdev->dev, dev);
|
||||
platform_set_drvdata(pdev, dev);
|
||||
|
||||
if (err) {
|
||||
err_mem_5:
|
||||
|
|
@ -985,9 +984,9 @@ static int sa1100_irda_probe(struct device *_dev)
|
|||
return err;
|
||||
}
|
||||
|
||||
static int sa1100_irda_remove(struct device *_dev)
|
||||
static int sa1100_irda_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct net_device *dev = dev_get_drvdata(_dev);
|
||||
struct net_device *dev = platform_get_drvdata(pdev);
|
||||
|
||||
if (dev) {
|
||||
struct sa1100_irda *si = dev->priv;
|
||||
|
|
@ -1004,13 +1003,14 @@ static int sa1100_irda_remove(struct device *_dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static struct device_driver sa1100ir_driver = {
|
||||
.name = "sa11x0-ir",
|
||||
.bus = &platform_bus_type,
|
||||
static struct platform_driver sa1100ir_driver = {
|
||||
.probe = sa1100_irda_probe,
|
||||
.remove = sa1100_irda_remove,
|
||||
.suspend = sa1100_irda_suspend,
|
||||
.resume = sa1100_irda_resume,
|
||||
.driver = {
|
||||
.name = "sa11x0-ir",
|
||||
},
|
||||
};
|
||||
|
||||
static int __init sa1100_irda_init(void)
|
||||
|
|
@ -1023,12 +1023,12 @@ static int __init sa1100_irda_init(void)
|
|||
if (power_level > 3)
|
||||
power_level = 3;
|
||||
|
||||
return driver_register(&sa1100ir_driver);
|
||||
return platform_driver_register(&sa1100ir_driver);
|
||||
}
|
||||
|
||||
static void __exit sa1100_irda_exit(void)
|
||||
{
|
||||
driver_unregister(&sa1100ir_driver);
|
||||
platform_driver_unregister(&sa1100ir_driver);
|
||||
}
|
||||
|
||||
module_init(sa1100_irda_init);
|
||||
|
|
|
|||
|
|
@ -214,14 +214,15 @@ static int smsc_ircc_probe_transceiver_smsc_ircc_atc(int fir_base);
|
|||
|
||||
/* Power Management */
|
||||
|
||||
static int smsc_ircc_suspend(struct device *dev, pm_message_t state);
|
||||
static int smsc_ircc_resume(struct device *dev);
|
||||
static int smsc_ircc_suspend(struct platform_device *dev, pm_message_t state);
|
||||
static int smsc_ircc_resume(struct platform_device *dev);
|
||||
|
||||
static struct device_driver smsc_ircc_driver = {
|
||||
.name = SMSC_IRCC2_DRIVER_NAME,
|
||||
.bus = &platform_bus_type,
|
||||
static struct platform_driver smsc_ircc_driver = {
|
||||
.suspend = smsc_ircc_suspend,
|
||||
.resume = smsc_ircc_resume,
|
||||
.driver = {
|
||||
.name = SMSC_IRCC2_DRIVER_NAME,
|
||||
},
|
||||
};
|
||||
|
||||
/* Transceivers for SMSC-ircc */
|
||||
|
|
@ -346,7 +347,7 @@ static int __init smsc_ircc_init(void)
|
|||
|
||||
IRDA_DEBUG(1, "%s\n", __FUNCTION__);
|
||||
|
||||
ret = driver_register(&smsc_ircc_driver);
|
||||
ret = platform_driver_register(&smsc_ircc_driver);
|
||||
if (ret) {
|
||||
IRDA_ERROR("%s, Can't register driver!\n", driver_name);
|
||||
return ret;
|
||||
|
|
@ -378,7 +379,7 @@ static int __init smsc_ircc_init(void)
|
|||
}
|
||||
|
||||
if (ret)
|
||||
driver_unregister(&smsc_ircc_driver);
|
||||
platform_driver_unregister(&smsc_ircc_driver);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -491,7 +492,7 @@ static int __init smsc_ircc_open(unsigned int fir_base, unsigned int sir_base, u
|
|||
err = PTR_ERR(self->pldev);
|
||||
goto err_out5;
|
||||
}
|
||||
dev_set_drvdata(&self->pldev->dev, self);
|
||||
platform_set_drvdata(self->pldev, self);
|
||||
|
||||
IRDA_MESSAGE("IrDA: Registered device %s\n", dev->name);
|
||||
dev_count++;
|
||||
|
|
@ -1685,9 +1686,9 @@ static int smsc_ircc_net_close(struct net_device *dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int smsc_ircc_suspend(struct device *dev, pm_message_t state)
|
||||
static int smsc_ircc_suspend(struct platform_device *dev, pm_message_t state)
|
||||
{
|
||||
struct smsc_ircc_cb *self = dev_get_drvdata(dev);
|
||||
struct smsc_ircc_cb *self = platform_get_drvdata(dev);
|
||||
|
||||
if (!self->io.suspended) {
|
||||
IRDA_DEBUG(1, "%s, Suspending\n", driver_name);
|
||||
|
|
@ -1706,9 +1707,9 @@ static int smsc_ircc_suspend(struct device *dev, pm_message_t state)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int smsc_ircc_resume(struct device *dev)
|
||||
static int smsc_ircc_resume(struct platform_device *dev)
|
||||
{
|
||||
struct smsc_ircc_cb *self = dev_get_drvdata(dev);
|
||||
struct smsc_ircc_cb *self = platform_get_drvdata(dev);
|
||||
|
||||
if (self->io.suspended) {
|
||||
IRDA_DEBUG(1, "%s, Waking up\n", driver_name);
|
||||
|
|
@ -1788,7 +1789,7 @@ static void __exit smsc_ircc_cleanup(void)
|
|||
smsc_ircc_close(dev_self[i]);
|
||||
}
|
||||
|
||||
driver_unregister(&smsc_ircc_driver);
|
||||
platform_driver_unregister(&smsc_ircc_driver);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -194,7 +194,7 @@ out:
|
|||
* Probe for a SONIC ethernet controller on a Mips Jazz board.
|
||||
* Actually probing is superfluous but we're paranoid.
|
||||
*/
|
||||
static int __init jazz_sonic_probe(struct device *device)
|
||||
static int __init jazz_sonic_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct net_device *dev;
|
||||
struct sonic_local *lp;
|
||||
|
|
@ -212,8 +212,8 @@ static int __init jazz_sonic_probe(struct device *device)
|
|||
return -ENOMEM;
|
||||
|
||||
lp = netdev_priv(dev);
|
||||
lp->device = device;
|
||||
SET_NETDEV_DEV(dev, device);
|
||||
lp->device = &pdev->dev;
|
||||
SET_NETDEV_DEV(dev, &pdev->dev);
|
||||
SET_MODULE_OWNER(dev);
|
||||
|
||||
netdev_boot_setup_check(dev);
|
||||
|
|
@ -264,9 +264,9 @@ MODULE_PARM_DESC(sonic_debug, "jazzsonic debug level (1-4)");
|
|||
|
||||
#include "sonic.c"
|
||||
|
||||
static int __devexit jazz_sonic_device_remove (struct device *device)
|
||||
static int __devexit jazz_sonic_device_remove (struct platform_device *pdev)
|
||||
{
|
||||
struct net_device *dev = device->driver_data;
|
||||
struct net_device *dev = platform_get_drvdata(pdev);
|
||||
struct sonic_local* lp = netdev_priv(dev);
|
||||
|
||||
unregister_netdev (dev);
|
||||
|
|
@ -278,18 +278,19 @@ static int __devexit jazz_sonic_device_remove (struct device *device)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static struct device_driver jazz_sonic_driver = {
|
||||
.name = jazz_sonic_string,
|
||||
.bus = &platform_bus_type,
|
||||
static struct platform_driver jazz_sonic_driver = {
|
||||
.probe = jazz_sonic_probe,
|
||||
.remove = __devexit_p(jazz_sonic_device_remove),
|
||||
.driver = {
|
||||
.name = jazz_sonic_string,
|
||||
},
|
||||
};
|
||||
|
||||
static int __init jazz_sonic_init_module(void)
|
||||
{
|
||||
int err;
|
||||
|
||||
if ((err = driver_register(&jazz_sonic_driver))) {
|
||||
if ((err = platform_driver_register(&jazz_sonic_driver))) {
|
||||
printk(KERN_ERR "Driver registration failed\n");
|
||||
return err;
|
||||
}
|
||||
|
|
@ -313,7 +314,7 @@ out_unregister:
|
|||
|
||||
static void __exit jazz_sonic_cleanup_module(void)
|
||||
{
|
||||
driver_unregister(&jazz_sonic_driver);
|
||||
platform_driver_unregister(&jazz_sonic_driver);
|
||||
|
||||
if (jazz_sonic_device) {
|
||||
platform_device_unregister(jazz_sonic_device);
|
||||
|
|
|
|||
|
|
@ -525,7 +525,7 @@ int __init mac_nubus_sonic_probe(struct net_device* dev)
|
|||
return macsonic_init(dev);
|
||||
}
|
||||
|
||||
static int __init mac_sonic_probe(struct device *device)
|
||||
static int __init mac_sonic_probe(struct platform_device *device)
|
||||
{
|
||||
struct net_device *dev;
|
||||
struct sonic_local *lp;
|
||||
|
|
@ -537,8 +537,8 @@ static int __init mac_sonic_probe(struct device *device)
|
|||
return -ENOMEM;
|
||||
|
||||
lp = netdev_priv(dev);
|
||||
lp->device = device;
|
||||
SET_NETDEV_DEV(dev, device);
|
||||
lp->device = &device->dev;
|
||||
SET_NETDEV_DEV(dev, &device->dev);
|
||||
SET_MODULE_OWNER(dev);
|
||||
|
||||
/* This will catch fatal stuff like -ENOMEM as well as success */
|
||||
|
|
@ -579,9 +579,9 @@ MODULE_PARM_DESC(sonic_debug, "macsonic debug level (1-4)");
|
|||
|
||||
#include "sonic.c"
|
||||
|
||||
static int __devexit mac_sonic_device_remove (struct device *device)
|
||||
static int __devexit mac_sonic_device_remove (struct platform_device *device)
|
||||
{
|
||||
struct net_device *dev = device->driver_data;
|
||||
struct net_device *dev = platform_get_drvdata(device);
|
||||
struct sonic_local* lp = netdev_priv(dev);
|
||||
|
||||
unregister_netdev (dev);
|
||||
|
|
@ -592,18 +592,19 @@ static int __devexit mac_sonic_device_remove (struct device *device)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static struct device_driver mac_sonic_driver = {
|
||||
.name = mac_sonic_string,
|
||||
.bus = &platform_bus_type,
|
||||
static struct platform_driver mac_sonic_driver = {
|
||||
.probe = mac_sonic_probe,
|
||||
.remove = __devexit_p(mac_sonic_device_remove),
|
||||
.driver = {
|
||||
.name = mac_sonic_string,
|
||||
},
|
||||
};
|
||||
|
||||
static int __init mac_sonic_init_module(void)
|
||||
{
|
||||
int err;
|
||||
|
||||
if ((err = driver_register(&mac_sonic_driver))) {
|
||||
if ((err = platform_driver_register(&mac_sonic_driver))) {
|
||||
printk(KERN_ERR "Driver registration failed\n");
|
||||
return err;
|
||||
}
|
||||
|
|
@ -628,7 +629,7 @@ out_unregister:
|
|||
|
||||
static void __exit mac_sonic_cleanup_module(void)
|
||||
{
|
||||
driver_unregister(&mac_sonic_driver);
|
||||
platform_driver_unregister(&mac_sonic_driver);
|
||||
|
||||
if (mac_sonic_device) {
|
||||
platform_device_unregister(mac_sonic_device);
|
||||
|
|
|
|||
|
|
@ -1387,9 +1387,8 @@ static void mv643xx_netpoll(struct net_device *netdev)
|
|||
* Input : struct device *
|
||||
* Output : -ENOMEM if failed , 0 if success
|
||||
*/
|
||||
static int mv643xx_eth_probe(struct device *ddev)
|
||||
static int mv643xx_eth_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct platform_device *pdev = to_platform_device(ddev);
|
||||
struct mv643xx_eth_platform_data *pd;
|
||||
int port_num = pdev->id;
|
||||
struct mv643xx_private *mp;
|
||||
|
|
@ -1402,7 +1401,7 @@ static int mv643xx_eth_probe(struct device *ddev)
|
|||
if (!dev)
|
||||
return -ENOMEM;
|
||||
|
||||
dev_set_drvdata(ddev, dev);
|
||||
platform_set_drvdata(pdev, dev);
|
||||
|
||||
mp = netdev_priv(dev);
|
||||
|
||||
|
|
@ -1546,21 +1545,20 @@ out:
|
|||
return err;
|
||||
}
|
||||
|
||||
static int mv643xx_eth_remove(struct device *ddev)
|
||||
static int mv643xx_eth_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct net_device *dev = dev_get_drvdata(ddev);
|
||||
struct net_device *dev = platform_get_drvdata(pdev);
|
||||
|
||||
unregister_netdev(dev);
|
||||
flush_scheduled_work();
|
||||
|
||||
free_netdev(dev);
|
||||
dev_set_drvdata(ddev, NULL);
|
||||
platform_set_drvdata(pdev, NULL);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int mv643xx_eth_shared_probe(struct device *ddev)
|
||||
static int mv643xx_eth_shared_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct platform_device *pdev = to_platform_device(ddev);
|
||||
struct resource *res;
|
||||
|
||||
printk(KERN_NOTICE "MV-643xx 10/100/1000 Ethernet Driver\n");
|
||||
|
|
@ -1578,7 +1576,7 @@ static int mv643xx_eth_shared_probe(struct device *ddev)
|
|||
|
||||
}
|
||||
|
||||
static int mv643xx_eth_shared_remove(struct device *ddev)
|
||||
static int mv643xx_eth_shared_remove(struct platform_device *pdev)
|
||||
{
|
||||
iounmap(mv643xx_eth_shared_base);
|
||||
mv643xx_eth_shared_base = NULL;
|
||||
|
|
@ -1586,18 +1584,20 @@ static int mv643xx_eth_shared_remove(struct device *ddev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static struct device_driver mv643xx_eth_driver = {
|
||||
.name = MV643XX_ETH_NAME,
|
||||
.bus = &platform_bus_type,
|
||||
static struct platform_driver mv643xx_eth_driver = {
|
||||
.probe = mv643xx_eth_probe,
|
||||
.remove = mv643xx_eth_remove,
|
||||
.driver = {
|
||||
.name = MV643XX_ETH_NAME,
|
||||
},
|
||||
};
|
||||
|
||||
static struct device_driver mv643xx_eth_shared_driver = {
|
||||
.name = MV643XX_ETH_SHARED_NAME,
|
||||
.bus = &platform_bus_type,
|
||||
static struct platform_driver mv643xx_eth_shared_driver = {
|
||||
.probe = mv643xx_eth_shared_probe,
|
||||
.remove = mv643xx_eth_shared_remove,
|
||||
.driver = {
|
||||
.name = MV643XX_ETH_SHARED_NAME,
|
||||
},
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
@ -1613,11 +1613,11 @@ static int __init mv643xx_init_module(void)
|
|||
{
|
||||
int rc;
|
||||
|
||||
rc = driver_register(&mv643xx_eth_shared_driver);
|
||||
rc = platform_driver_register(&mv643xx_eth_shared_driver);
|
||||
if (!rc) {
|
||||
rc = driver_register(&mv643xx_eth_driver);
|
||||
rc = platform_driver_register(&mv643xx_eth_driver);
|
||||
if (rc)
|
||||
driver_unregister(&mv643xx_eth_shared_driver);
|
||||
platform_driver_unregister(&mv643xx_eth_shared_driver);
|
||||
}
|
||||
return rc;
|
||||
}
|
||||
|
|
@ -1633,8 +1633,8 @@ static int __init mv643xx_init_module(void)
|
|||
*/
|
||||
static void __exit mv643xx_cleanup_module(void)
|
||||
{
|
||||
driver_unregister(&mv643xx_eth_driver);
|
||||
driver_unregister(&mv643xx_eth_shared_driver);
|
||||
platform_driver_unregister(&mv643xx_eth_driver);
|
||||
platform_driver_unregister(&mv643xx_eth_shared_driver);
|
||||
}
|
||||
|
||||
module_init(mv643xx_init_module);
|
||||
|
|
|
|||
|
|
@ -2183,9 +2183,8 @@ static void smc_release_datacs(struct platform_device *pdev, struct net_device *
|
|||
* 0 --> there is a device
|
||||
* anything else, error
|
||||
*/
|
||||
static int smc_drv_probe(struct device *dev)
|
||||
static int smc_drv_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct platform_device *pdev = to_platform_device(dev);
|
||||
struct net_device *ndev;
|
||||
struct resource *res;
|
||||
unsigned int __iomem *addr;
|
||||
|
|
@ -2212,7 +2211,7 @@ static int smc_drv_probe(struct device *dev)
|
|||
goto out_release_io;
|
||||
}
|
||||
SET_MODULE_OWNER(ndev);
|
||||
SET_NETDEV_DEV(ndev, dev);
|
||||
SET_NETDEV_DEV(ndev, &pdev->dev);
|
||||
|
||||
ndev->dma = (unsigned char)-1;
|
||||
ndev->irq = platform_get_irq(pdev, 0);
|
||||
|
|
@ -2233,7 +2232,7 @@ static int smc_drv_probe(struct device *dev)
|
|||
goto out_release_attrib;
|
||||
}
|
||||
|
||||
dev_set_drvdata(dev, ndev);
|
||||
platform_set_drvdata(pdev, ndev);
|
||||
ret = smc_probe(ndev, addr);
|
||||
if (ret != 0)
|
||||
goto out_iounmap;
|
||||
|
|
@ -2249,7 +2248,7 @@ static int smc_drv_probe(struct device *dev)
|
|||
return 0;
|
||||
|
||||
out_iounmap:
|
||||
dev_set_drvdata(dev, NULL);
|
||||
platform_set_drvdata(pdev, NULL);
|
||||
iounmap(addr);
|
||||
out_release_attrib:
|
||||
smc_release_attrib(pdev);
|
||||
|
|
@ -2263,14 +2262,13 @@ static int smc_drv_probe(struct device *dev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int smc_drv_remove(struct device *dev)
|
||||
static int smc_drv_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct platform_device *pdev = to_platform_device(dev);
|
||||
struct net_device *ndev = dev_get_drvdata(dev);
|
||||
struct net_device *ndev = platform_get_drvdata(pdev);
|
||||
struct smc_local *lp = netdev_priv(ndev);
|
||||
struct resource *res;
|
||||
|
||||
dev_set_drvdata(dev, NULL);
|
||||
platform_set_drvdata(pdev, NULL);
|
||||
|
||||
unregister_netdev(ndev);
|
||||
|
||||
|
|
@ -2295,9 +2293,9 @@ static int smc_drv_remove(struct device *dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int smc_drv_suspend(struct device *dev, pm_message_t state)
|
||||
static int smc_drv_suspend(struct platform_device *dev, pm_message_t state)
|
||||
{
|
||||
struct net_device *ndev = dev_get_drvdata(dev);
|
||||
struct net_device *ndev = platform_get_drvdata(dev);
|
||||
|
||||
if (ndev) {
|
||||
if (netif_running(ndev)) {
|
||||
|
|
@ -2309,14 +2307,13 @@ static int smc_drv_suspend(struct device *dev, pm_message_t state)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int smc_drv_resume(struct device *dev)
|
||||
static int smc_drv_resume(struct platform_device *dev)
|
||||
{
|
||||
struct platform_device *pdev = to_platform_device(dev);
|
||||
struct net_device *ndev = dev_get_drvdata(dev);
|
||||
struct net_device *ndev = platform_get_drvdata(dev);
|
||||
|
||||
if (ndev) {
|
||||
struct smc_local *lp = netdev_priv(ndev);
|
||||
smc_enable_device(pdev);
|
||||
smc_enable_device(dev);
|
||||
if (netif_running(ndev)) {
|
||||
smc_reset(ndev);
|
||||
smc_enable(ndev);
|
||||
|
|
@ -2328,13 +2325,14 @@ static int smc_drv_resume(struct device *dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static struct device_driver smc_driver = {
|
||||
.name = CARDNAME,
|
||||
.bus = &platform_bus_type,
|
||||
static struct platform_driver smc_driver = {
|
||||
.probe = smc_drv_probe,
|
||||
.remove = smc_drv_remove,
|
||||
.suspend = smc_drv_suspend,
|
||||
.resume = smc_drv_resume,
|
||||
.driver = {
|
||||
.name = CARDNAME,
|
||||
},
|
||||
};
|
||||
|
||||
static int __init smc_init(void)
|
||||
|
|
@ -2348,12 +2346,12 @@ static int __init smc_init(void)
|
|||
#endif
|
||||
#endif
|
||||
|
||||
return driver_register(&smc_driver);
|
||||
return platform_driver_register(&smc_driver);
|
||||
}
|
||||
|
||||
static void __exit smc_cleanup(void)
|
||||
{
|
||||
driver_unregister(&smc_driver);
|
||||
platform_driver_unregister(&smc_driver);
|
||||
}
|
||||
|
||||
module_init(smc_init);
|
||||
|
|
|
|||
|
|
@ -344,9 +344,10 @@ module_param_array(dma, int, NULL, 0);
|
|||
|
||||
static struct platform_device *proteon_dev[ISATR_MAX_ADAPTERS];
|
||||
|
||||
static struct device_driver proteon_driver = {
|
||||
.name = "proteon",
|
||||
.bus = &platform_bus_type,
|
||||
static struct platform_driver proteon_driver = {
|
||||
.driver = {
|
||||
.name = "proteon",
|
||||
},
|
||||
};
|
||||
|
||||
static int __init proteon_init(void)
|
||||
|
|
@ -355,7 +356,7 @@ static int __init proteon_init(void)
|
|||
struct platform_device *pdev;
|
||||
int i, num = 0, err = 0;
|
||||
|
||||
err = driver_register(&proteon_driver);
|
||||
err = platform_driver_register(&proteon_driver);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
|
|
@ -372,7 +373,7 @@ static int __init proteon_init(void)
|
|||
err = setup_card(dev, &pdev->dev);
|
||||
if (!err) {
|
||||
proteon_dev[i] = pdev;
|
||||
dev_set_drvdata(&pdev->dev, dev);
|
||||
platform_set_drvdata(pdev, dev);
|
||||
++num;
|
||||
} else {
|
||||
platform_device_unregister(pdev);
|
||||
|
|
@ -399,17 +400,17 @@ static void __exit proteon_cleanup(void)
|
|||
|
||||
if (!pdev)
|
||||
continue;
|
||||
dev = dev_get_drvdata(&pdev->dev);
|
||||
dev = platform_get_drvdata(pdev);
|
||||
unregister_netdev(dev);
|
||||
release_region(dev->base_addr, PROTEON_IO_EXTENT);
|
||||
free_irq(dev->irq, dev);
|
||||
free_dma(dev->dma);
|
||||
tmsdev_term(dev);
|
||||
free_netdev(dev);
|
||||
dev_set_drvdata(&pdev->dev, NULL);
|
||||
platform_set_drvdata(pdev, NULL);
|
||||
platform_device_unregister(pdev);
|
||||
}
|
||||
driver_unregister(&proteon_driver);
|
||||
platform_driver_unregister(&proteon_driver);
|
||||
}
|
||||
|
||||
module_init(proteon_init);
|
||||
|
|
|
|||
|
|
@ -354,9 +354,10 @@ module_param_array(dma, int, NULL, 0);
|
|||
|
||||
static struct platform_device *sk_isa_dev[ISATR_MAX_ADAPTERS];
|
||||
|
||||
static struct device_driver sk_isa_driver = {
|
||||
.name = "skisa",
|
||||
.bus = &platform_bus_type,
|
||||
static struct platform_driver sk_isa_driver = {
|
||||
.driver = {
|
||||
.name = "skisa",
|
||||
},
|
||||
};
|
||||
|
||||
static int __init sk_isa_init(void)
|
||||
|
|
@ -365,7 +366,7 @@ static int __init sk_isa_init(void)
|
|||
struct platform_device *pdev;
|
||||
int i, num = 0, err = 0;
|
||||
|
||||
err = driver_register(&sk_isa_driver);
|
||||
err = platform_driver_register(&sk_isa_driver);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
|
|
@ -382,7 +383,7 @@ static int __init sk_isa_init(void)
|
|||
err = setup_card(dev, &pdev->dev);
|
||||
if (!err) {
|
||||
sk_isa_dev[i] = pdev;
|
||||
dev_set_drvdata(&sk_isa_dev[i]->dev, dev);
|
||||
platform_set_drvdata(sk_isa_dev[i], dev);
|
||||
++num;
|
||||
} else {
|
||||
platform_device_unregister(pdev);
|
||||
|
|
@ -409,17 +410,17 @@ static void __exit sk_isa_cleanup(void)
|
|||
|
||||
if (!pdev)
|
||||
continue;
|
||||
dev = dev_get_drvdata(&pdev->dev);
|
||||
dev = platform_get_drvdata(pdev);
|
||||
unregister_netdev(dev);
|
||||
release_region(dev->base_addr, SK_ISA_IO_EXTENT);
|
||||
free_irq(dev->irq, dev);
|
||||
free_dma(dev->dma);
|
||||
tmsdev_term(dev);
|
||||
free_netdev(dev);
|
||||
dev_set_drvdata(&pdev->dev, NULL);
|
||||
platform_set_drvdata(pdev, NULL);
|
||||
platform_device_unregister(pdev);
|
||||
}
|
||||
driver_unregister(&sk_isa_driver);
|
||||
platform_driver_unregister(&sk_isa_driver);
|
||||
}
|
||||
|
||||
module_init(sk_isa_init);
|
||||
|
|
|
|||
Loading…
Reference in a new issue