4 files changed, 10 insertions, 10 deletions

diff --git a/drivers/usb/gadget/udc/amd5536udc.c b/drivers/usb/gadget/udc/amd5536udc.c
index cd8764150861..39d70b4a8958 100644
--- a/drivers/usb/gadget/udc/amd5536udc.c
+++ b/drivers/usb/gadget/udc/amd5536udc.c
@@ -3397,7 +3397,7 @@ err_pcidev:
 static const struct pci_device_id pci_id[] = {
         {
                 PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x2096),
-                .class =        (PCI_CLASS_SERIAL_USB << 8) | 0xfe,
+                .class =        PCI_CLASS_SERIAL_USB_DEVICE,
                 .class_mask =   0xffffffff,
         },
         {},
diff --git a/drivers/usb/gadget/udc/goku_udc.c b/drivers/usb/gadget/udc/goku_udc.c
index 1fdfec14a3ba..d2205d9e0c8b 100644
--- a/drivers/usb/gadget/udc/goku_udc.c
+++ b/drivers/usb/gadget/udc/goku_udc.c
@@ -1846,7 +1846,7 @@ err:
 /*-------------------------------------------------------------------------*/
 
 static const struct pci_device_id pci_ids[] = { {
-        .class =        ((PCI_CLASS_SERIAL_USB << 8) | 0xfe),
+        .class =        PCI_CLASS_SERIAL_USB_DEVICE,
         .class_mask =   ~0,
         .vendor =       0x102f,         /* Toshiba */
         .device =       0x0107,         /* this UDC */
diff --git a/drivers/usb/gadget/udc/net2280.c b/drivers/usb/gadget/udc/net2280.c
index 6706aef907f4..c894b94b234b 100644
--- a/drivers/usb/gadget/udc/net2280.c
+++ b/drivers/usb/gadget/udc/net2280.c
@@ -3735,7 +3735,7 @@ static void net2280_shutdown(struct pci_dev *pdev)
 /*-------------------------------------------------------------------------*/
 
 static const struct pci_device_id pci_ids[] = { {
-        .class =        ((PCI_CLASS_SERIAL_USB << 8) | 0xfe),
+        .class =        PCI_CLASS_SERIAL_USB_DEVICE,
         .class_mask =   ~0,
         .vendor =       PCI_VENDOR_ID_PLX_LEGACY,
         .device =       0x2280,
@@ -3743,7 +3743,7 @@ static const struct pci_device_id pci_ids[] = { {
         .subdevice =    PCI_ANY_ID,
         .driver_data =  PLX_LEGACY | PLX_2280,
         }, {
-        .class =        ((PCI_CLASS_SERIAL_USB << 8) | 0xfe),
+        .class =        PCI_CLASS_SERIAL_USB_DEVICE,
         .class_mask =   ~0,
         .vendor =       PCI_VENDOR_ID_PLX_LEGACY,
         .device =       0x2282,
@@ -3752,7 +3752,7 @@ static const struct pci_device_id pci_ids[] = { {
         .driver_data =  PLX_LEGACY,
         },
         {
-        .class =        ((PCI_CLASS_SERIAL_USB << 8) | 0xfe),
+        .class =        PCI_CLASS_SERIAL_USB_DEVICE,
         .class_mask =   ~0,
         .vendor =       PCI_VENDOR_ID_PLX,
         .device =       0x3380,
@@ -3761,7 +3761,7 @@ static const struct pci_device_id pci_ids[] = { {
         .driver_data =  PLX_SUPERSPEED,
          },
         {
-        .class =        ((PCI_CLASS_SERIAL_USB << 8) | 0xfe),
+        .class =        PCI_CLASS_SERIAL_USB_DEVICE,
         .class_mask =   ~0,
         .vendor =       PCI_VENDOR_ID_PLX,
         .device =       0x3382,
diff --git a/drivers/usb/gadget/udc/pch_udc.c b/drivers/usb/gadget/udc/pch_udc.c
index 7a04157ff579..9571ef54b86b 100644
--- a/drivers/usb/gadget/udc/pch_udc.c
+++ b/drivers/usb/gadget/udc/pch_udc.c
@@ -3234,22 +3234,22 @@ static const struct pci_device_id pch_udc_pcidev_id[] = {
         {
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL,
                            PCI_DEVICE_ID_INTEL_QUARK_X1000_UDC),
-                .class = (PCI_CLASS_SERIAL_USB << 8) | 0xfe,
+                .class = PCI_CLASS_SERIAL_USB_DEVICE,
                 .class_mask = 0xffffffff,
         },
         {
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_EG20T_UDC),
-                .class = (PCI_CLASS_SERIAL_USB << 8) | 0xfe,
+                .class = PCI_CLASS_SERIAL_USB_DEVICE,
                 .class_mask = 0xffffffff,
         },
         {
                 PCI_DEVICE(PCI_VENDOR_ID_ROHM, PCI_DEVICE_ID_ML7213_IOH_UDC),
-                .class = (PCI_CLASS_SERIAL_USB << 8) | 0xfe,
+                .class = PCI_CLASS_SERIAL_USB_DEVICE,
                 .class_mask = 0xffffffff,
         },
         {
                 PCI_DEVICE(PCI_VENDOR_ID_ROHM, PCI_DEVICE_ID_ML7831_IOH_UDC),
-                .class = (PCI_CLASS_SERIAL_USB << 8) | 0xfe,
+                .class = PCI_CLASS_SERIAL_USB_DEVICE,
                 .class_mask = 0xffffffff,
         },
         { 0 },