This fixes PM driver model type checking for drivers/net.
Acked by Pavel Machek.
Signed-off-by: Daniel Drake <[email protected]>
Daniel Drake wrote:
> diff -urNpX dontdiff linux-2.6.11-rc2-mm2/drivers/net/bmac.c linux-dsd/drivers/net/bmac.c
> --- linux-2.6.11-rc2-mm2/drivers/net/bmac.c 2005-02-02 21:54:17.353663112 +0000
> +++ linux-dsd/drivers/net/bmac.c 2005-02-02 20:52:48.000000000 +0000
> @@ -455,7 +455,7 @@ static void bmac_init_chip(struct net_de
> }
>
> #ifdef CONFIG_PM
> -static int bmac_suspend(struct macio_dev *mdev, u32 state)
> +static int bmac_suspend(struct macio_dev *mdev, pm_message_t state)
> {
> struct net_device* dev = macio_get_drvdata(mdev);
> struct bmac_data *bp = netdev_priv(dev);
> diff -urNpX dontdiff linux-2.6.11-rc2-mm2/drivers/net/irda/sa1100_ir.c linux-dsd/drivers/net/irda/sa1100_ir.c
> --- linux-2.6.11-rc2-mm2/drivers/net/irda/sa1100_ir.c 2004-12-24 21:35:50.000000000 +0000
> +++ linux-dsd/drivers/net/irda/sa1100_ir.c 2005-02-02 20:59:28.000000000 +0000
> @@ -291,7 +291,7 @@ static void sa1100_irda_shutdown(struct
> /*
> * Suspend the IrDA interface.
> */
> -static int sa1100_irda_suspend(struct device *_dev, u32 state, u32 level)
> +static int sa1100_irda_suspend(struct device *_dev, pm_message_t state, u32 level)
Why does this one have three arguments?
Jeff
On Fri, Feb 04, 2005 at 08:01:17PM -0500, Jeff Garzik wrote:
> Why does this one have three arguments?
Because it's a platform device driver suspend method.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 PCMCIA - http://pcmcia.arm.linux.org.uk/
2.6 Serial core