genirq/msi: Clean up usage of __u8/__u16 types
PATCH 1/2 genirq/msi: Clean up usage of __u8/__u16 types
The double underscore types are meant for compatibility in userspace headers which does not apply here. Therefore, change to use the standard no-underscore types.
The origin of the double underscore types dates back to before the git era so I was not able to find a commit to see the original justification.
--- include/linux/msi.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
include/linux/msi.h +6 -6
@@ -83,12 +83,12 @@ struct msi_desc {struct {u32 masked;struct { -__u8 is_msix :1 ; -__u8 multiple :3 ; -__u8 multi_cap :3 ; -__u8 maskbit :1 ; -__u8 is_64 :1 ; -__u16 entry_nr; +u8 is_msix :1 ; +u8 multiple :3 ; +u8 multi_cap :3 ; +u8 maskbit :1 ; +u8 is_64 :1 ; +u16 entry_nr;unsigned default_irq; } msi_attrib;union {
Signature · 1 line
2.19.0
PATCH 2/2 PCI: Clean up usage of __u32 type
The double underscore types are meant for compatibility in userspace headers which does not apply here. Therefore, change to use the standard no-underscore types.
The origin of the double underscore types dates back to before the git era so I was not able to find a commit to see the original justification.
--- drivers/pci/pci-driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pci/pci-driver.c +2 -2
@@ -100,7 +100,7 @@ static ssize_t new_id_store(struct device_driver *driver, const char *buf, {struct pci_driver *pdrv =to_pci_driver (driver);const struct pci_device_id *ids = pdrv->id_table; -__u32 vendor, device, subvendor =PCI_ANY_ID , +u32 vendor, device, subvendor =PCI_ANY_ID , subdevice =PCI_ANY_ID , class =0 , class_mask =0 ;unsigned long driver_data =0 ;int fields =0 ;
@@ -168,7 +168,7 @@ static ssize_t remove_id_store(struct device_driver *driver, const char *buf, {struct pci_dynid *dynid, *n;struct pci_driver *pdrv =to_pci_driver (driver); -__u32 vendor, device, subvendor =PCI_ANY_ID , +u32 vendor, device, subvendor =PCI_ANY_ID , subdevice =PCI_ANY_ID , class =0 , class_mask =0 ;int fields =0 ;size_t retval = -ENODEV ;
Signature · 1 line
2.19.0
[+cc Marc, Thomas]
Quoted 10 lines · Logan Gunthorpe
The double underscore types are meant for compatibility in userspace headers which does not apply here. Therefore, change to use the standard no-underscore types.
The origin of the double underscore types dates back to before the git era so I was not able to find a commit to see the original justification.
Signed-off-by Logan Gunthorpe <[email protected]>Cc Bjorn Helgaas <[email protected]>
I applied both of these:
PCI: Clean up usage of __u32 type
genirq/msi: Clean up usage of __u8/__u16 types
to pci/misc for v5.1, thanks!
Quoted 30 lines
--- include/linux/msi.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)include/linux/msi.h +6
-6@@ -83,12 +83,12 @@ struct msi_desc {struct {u32 masked;struct { -__u8 is_msix :1 ; -__u8 multiple :3 ; -__u8 multi_cap :3 ; -__u8 maskbit :1 ; -__u8 is_64 :1 ; -__u16 entry_nr; +u8 is_msix :1 ; +u8 multiple :3 ; +u8 multi_cap :3 ; +u8 maskbit :1 ; +u8 is_64 :1 ; +u16 entry_nr;unsigned default_irq; } msi_attrib;union {Signature · 1 line
2.19.0