Message ID | 20200204165547.115220-3-hare@suse.de |
---|---|
State | Not Applicable |
Delegated to: | David Miller |
Headers | show |
Series | ata: kill ATA_DEBUG | expand |
On 2/4/20 5:55 PM, Hannes Reinecke wrote: > Signed-off-by: Hannes Reinecke <hare@suse.de> Reviewed-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Best regards, -- Bartlomiej Zolnierkiewicz Samsung R&D Institute Poland Samsung Electronics > --- > include/linux/libata.h | 41 ++++++++++++++++++++++++++--------------- > 1 file changed, 26 insertions(+), 15 deletions(-) > > diff --git a/include/linux/libata.h b/include/linux/libata.h > index bd78646f88a0..19c9c32bd339 100644 > --- a/include/linux/libata.h > +++ b/include/linux/libata.h > @@ -593,7 +593,7 @@ struct ata_ioports { > > struct ata_host { > spinlock_t lock; > - struct device *dev; > + struct device *dev; > void __iomem * const *iomap; > unsigned int n_ports; > unsigned int n_tags; /* nr of NCQ tags */ > @@ -813,7 +813,7 @@ struct ata_port { > /* Flags that change dynamically, protected by ap->lock */ > unsigned int pflags; /* ATA_PFLAG_xxx */ > unsigned int print_id; /* user visible unique port ID */ > - unsigned int local_port_no; /* host local port num */ > + unsigned int local_port_no; /* host local port num */ > unsigned int port_no; /* 0 based port no. inside the host */ > > #ifdef CONFIG_ATA_SFF > @@ -848,7 +848,7 @@ struct ata_port { > > struct ata_port_stats stats; > struct ata_host *host; > - struct device *dev; > + struct device *dev; > struct device tdev; > > struct mutex scsi_scan_mutex; > @@ -900,11 +900,14 @@ struct ata_port_operations { > * Configuration and exception handling > */ > int (*cable_detect)(struct ata_port *ap); > - unsigned long (*mode_filter)(struct ata_device *dev, unsigned long xfer_mask); > + unsigned long (*mode_filter)(struct ata_device *dev, > + unsigned long xfer_mask); > void (*set_piomode)(struct ata_port *ap, struct ata_device *dev); > void (*set_dmamode)(struct ata_port *ap, struct ata_device *dev); > - int (*set_mode)(struct ata_link *link, struct ata_device **r_failed_dev); > - unsigned int (*read_id)(struct ata_device *dev, struct ata_taskfile *tf, u16 *id); > + int (*set_mode)(struct ata_link *link, > + struct ata_device **r_failed_dev); > + unsigned int (*read_id)(struct ata_device *dev, > + struct ata_taskfile *tf, u16 *id); > > void (*dev_config)(struct ata_device *dev); > > @@ -999,7 +1002,7 @@ struct ata_port_info { > unsigned long mwdma_mask; > unsigned long udma_mask; > struct ata_port_operations *port_ops; > - void *private_data; > + void *private_data; > }; > > struct ata_timing { > @@ -1103,7 +1106,8 @@ extern int ata_host_activate(struct ata_host *host, int irq, > irq_handler_t irq_handler, unsigned long irq_flags, > struct scsi_host_template *sht); > extern void ata_host_detach(struct ata_host *host); > -extern void ata_host_init(struct ata_host *, struct device *, struct ata_port_operations *); > +extern void ata_host_init(struct ata_host *, struct device *, > + struct ata_port_operations *); > extern int ata_scsi_detect(struct scsi_host_template *sht); > extern int ata_scsi_ioctl(struct scsi_device *dev, unsigned int cmd, > void __user *arg); > @@ -1117,7 +1121,8 @@ extern int ata_sas_scsi_ioctl(struct ata_port *ap, struct scsi_device *dev, > unsigned int cmd, void __user *arg); > extern void ata_sas_port_destroy(struct ata_port *); > extern struct ata_port *ata_sas_port_alloc(struct ata_host *, > - struct ata_port_info *, struct Scsi_Host *); > + struct ata_port_info *, > + struct Scsi_Host *); > extern void ata_sas_async_probe(struct ata_port *ap); > extern int ata_sas_sync_probe(struct ata_port *ap); > extern int ata_sas_port_init(struct ata_port *); > @@ -1188,12 +1193,17 @@ extern int ata_scsi_slave_config(struct scsi_device *sdev); > extern void ata_scsi_slave_destroy(struct scsi_device *sdev); > extern int ata_scsi_change_queue_depth(struct scsi_device *sdev, > int queue_depth); > -extern int __ata_change_queue_depth(struct ata_port *ap, struct scsi_device *sdev, > +extern int __ata_change_queue_depth(struct ata_port *ap, > + struct scsi_device *sdev, > int queue_depth); > extern struct ata_device *ata_dev_pair(struct ata_device *adev); > -extern int ata_do_set_mode(struct ata_link *link, struct ata_device **r_failed_dev); > -extern void ata_scsi_port_error_handler(struct Scsi_Host *host, struct ata_port *ap); > -extern void ata_scsi_cmd_error_handler(struct Scsi_Host *host, struct ata_port *ap, struct list_head *eh_q); > +extern int ata_do_set_mode(struct ata_link *link, > + struct ata_device **r_failed_dev); > +extern void ata_scsi_port_error_handler(struct Scsi_Host *host, > + struct ata_port *ap); > +extern void ata_scsi_cmd_error_handler(struct Scsi_Host *host, > + struct ata_port *ap, > + struct list_head *eh_q); > extern bool sata_lpm_ignore_phy_events(struct ata_link *link); > > extern int ata_cable_40wire(struct ata_port *ap); > @@ -1223,7 +1233,8 @@ struct pci_bits { > unsigned long val; > }; > > -extern int pci_test_config_bits(struct pci_dev *pdev, const struct pci_bits *bits); > +extern int pci_test_config_bits(struct pci_dev *pdev, > + const struct pci_bits *bits); > extern void ata_pci_remove_one(struct pci_dev *pdev); > > #ifdef CONFIG_PM > @@ -1496,7 +1507,7 @@ static inline bool ata_tag_valid(unsigned int tag) > * Internal use only, iterate commands ignoring error handling and > * status of 'qc'. > */ > -#define ata_qc_for_each_raw(ap, qc, tag) \ > +#define ata_qc_for_each_raw(ap, qc, tag) \ > __ata_qc_for_each(ap, qc, tag, ATA_MAX_QUEUE, __ata_qc_from_tag) > > /* >
diff --git a/include/linux/libata.h b/include/linux/libata.h index bd78646f88a0..19c9c32bd339 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -593,7 +593,7 @@ struct ata_ioports { struct ata_host { spinlock_t lock; - struct device *dev; + struct device *dev; void __iomem * const *iomap; unsigned int n_ports; unsigned int n_tags; /* nr of NCQ tags */ @@ -813,7 +813,7 @@ struct ata_port { /* Flags that change dynamically, protected by ap->lock */ unsigned int pflags; /* ATA_PFLAG_xxx */ unsigned int print_id; /* user visible unique port ID */ - unsigned int local_port_no; /* host local port num */ + unsigned int local_port_no; /* host local port num */ unsigned int port_no; /* 0 based port no. inside the host */ #ifdef CONFIG_ATA_SFF @@ -848,7 +848,7 @@ struct ata_port { struct ata_port_stats stats; struct ata_host *host; - struct device *dev; + struct device *dev; struct device tdev; struct mutex scsi_scan_mutex; @@ -900,11 +900,14 @@ struct ata_port_operations { * Configuration and exception handling */ int (*cable_detect)(struct ata_port *ap); - unsigned long (*mode_filter)(struct ata_device *dev, unsigned long xfer_mask); + unsigned long (*mode_filter)(struct ata_device *dev, + unsigned long xfer_mask); void (*set_piomode)(struct ata_port *ap, struct ata_device *dev); void (*set_dmamode)(struct ata_port *ap, struct ata_device *dev); - int (*set_mode)(struct ata_link *link, struct ata_device **r_failed_dev); - unsigned int (*read_id)(struct ata_device *dev, struct ata_taskfile *tf, u16 *id); + int (*set_mode)(struct ata_link *link, + struct ata_device **r_failed_dev); + unsigned int (*read_id)(struct ata_device *dev, + struct ata_taskfile *tf, u16 *id); void (*dev_config)(struct ata_device *dev); @@ -999,7 +1002,7 @@ struct ata_port_info { unsigned long mwdma_mask; unsigned long udma_mask; struct ata_port_operations *port_ops; - void *private_data; + void *private_data; }; struct ata_timing { @@ -1103,7 +1106,8 @@ extern int ata_host_activate(struct ata_host *host, int irq, irq_handler_t irq_handler, unsigned long irq_flags, struct scsi_host_template *sht); extern void ata_host_detach(struct ata_host *host); -extern void ata_host_init(struct ata_host *, struct device *, struct ata_port_operations *); +extern void ata_host_init(struct ata_host *, struct device *, + struct ata_port_operations *); extern int ata_scsi_detect(struct scsi_host_template *sht); extern int ata_scsi_ioctl(struct scsi_device *dev, unsigned int cmd, void __user *arg); @@ -1117,7 +1121,8 @@ extern int ata_sas_scsi_ioctl(struct ata_port *ap, struct scsi_device *dev, unsigned int cmd, void __user *arg); extern void ata_sas_port_destroy(struct ata_port *); extern struct ata_port *ata_sas_port_alloc(struct ata_host *, - struct ata_port_info *, struct Scsi_Host *); + struct ata_port_info *, + struct Scsi_Host *); extern void ata_sas_async_probe(struct ata_port *ap); extern int ata_sas_sync_probe(struct ata_port *ap); extern int ata_sas_port_init(struct ata_port *); @@ -1188,12 +1193,17 @@ extern int ata_scsi_slave_config(struct scsi_device *sdev); extern void ata_scsi_slave_destroy(struct scsi_device *sdev); extern int ata_scsi_change_queue_depth(struct scsi_device *sdev, int queue_depth); -extern int __ata_change_queue_depth(struct ata_port *ap, struct scsi_device *sdev, +extern int __ata_change_queue_depth(struct ata_port *ap, + struct scsi_device *sdev, int queue_depth); extern struct ata_device *ata_dev_pair(struct ata_device *adev); -extern int ata_do_set_mode(struct ata_link *link, struct ata_device **r_failed_dev); -extern void ata_scsi_port_error_handler(struct Scsi_Host *host, struct ata_port *ap); -extern void ata_scsi_cmd_error_handler(struct Scsi_Host *host, struct ata_port *ap, struct list_head *eh_q); +extern int ata_do_set_mode(struct ata_link *link, + struct ata_device **r_failed_dev); +extern void ata_scsi_port_error_handler(struct Scsi_Host *host, + struct ata_port *ap); +extern void ata_scsi_cmd_error_handler(struct Scsi_Host *host, + struct ata_port *ap, + struct list_head *eh_q); extern bool sata_lpm_ignore_phy_events(struct ata_link *link); extern int ata_cable_40wire(struct ata_port *ap); @@ -1223,7 +1233,8 @@ struct pci_bits { unsigned long val; }; -extern int pci_test_config_bits(struct pci_dev *pdev, const struct pci_bits *bits); +extern int pci_test_config_bits(struct pci_dev *pdev, + const struct pci_bits *bits); extern void ata_pci_remove_one(struct pci_dev *pdev); #ifdef CONFIG_PM @@ -1496,7 +1507,7 @@ static inline bool ata_tag_valid(unsigned int tag) * Internal use only, iterate commands ignoring error handling and * status of 'qc'. */ -#define ata_qc_for_each_raw(ap, qc, tag) \ +#define ata_qc_for_each_raw(ap, qc, tag) \ __ata_qc_for_each(ap, qc, tag, ATA_MAX_QUEUE, __ata_qc_from_tag) /*
Signed-off-by: Hannes Reinecke <hare@suse.de> --- include/linux/libata.h | 41 ++++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 15 deletions(-)