[1/3] PCI/MSI: Clean up the kobject in struct msi_desc

From: Yijing Wang <wangyijing@huawei.com>

commit 1c51b50c299 exported MSI mode using attributes
instead of kobject. So clean up the kobject in struct
msi_desc.

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
---
 drivers/pci/msi.c   |   11 -----------
 include/linux/msi.h |    2 --
 2 files changed, 0 insertions(+), 13 deletions(-)

On Sat, Jul 26, 2014 at 09:48:34AM +0800, wangyijing@huawei.com wrote:
> From: Yijing Wang <wangyijing@huawei.com>
> 
> commit 1c51b50c299 exported MSI mode using attributes
> instead of kobject. So clean up the kobject in struct
> msi_desc.
> 
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Signed-off-by: Yijing Wang <wangyijing@huawei.com>
> ---
>  drivers/pci/msi.c   |   11 -----------
>  include/linux/msi.h |    2 --
>  2 files changed, 0 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
> index 5a40516..e2aa74e 100644
> --- a/drivers/pci/msi.c
> +++ b/drivers/pci/msi.c
> @@ -384,17 +384,6 @@ static void free_msi_irqs(struct pci_dev *dev)
>  				iounmap(entry->mask_base);
>  		}
>  
> -		/*
> -		 * Its possible that we get into this path
> -		 * When populate_msi_sysfs fails, which means the entries
> -		 * were not registered with sysfs.  In that case don't
> -		 * unregister them.
> -		 */
> -		if (entry->kobj.parent) {
> -			kobject_del(&entry->kobj);
> -			kobject_put(&entry->kobj);
> -		}
> -
>  		list_del(&entry->list);
>  		kfree(entry);
>  	}
> diff --git a/include/linux/msi.h b/include/linux/msi.h
> index 8103f32..8892d41 100644
> --- a/include/linux/msi.h
> +++ b/include/linux/msi.h
> @@ -47,8 +47,6 @@ struct msi_desc {
>  
>  	/* Last set MSI message */
>  	struct msi_msg msg;
> -
> -	struct kobject kobj;
>  };
>  
>  /*
> -- 
> 1.7.1

Oops, missed that one, nice catch.

Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html