Commit f956c1b0 authored by Sergio Miguéns Iglesias's avatar Sergio Miguéns Iglesias Committed by Juergen Gross

xen/pcifront: Removed unnecessary __ref annotation

An unnecessary "__ref" annotation was removed from the
"drivers/pci/xen_pcifront.c" file. The function where the annotation
was used was "pcifront_backend_changed()", which does not call any
functions annotated as "__*init" nor "__*exit". This makes "__ref"
unnecessary since this annotation is used to make the compiler ignore
section miss-matches when they are not happening here in the first
place.

In addition to the aforementioned change, some code style issues were
fixed in the same file.
Signed-off-by: default avatarSergio Miguéns Iglesias <sergio@lony.xyz>
Reviewed-by: default avatarJuergen Gross <jgross@suse.com>
Link: https://lore.kernel.org/r/20210830175305.13370-1-sergio@lony.xyzSigned-off-by: default avatarJuergen Gross <jgross@suse.com>
parent 1a0df28c
...@@ -115,7 +115,7 @@ static int do_pci_op(struct pcifront_device *pdev, struct xen_pci_op *op) ...@@ -115,7 +115,7 @@ static int do_pci_op(struct pcifront_device *pdev, struct xen_pci_op *op)
struct xen_pci_op *active_op = &pdev->sh_info->op; struct xen_pci_op *active_op = &pdev->sh_info->op;
unsigned long irq_flags; unsigned long irq_flags;
evtchn_port_t port = pdev->evtchn; evtchn_port_t port = pdev->evtchn;
unsigned irq = pdev->irq; unsigned int irq = pdev->irq;
s64 ns, ns_timeout; s64 ns, ns_timeout;
spin_lock_irqsave(&pdev->sh_info_lock, irq_flags); spin_lock_irqsave(&pdev->sh_info_lock, irq_flags);
...@@ -153,10 +153,10 @@ static int do_pci_op(struct pcifront_device *pdev, struct xen_pci_op *op) ...@@ -153,10 +153,10 @@ static int do_pci_op(struct pcifront_device *pdev, struct xen_pci_op *op)
} }
/* /*
* We might lose backend service request since we * We might lose backend service request since we
* reuse same evtchn with pci_conf backend response. So re-schedule * reuse same evtchn with pci_conf backend response. So re-schedule
* aer pcifront service. * aer pcifront service.
*/ */
if (test_bit(_XEN_PCIB_active, if (test_bit(_XEN_PCIB_active,
(unsigned long *)&pdev->sh_info->flags)) { (unsigned long *)&pdev->sh_info->flags)) {
dev_err(&pdev->xdev->dev, dev_err(&pdev->xdev->dev,
...@@ -414,7 +414,8 @@ static int pcifront_scan_bus(struct pcifront_device *pdev, ...@@ -414,7 +414,8 @@ static int pcifront_scan_bus(struct pcifront_device *pdev,
struct pci_dev *d; struct pci_dev *d;
unsigned int devfn; unsigned int devfn;
/* Scan the bus for functions and add. /*
* Scan the bus for functions and add.
* We omit handling of PCI bridge attachment because pciback prevents * We omit handling of PCI bridge attachment because pciback prevents
* bridges from being exported. * bridges from being exported.
*/ */
...@@ -492,8 +493,10 @@ static int pcifront_scan_root(struct pcifront_device *pdev, ...@@ -492,8 +493,10 @@ static int pcifront_scan_root(struct pcifront_device *pdev,
list_add(&bus_entry->list, &pdev->root_buses); list_add(&bus_entry->list, &pdev->root_buses);
/* pci_scan_root_bus skips devices which do not have a /*
* devfn==0. The pcifront_scan_bus enumerates all devfn. */ * pci_scan_root_bus skips devices which do not have a
* devfn==0. The pcifront_scan_bus enumerates all devfn.
*/
err = pcifront_scan_bus(pdev, domain, bus, b); err = pcifront_scan_bus(pdev, domain, bus, b);
/* Claim resources before going "live" with our devices */ /* Claim resources before going "live" with our devices */
...@@ -651,8 +654,10 @@ static void pcifront_do_aer(struct work_struct *data) ...@@ -651,8 +654,10 @@ static void pcifront_do_aer(struct work_struct *data)
pci_channel_state_t state = pci_channel_state_t state =
(pci_channel_state_t)pdev->sh_info->aer_op.err; (pci_channel_state_t)pdev->sh_info->aer_op.err;
/*If a pci_conf op is in progress, /*
we have to wait until it is done before service aer op*/ * If a pci_conf op is in progress, we have to wait until it is done
* before service aer op
*/
dev_dbg(&pdev->xdev->dev, dev_dbg(&pdev->xdev->dev,
"pcifront service aer bus %x devfn %x\n", "pcifront service aer bus %x devfn %x\n",
pdev->sh_info->aer_op.bus, pdev->sh_info->aer_op.devfn); pdev->sh_info->aer_op.bus, pdev->sh_info->aer_op.devfn);
...@@ -676,6 +681,7 @@ static void pcifront_do_aer(struct work_struct *data) ...@@ -676,6 +681,7 @@ static void pcifront_do_aer(struct work_struct *data)
static irqreturn_t pcifront_handler_aer(int irq, void *dev) static irqreturn_t pcifront_handler_aer(int irq, void *dev)
{ {
struct pcifront_device *pdev = dev; struct pcifront_device *pdev = dev;
schedule_pcifront_aer_op(pdev); schedule_pcifront_aer_op(pdev);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
...@@ -1027,6 +1033,7 @@ static int pcifront_detach_devices(struct pcifront_device *pdev) ...@@ -1027,6 +1033,7 @@ static int pcifront_detach_devices(struct pcifront_device *pdev)
/* Find devices being detached and remove them. */ /* Find devices being detached and remove them. */
for (i = 0; i < num_devs; i++) { for (i = 0; i < num_devs; i++) {
int l, state; int l, state;
l = snprintf(str, sizeof(str), "state-%d", i); l = snprintf(str, sizeof(str), "state-%d", i);
if (unlikely(l >= (sizeof(str) - 1))) { if (unlikely(l >= (sizeof(str) - 1))) {
err = -ENOMEM; err = -ENOMEM;
...@@ -1078,7 +1085,7 @@ static int pcifront_detach_devices(struct pcifront_device *pdev) ...@@ -1078,7 +1085,7 @@ static int pcifront_detach_devices(struct pcifront_device *pdev)
return err; return err;
} }
static void __ref pcifront_backend_changed(struct xenbus_device *xdev, static void pcifront_backend_changed(struct xenbus_device *xdev,
enum xenbus_state be_state) enum xenbus_state be_state)
{ {
struct pcifront_device *pdev = dev_get_drvdata(&xdev->dev); struct pcifront_device *pdev = dev_get_drvdata(&xdev->dev);
...@@ -1137,6 +1144,7 @@ static int pcifront_xenbus_probe(struct xenbus_device *xdev, ...@@ -1137,6 +1144,7 @@ static int pcifront_xenbus_probe(struct xenbus_device *xdev,
static int pcifront_xenbus_remove(struct xenbus_device *xdev) static int pcifront_xenbus_remove(struct xenbus_device *xdev)
{ {
struct pcifront_device *pdev = dev_get_drvdata(&xdev->dev); struct pcifront_device *pdev = dev_get_drvdata(&xdev->dev);
if (pdev) if (pdev)
free_pdev(pdev); free_pdev(pdev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment