[PATCH 18/25] Staging: hv: Get rid of struct hv_bus

[Greg KH]

On Tue, Apr 26, 2011 at 09:20:35AM -0700, K. Y. Srinivasan wrote:
> Now, get rid of struct hv_bus. We will no longer be embedding
> struct bus_type.
> 
> Signed-off-by: K. Y. Srinivasan <kys at microsoft.com>
> Signed-off-by: Haiyang Zhang <haiyangz at microsoft.com>
> Signed-off-by: Abhishek Kane <v-abkane at microsoft.com>
> Signed-off-by: Hank Janssen <hjanssen at microsoft.com>
> ---
>  drivers/staging/hv/vmbus_drv.c |   33 ++++++++++++++-------------------
>  1 files changed, 14 insertions(+), 19 deletions(-)
> 
> diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c
> index a3a7741..515311c 100644
> --- a/drivers/staging/hv/vmbus_drv.c
> +++ b/drivers/staging/hv/vmbus_drv.c
> @@ -45,11 +45,6 @@ static struct pci_dev *hv_pci_dev;
>  static struct tasklet_struct msg_dpc;
>  static struct tasklet_struct event_dpc;
>  
> -/* Main vmbus driver data structure */
> -struct hv_bus {
> -	struct bus_type bus;
> -};
> -
>  unsigned int vmbus_loglevel = (ALL_MODULES << 16 | INFO_LVL);
>  EXPORT_SYMBOL(vmbus_loglevel);
>  	/* (ALL_MODULES << 16 | DEBUG_LVL_ENTEREXIT); */
> @@ -405,14 +400,14 @@ static void vmbus_device_release(struct device *device)
>  }
>  
>  /* The one and only one */
> -static struct hv_bus  hv_bus = {
> -	.bus.name =		"vmbus",
> -	.bus.match =		vmbus_match,
> -	.bus.shutdown =		vmbus_shutdown,
> -	.bus.remove =		vmbus_remove,
> -	.bus.probe =		vmbus_probe,
> -	.bus.uevent =		vmbus_uevent,
> -	.bus.dev_attrs =	vmbus_device_attrs,
> +static struct bus_type  hv_bus = {
> +	.name =		"vmbus",
> +	.match =		vmbus_match,
> +	.shutdown =		vmbus_shutdown,
> +	.remove =		vmbus_remove,
> +	.probe =		vmbus_probe,
> +	.uevent =		vmbus_uevent,
> +	.dev_attrs =	vmbus_device_attrs,
>  };
>  
>  static const char *driver_name = "hyperv";
> @@ -550,14 +545,14 @@ static int vmbus_bus_init(struct pci_dev *pdev)
>  		goto cleanup;
>  	}
>  
> -	hv_bus.bus.name = driver_name;
> +	hv_bus.name = driver_name;

Why are you setting the name of the bus again?  Shouldn't this line be
removed?

thanks,

greg k-h