[PATCH 31/39] USB: remove DEFINE_PCI_DEVICE_TABLE macro

2013-12-02 Thread Jingoo Han 
Don't use DEFINE_PCI_DEVICE_TABLE macro, because this macro
is not preferred.

Signed-off-by: Jingoo Han 
---
 drivers/usb/chipidea/ci_hdrc_pci.c |2 +-
 drivers/usb/dwc3/dwc3-pci.c|2 +-
 drivers/usb/gadget/amd5536udc.c|2 +-
 drivers/usb/gadget/pch_udc.c   |2 +-
 drivers/usb/host/uhci-pci.c|2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/usb/chipidea/ci_hdrc_pci.c 
b/drivers/usb/chipidea/ci_hdrc_pci.c
index d514332..241ae34 100644
--- a/drivers/usb/chipidea/ci_hdrc_pci.c
+++ b/drivers/usb/chipidea/ci_hdrc_pci.c
@@ -112,7 +112,7 @@ static void ci_hdrc_pci_remove(struct pci_dev *pdev)
  *
  * Check "pci.h" for details
  */
-static DEFINE_PCI_DEVICE_TABLE(ci_hdrc_pci_id_table) = {
+static const struct pci_device_id ci_hdrc_pci_id_table[] = {
{
PCI_DEVICE(0x153F, 0x1004),
.driver_data = (kernel_ulong_t)&pci_platdata,
diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
index 31443ae..665686e 100644
--- a/drivers/usb/dwc3/dwc3-pci.c
+++ b/drivers/usb/dwc3/dwc3-pci.c
@@ -182,7 +182,7 @@ static void dwc3_pci_remove(struct pci_dev *pci)
pci_disable_device(pci);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(dwc3_pci_id_table) = {
+static const struct pci_device_id dwc3_pci_id_table[] = {
{
PCI_DEVICE(PCI_VENDOR_ID_SYNOPSYS,
PCI_DEVICE_ID_SYNOPSYS_HAPSUSB3),
diff --git a/drivers/usb/gadget/amd5536udc.c b/drivers/usb/gadget/amd5536udc.c
index 54a1e29..f0ff4a6 100644
--- a/drivers/usb/gadget/amd5536udc.c
+++ b/drivers/usb/gadget/amd5536udc.c
@@ -3338,7 +3338,7 @@ static int udc_remote_wakeup(struct udc *dev)
 }
 
 /* PCI device parameters */
-static DEFINE_PCI_DEVICE_TABLE(pci_id) = {
+static const struct pci_device_id pci_id[] = {
{
PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x2096),
.class =(PCI_CLASS_SERIAL_USB << 8) | 0xfe,
diff --git a/drivers/usb/gadget/pch_udc.c b/drivers/usb/gadget/pch_udc.c
index 32d5e92..78a3d92 100644
--- a/drivers/usb/gadget/pch_udc.c
+++ b/drivers/usb/gadget/pch_udc.c
@@ -3210,7 +3210,7 @@ finished:
return retval;
 }
 
-static DEFINE_PCI_DEVICE_TABLE(pch_udc_pcidev_id) = {
+static const struct pci_device_id pch_udc_pcidev_id[] = {
{
PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_EG20T_UDC),
.class = (PCI_CLASS_SERIAL_USB << 8) | 0xfe,
diff --git a/drivers/usb/host/uhci-pci.c b/drivers/usb/host/uhci-pci.c
index 4cd7988..940304c 100644
--- a/drivers/usb/host/uhci-pci.c
+++ b/drivers/usb/host/uhci-pci.c
@@ -279,7 +279,7 @@ static const struct hc_driver uhci_driver = {
.hub_control =  uhci_hub_control,
 };
 
-static DEFINE_PCI_DEVICE_TABLE(uhci_pci_ids) = { {
+static const struct pci_device_id uhci_pci_ids[] = { {
/* handle any USB UHCI controller */
PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0),
.driver_data =  (unsigned long) &uhci_driver,
-- 
1.7.10.4


--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 31/39] USB: remove DEFINE_PCI_DEVICE_TABLE macro

2013-12-08 Thread Felipe Balbi 
On Tue, Dec 03, 2013 at 08:27:58AM +0900, Jingoo Han wrote:
> Don't use DEFINE_PCI_DEVICE_TABLE macro, because this macro
> is not preferred.
> 
> Signed-off-by: Jingoo Han 

I wonder why I wasn't Cc:ed to this email considering it touches three
drivers I care about.

Greg, I have the original ones in my tree and I would really like to
avoid rebasing my 'next' branch. Do we keep it there or do you want to
avoid merging those commits ?

Jingoo, please keep maintainers in Cc next time, it's very tough to
filter emails you care about otherwise.

cheers

-- 
balbi


signature.asc
Description: Digital signature

Re: [PATCH 31/39] USB: remove DEFINE_PCI_DEVICE_TABLE macro

2013-12-09 Thread 'Greg Kroah-Hartman' 
On Sun, Dec 08, 2013 at 10:03:42PM -0600, Felipe Balbi wrote:
> On Tue, Dec 03, 2013 at 08:27:58AM +0900, Jingoo Han wrote:
> > Don't use DEFINE_PCI_DEVICE_TABLE macro, because this macro
> > is not preferred.
> > 
> > Signed-off-by: Jingoo Han 
> 
> I wonder why I wasn't Cc:ed to this email considering it touches three
> drivers I care about.
> 
> Greg, I have the original ones in my tree and I would really like to
> avoid rebasing my 'next' branch. Do we keep it there or do you want to
> avoid merging those commits ?

Just keep it there and we can handle the merge, it shouldn't be a big
deal, right?

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 31/39] USB: remove DEFINE_PCI_DEVICE_TABLE macro

2013-12-09 Thread Felipe Balbi 
On Mon, Dec 09, 2013 at 12:33:17AM -0800, 'Greg Kroah-Hartman' wrote:
> On Sun, Dec 08, 2013 at 10:03:42PM -0600, Felipe Balbi wrote:
> > On Tue, Dec 03, 2013 at 08:27:58AM +0900, Jingoo Han wrote:
> > > Don't use DEFINE_PCI_DEVICE_TABLE macro, because this macro
> > > is not preferred.
> > > 
> > > Signed-off-by: Jingoo Han 
> > 
> > I wonder why I wasn't Cc:ed to this email considering it touches three
> > drivers I care about.
> > 
> > Greg, I have the original ones in my tree and I would really like to
> > avoid rebasing my 'next' branch. Do we keep it there or do you want to
> > avoid merging those commits ?
> 
> Just keep it there and we can handle the merge, it shouldn't be a big
> deal, right?

Should not. Thanks Greg.

-- 
balbi


signature.asc
Description: Digital signature