From patchwork Tue Feb 4 16:55:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Reinecke X-Patchwork-Id: 1233408 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ide-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.de Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48BrS74FRKzB3y7 for ; Wed, 5 Feb 2020 03:56:07 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727376AbgBDQ4G (ORCPT ); Tue, 4 Feb 2020 11:56:06 -0500 Received: from mx2.suse.de ([195.135.220.15]:34588 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727355AbgBDQ4G (ORCPT ); Tue, 4 Feb 2020 11:56:06 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 881A7B020; Tue, 4 Feb 2020 16:56:04 +0000 (UTC) From: Hannes Reinecke To: Jens Axboe Cc: Bartolomiej Zolnierkiewicz , linux-ide@vger.kernel.org, Hannes Reinecke Subject: [PATCH 02/46] libata.h: whitespace and indentation fixes Date: Tue, 4 Feb 2020 17:55:03 +0100 Message-Id: <20200204165547.115220-3-hare@suse.de> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20200204165547.115220-1-hare@suse.de> References: <20200204165547.115220-1-hare@suse.de> Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org Signed-off-by: Hannes Reinecke Reviewed-by: Bartlomiej Zolnierkiewicz --- 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) /*