Re: [PATCH] rt2x00: Move interface type assignments to generic code.

[Ivo van Doorn <ivdoorn@gmail.com>]

On Sunday 08 November 2009, Gertjan van Wingerde wrote:
> Make sure all drivers can benefit of the assignment of the interface type of an adapter, instead of
> keeping it for rt2800 only.
> 
> Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com>

Acked-by: Ivo van Doorn <IvDoorn@gmail.com>

> ---
>  drivers/net/wireless/rt2x00/rt2800pci.c |    2 --
>  drivers/net/wireless/rt2x00/rt2800usb.c |    2 --
>  drivers/net/wireless/rt2x00/rt2x00pci.c |    2 ++
>  drivers/net/wireless/rt2x00/rt2x00soc.c |    5 +++++
>  drivers/net/wireless/rt2x00/rt2x00usb.c |    2 ++
>  5 files changed, 9 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c
> index 3c5b875..bff8707 100644
> --- a/drivers/net/wireless/rt2x00/rt2800pci.c
> +++ b/drivers/net/wireless/rt2x00/rt2800pci.c
> @@ -1465,8 +1465,6 @@ static int rt2800pci_probe_hw(struct rt2x00_dev *rt2x00dev)
>  {
>  	int retval;
>  
> -	rt2x00_set_chip_intf(rt2x00dev, RT2X00_CHIP_INTF_PCI);
> -
>  	rt2x00dev->priv = (void *)&rt2800pci_rt2800_ops;
>  
>  	/*
> diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
> index ce2e893..3168ad4 100644
> --- a/drivers/net/wireless/rt2x00/rt2800usb.c
> +++ b/drivers/net/wireless/rt2x00/rt2800usb.c
> @@ -1074,8 +1074,6 @@ static int rt2800usb_probe_hw(struct rt2x00_dev *rt2x00dev)
>  {
>  	int retval;
>  
> -	rt2x00_set_chip_intf(rt2x00dev, RT2X00_CHIP_INTF_USB);
> -
>  	rt2x00dev->priv = (void *)&rt2800usb_rt2800_ops;
>  
>  	/*
> diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c
> index cdd5154..ece70d7 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00pci.c
> +++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
> @@ -310,6 +310,8 @@ int rt2x00pci_probe(struct pci_dev *pci_dev, const struct pci_device_id *id)
>  	rt2x00dev->irq = pci_dev->irq;
>  	rt2x00dev->name = pci_name(pci_dev);
>  
> +	rt2x00_set_chip_intf(rt2x00dev, RT2X00_CHIP_INTF_PCI);
> +
>  	/*
>  	 * Determine RT chipset by reading PCI header.
>  	 */
> diff --git a/drivers/net/wireless/rt2x00/rt2x00soc.c b/drivers/net/wireless/rt2x00/rt2x00soc.c
> index 539568c..4abcfa6 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00soc.c
> +++ b/drivers/net/wireless/rt2x00/rt2x00soc.c
> @@ -93,6 +93,11 @@ int rt2x00soc_probe(struct platform_device *pdev,
>  	rt2x00dev->irq = platform_get_irq(pdev, 0);
>  	rt2x00dev->name = pdev->dev.driver->name;
>  
> +	/*
> +	 * SoC devices mimic PCI behavior.
> +	 */
> +	rt2x00_set_chip_intf(rt2x00dev, RT2X00_CHIP_INTF_PCI);
> +
>  	rt2x00_set_chip_rt(rt2x00dev, chipset);
>  
>  	retval = rt2x00soc_alloc_reg(rt2x00dev);
> diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c
> index c9cbdaa..aa6c31d 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00usb.c
> +++ b/drivers/net/wireless/rt2x00/rt2x00usb.c
> @@ -653,6 +653,8 @@ int rt2x00usb_probe(struct usb_interface *usb_intf,
>  	rt2x00dev->ops = ops;
>  	rt2x00dev->hw = hw;
>  
> +	rt2x00_set_chip_intf(rt2x00dev, RT2X00_CHIP_INTF_USB);
> +
>  	retval = rt2x00usb_alloc_reg(rt2x00dev);
>  	if (retval)
>  		goto exit_free_device;